From 4cca0ea212219aff989b823caa45344712c87f7b Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Wed, 11 Jun 2003 04:50:57 +0000 Subject: [PATCH] removed redundant void --- panda/src/physics/baseIntegrator.cxx | 4 ++-- panda/src/physics/linearEulerIntegrator.h | 4 ++-- panda/src/physics/linearIntegrator.cxx | 11 +++++----- panda/src/physics/physicsObject.h | 26 +++++++++++------------ 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/panda/src/physics/baseIntegrator.cxx b/panda/src/physics/baseIntegrator.cxx index 6cdc421ed9..f2b3f8aacc 100644 --- a/panda/src/physics/baseIntegrator.cxx +++ b/panda/src/physics/baseIntegrator.cxx @@ -27,7 +27,7 @@ // Description : constructor //////////////////////////////////////////////////////////////////// BaseIntegrator:: -BaseIntegrator(void) { +BaseIntegrator() { } //////////////////////////////////////////////////////////////////// @@ -36,7 +36,7 @@ BaseIntegrator(void) { // Description : destructor //////////////////////////////////////////////////////////////////// BaseIntegrator:: -~BaseIntegrator(void) { +~BaseIntegrator() { } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/physics/linearEulerIntegrator.h b/panda/src/physics/linearEulerIntegrator.h index 45f9608cb4..0887a7ca59 100644 --- a/panda/src/physics/linearEulerIntegrator.h +++ b/panda/src/physics/linearEulerIntegrator.h @@ -33,8 +33,8 @@ private: float dt); PUBLISHED: - LinearEulerIntegrator(void); - virtual ~LinearEulerIntegrator(void); + LinearEulerIntegrator(); + virtual ~LinearEulerIntegrator(); }; #endif // EULERINTEGRATOR_H diff --git a/panda/src/physics/linearIntegrator.cxx b/panda/src/physics/linearIntegrator.cxx index 35f646db3f..f69186af0d 100644 --- a/panda/src/physics/linearIntegrator.cxx +++ b/panda/src/physics/linearIntegrator.cxx @@ -27,7 +27,7 @@ // Description : constructor //////////////////////////////////////////////////////////////////// LinearIntegrator:: -LinearIntegrator(void) { +LinearIntegrator() { } //////////////////////////////////////////////////////////////////// @@ -36,7 +36,7 @@ LinearIntegrator(void) { // Description : destructor //////////////////////////////////////////////////////////////////// LinearIntegrator:: -~LinearIntegrator(void) { +~LinearIntegrator() { } //////////////////////////////////////////////////////////////////// @@ -59,16 +59,15 @@ integrate(Physical *physical, pvector< PT(LinearForce) > &forces, for (; current_object_iter != physical->get_object_vector().end(); current_object_iter++) { PhysicsObject *current_object = *current_object_iter; - + // bail out if this object doesn't exist or doesn't want to be // processed. - if (current_object == (PhysicsObject *) NULL) + if (current_object == (PhysicsObject *) NULL) { continue; + } // set the object's last position to its current position before we move it current_object->set_last_position(current_object->get_position()); - } - child_integrate(physical, forces, dt); } diff --git a/panda/src/physics/physicsObject.h b/panda/src/physics/physicsObject.h index af2cc3648f..9879961070 100644 --- a/panda/src/physics/physicsObject.h +++ b/panda/src/physics/physicsObject.h @@ -47,47 +47,47 @@ private: bool _oriented; PUBLISHED: - PhysicsObject(void); + PhysicsObject(); PhysicsObject(const PhysicsObject ©); - virtual ~PhysicsObject(void); + virtual ~PhysicsObject(); const PhysicsObject &operator =(const PhysicsObject &other); static const float _default_terminal_velocity; 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(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_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(float x, float y, float z); - INLINE LVector3f get_velocity(void) const; + INLINE LVector3f get_velocity() const; INLINE void set_active(bool flag); - INLINE bool get_active(void) const; + INLINE bool get_active() const; 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 float get_terminal_velocity(void) const; + INLINE float get_terminal_velocity() const; 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 LVector3f get_rotation(void) const; + INLINE LVector3f get_rotation() 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: static TypeHandle get_class_type() {