Răsfoiți Sursa

removed redundant void

Dave Schuyler 22 ani în urmă
părinte
comite
4cca0ea212

+ 2 - 2
panda/src/physics/baseIntegrator.cxx

@@ -27,7 +27,7 @@
 // Description : constructor
 // Description : constructor
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 BaseIntegrator::
 BaseIntegrator::
-BaseIntegrator(void) {
+BaseIntegrator() {
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
@@ -36,7 +36,7 @@ BaseIntegrator(void) {
 // Description : destructor
 // Description : destructor
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 BaseIntegrator::
 BaseIntegrator::
-~BaseIntegrator(void) {
+~BaseIntegrator() {
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////

+ 2 - 2
panda/src/physics/linearEulerIntegrator.h

@@ -33,8 +33,8 @@ private:
                                float dt);
                                float dt);
 
 
 PUBLISHED:
 PUBLISHED:
-  LinearEulerIntegrator(void);
-  virtual ~LinearEulerIntegrator(void);
+  LinearEulerIntegrator();
+  virtual ~LinearEulerIntegrator();
 };
 };
 
 
 #endif // EULERINTEGRATOR_H
 #endif // EULERINTEGRATOR_H

+ 5 - 6
panda/src/physics/linearIntegrator.cxx

@@ -27,7 +27,7 @@
 // Description : constructor
 // Description : constructor
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 LinearIntegrator::
 LinearIntegrator::
-LinearIntegrator(void) {
+LinearIntegrator() {
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
@@ -36,7 +36,7 @@ LinearIntegrator(void) {
 // Description : destructor
 // Description : destructor
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 LinearIntegrator::
 LinearIntegrator::
-~LinearIntegrator(void) {
+~LinearIntegrator() {
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
@@ -59,16 +59,15 @@ integrate(Physical *physical, pvector< PT(LinearForce) > &forces,
   for (; current_object_iter != physical->get_object_vector().end();
   for (; current_object_iter != physical->get_object_vector().end();
        current_object_iter++) {
        current_object_iter++) {
     PhysicsObject *current_object = *current_object_iter;
     PhysicsObject *current_object = *current_object_iter;
-
+    
     // bail out if this object doesn't exist or doesn't want to be
     // bail out if this object doesn't exist or doesn't want to be
     // processed.
     // processed.
-    if (current_object == (PhysicsObject *) NULL)
+    if (current_object == (PhysicsObject *) NULL) {
       continue;
       continue;
+    }
 
 
     // set the object's last position to its current position before we move it
     // set the object's last position to its current position before we move it
     current_object->set_last_position(current_object->get_position());
     current_object->set_last_position(current_object->get_position());
-
   }
   }
-
   child_integrate(physical, forces, dt);
   child_integrate(physical, forces, dt);
 }
 }

+ 13 - 13
panda/src/physics/physicsObject.h

@@ -47,47 +47,47 @@ private:
   bool _oriented;
   bool _oriented;
 
 
 PUBLISHED:
 PUBLISHED:
-  PhysicsObject(void);
+  PhysicsObject();
   PhysicsObject(const PhysicsObject &copy);
   PhysicsObject(const PhysicsObject &copy);
-  virtual ~PhysicsObject(void);
+  virtual ~PhysicsObject();
   const PhysicsObject &operator =(const PhysicsObject &other);
   const PhysicsObject &operator =(const PhysicsObject &other);
 
 
   static const float _default_terminal_velocity;
   static const float _default_terminal_velocity;
 
 
   INLINE void set_mass(float);
   INLINE void set_mass(float);
-  INLINE float get_mass(void) const;
+  INLINE float get_mass() const;
 
 
   INLINE void set_position(const LPoint3f &pos);
   INLINE void set_position(const LPoint3f &pos);
   INLINE void set_position(float x, float y, float z);
   INLINE void set_position(float x, float y, float z);
-  INLINE LPoint3f get_position(void) const;
+  INLINE LPoint3f get_position() const;
 
 
   INLINE void set_position_HandOfGod(const LPoint3f &pos);
   INLINE void set_position_HandOfGod(const LPoint3f &pos);
 
 
   INLINE void set_last_position(const LPoint3f &pos);
   INLINE void set_last_position(const LPoint3f &pos);
-  INLINE LPoint3f get_last_position(void) const;
+  INLINE LPoint3f get_last_position() const;
 
 
   INLINE void set_velocity(const LVector3f &vel);
   INLINE void set_velocity(const LVector3f &vel);
   INLINE void set_velocity(float x, float y, float z);
   INLINE void set_velocity(float x, float y, float z);
-  INLINE LVector3f get_velocity(void) const;
+  INLINE LVector3f get_velocity() const;
 
 
   INLINE void set_active(bool flag);
   INLINE void set_active(bool flag);
-  INLINE bool get_active(void) const;
+  INLINE bool get_active() const;
 
 
   INLINE void set_oriented(bool flag);
   INLINE void set_oriented(bool flag);
-  INLINE bool get_oriented(void) const;
+  INLINE bool get_oriented() const;
 
 
   INLINE void set_terminal_velocity(float tv);
   INLINE void set_terminal_velocity(float tv);
-  INLINE float get_terminal_velocity(void) const;
+  INLINE float get_terminal_velocity() const;
 
 
   INLINE void set_orientation(const LOrientationf &orientation);
   INLINE void set_orientation(const LOrientationf &orientation);
-  INLINE LOrientationf get_orientation(void) const;
+  INLINE LOrientationf get_orientation() const;
 
 
   INLINE void set_rotation(const LVector3f &rotation);
   INLINE void set_rotation(const LVector3f &rotation);
-  INLINE LVector3f get_rotation(void) const;
+  INLINE LVector3f get_rotation() const;
 
 
   virtual LMatrix4f get_inertial_tensor(void) const;
   virtual LMatrix4f get_inertial_tensor(void) const;
-  virtual LMatrix4f get_lcs(void) const;
-  virtual PhysicsObject *make_copy(void) const;
+  virtual LMatrix4f get_lcs() const;
+  virtual PhysicsObject *make_copy() const;
 
 
 public:
 public:
   static TypeHandle get_class_type() {
   static TypeHandle get_class_type() {