From b76ae7cb967c96951d47a621643907abcd5ce014 Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Wed, 5 Nov 2003 01:27:45 +0000 Subject: [PATCH] Removed ls() as this call be accessed with Python print --- panda/src/collide/collisionTraverser.I | 11 ----------- panda/src/collide/collisionTraverser.h | 1 - panda/src/physics/angularIntegrator.cxx | 3 ++- panda/src/physics/physicsManager.I | 11 ----------- panda/src/physics/physicsManager.h | 1 - 5 files changed, 2 insertions(+), 25 deletions(-) diff --git a/panda/src/collide/collisionTraverser.I b/panda/src/collide/collisionTraverser.I index fe9266f0a1..80cea3eff9 100644 --- a/panda/src/collide/collisionTraverser.I +++ b/panda/src/collide/collisionTraverser.I @@ -84,14 +84,3 @@ clear_recorder() { } #endif // DO_COLLISION_RECORDING - -//////////////////////////////////////////////////////////////////// -// Function: CollisionTraverser::ls -// Access: Published -// Description: Shortcut for write(). This is handy for interactive -// debugging. -//////////////////////////////////////////////////////////////////// -INLINE void CollisionTraverser:: -ls() const { - write(nout, 0); -} diff --git a/panda/src/collide/collisionTraverser.h b/panda/src/collide/collisionTraverser.h index a041ed4585..994019eb55 100644 --- a/panda/src/collide/collisionTraverser.h +++ b/panda/src/collide/collisionTraverser.h @@ -80,7 +80,6 @@ PUBLISHED: #endif // DO_COLLISION_RECORDING void output(ostream &out) const; - INLINE void ls() const; void write(ostream &out, int indent_level) const; private: diff --git a/panda/src/physics/angularIntegrator.cxx b/panda/src/physics/angularIntegrator.cxx index 4569db5db7..b863f40ecc 100644 --- a/panda/src/physics/angularIntegrator.cxx +++ b/panda/src/physics/angularIntegrator.cxx @@ -45,8 +45,9 @@ void AngularIntegrator:: integrate(Physical *physical, AngularForceVector& forces, float dt) { // intercept in case we want to censor/adjust values - if (dt > _max_angular_dt) + if (dt > _max_angular_dt) { dt = _max_angular_dt; + } // this actually does the integration. child_integrate(physical, forces, dt); diff --git a/panda/src/physics/physicsManager.I b/panda/src/physics/physicsManager.I index 9cbfb1dfae..fdb485e137 100644 --- a/panda/src/physics/physicsManager.I +++ b/panda/src/physics/physicsManager.I @@ -147,14 +147,3 @@ attach_angular_integrator(AngularIntegrator *i) { nassertv(i); _angular_integrator = i; } - -//////////////////////////////////////////////////////////////////// -// Function: PhysicsManager::ls -// Access: Published -// Description: Shortcut for write(). This is handy for interactive -// debugging. -//////////////////////////////////////////////////////////////////// -INLINE void PhysicsManager:: -ls() const { - write(nout, 0); -} diff --git a/panda/src/physics/physicsManager.h b/panda/src/physics/physicsManager.h index 0fd6ed2a96..b4abbc2eb6 100644 --- a/panda/src/physics/physicsManager.h +++ b/panda/src/physics/physicsManager.h @@ -74,7 +74,6 @@ PUBLISHED: void do_physics(float dt); virtual void output(ostream &out) const; - INLINE void ls() const; virtual void write_physicals(ostream &out, unsigned int indent=0) const; virtual void write_linear_forces(ostream &out, unsigned int indent=0) const; virtual void write_angular_forces(ostream &out, unsigned int indent=0) const;