diff --git a/direct/src/showbase/DevWalker.py b/direct/src/showbase/DevWalker.py index 0799eed4e6..6e7b0c92a2 100755 --- a/direct/src/showbase/DevWalker.py +++ b/direct/src/showbase/DevWalker.py @@ -100,7 +100,7 @@ class DevWalker(DirectObject.DirectObject): # Check to see if we're moving at all: if self.speed or self.liftSpeed or self.slideSpeed or self.rotationSpeed: # How far did we move based on the amount of time elapsed? - dt=min(ClockObject.getGlobalClock().getDt(), 0.1) + dt=ClockObject.getGlobalClock().getDt() distance = dt * self.speed * run lift = dt * self.liftSpeed * run slideDistance = dt * self.slideSpeed * run diff --git a/direct/src/showbase/GravityWalker.py b/direct/src/showbase/GravityWalker.py index b9fa38b540..d296170e75 100755 --- a/direct/src/showbase/GravityWalker.py +++ b/direct/src/showbase/GravityWalker.py @@ -461,7 +461,7 @@ class GravityWalker(DirectObject.DirectObject): self.__oldPosDelta = self.avatarNodePath.getPosDelta(render) # How far did we move based on the amount of time elapsed? self.__oldDt = ClockObject.getGlobalClock().getDt() - dt=min(self.__oldDt, 0.1) + dt=self.__oldDt # Check to see if we're moving at all: self.moving = self.speed or self.slideSpeed or self.rotationSpeed or (self.priorParent!=Vec3.zero()) diff --git a/direct/src/showbase/NonPhysicsWalker.py b/direct/src/showbase/NonPhysicsWalker.py index 3e48ba5124..8c72cd2c6d 100755 --- a/direct/src/showbase/NonPhysicsWalker.py +++ b/direct/src/showbase/NonPhysicsWalker.py @@ -181,7 +181,7 @@ class NonPhysicsWalker(DirectObject.DirectObject): (turnRight and -self.avatarControlRotateSpeed)) # How far did we move based on the amount of time elapsed? - dt=min(ClockObject.getGlobalClock().getDt(), 0.1) + dt=ClockObject.getGlobalClock().getDt() # Check to see if we're moving at all: if self.speed or self.slideSpeed or self.rotationSpeed: if self.stopThisFrame: diff --git a/direct/src/showbase/PhysicsWalker.py b/direct/src/showbase/PhysicsWalker.py index 4a263c89fb..7bf76d268a 100755 --- a/direct/src/showbase/PhysicsWalker.py +++ b/direct/src/showbase/PhysicsWalker.py @@ -440,7 +440,7 @@ class PhysicsWalker(DirectObject.DirectObject): (turnRight and -self.avatarControlRotateSpeed)) # How far did we move based on the amount of time elapsed? - dt=min(ClockObject.getGlobalClock().getDt(), 0.1) + dt=ClockObject.getGlobalClock().getDt() if self.needToDeltaPos: self.setPriorParentVector() diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index c583421bb5..8a24ff6052 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -696,7 +696,7 @@ class ShowBase(DirectObject.DirectObject): def updateManagers(self, state): """updateManagers(self)""" - dt = min(globalClock.getDt(), 0.1) + dt = globalClock.getDt() if (self.particleMgrEnabled == 1): self.particleMgr.doParticles(dt) if (self.physicsMgrEnabled == 1): diff --git a/panda/src/collide/collisionHandlerGravity.cxx b/panda/src/collide/collisionHandlerGravity.cxx index f7e9aa9d2b..5a2bbd0f84 100755 --- a/panda/src/collide/collisionHandlerGravity.cxx +++ b/panda/src/collide/collisionHandlerGravity.cxx @@ -123,7 +123,7 @@ handle_entries() { if (_current_velocity > 0.0f || adjust < -0.001f) { // ...we have a vertical thrust, // ...or the node is above the floor, so it is airborne. - float dt = min(ClockObject::get_global_clock()->get_dt(), 0.1); + float dt = ClockObject::get_global_clock()->get_dt(); // The sign in this equation is reversed from normal. This is // because _current_velocity is a scaler and the equation normally // has a vector. I suppose the sign of _gravity could have been