Browse Source

use global cap on dt, not local cap

David Rose 22 years ago
parent
commit
03b156dee1

+ 1 - 1
direct/src/showbase/DevWalker.py

@@ -100,7 +100,7 @@ class DevWalker(DirectObject.DirectObject):
         # Check to see if we're moving at all:
         # Check to see if we're moving at all:
         if self.speed or self.liftSpeed or self.slideSpeed or self.rotationSpeed:
         if self.speed or self.liftSpeed or self.slideSpeed or self.rotationSpeed:
             # How far did we move based on the amount of time elapsed?
             # 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
             distance = dt * self.speed * run
             lift = dt * self.liftSpeed * run
             lift = dt * self.liftSpeed * run
             slideDistance = dt * self.slideSpeed * run
             slideDistance = dt * self.slideSpeed * run

+ 1 - 1
direct/src/showbase/GravityWalker.py

@@ -461,7 +461,7 @@ class GravityWalker(DirectObject.DirectObject):
         self.__oldPosDelta = self.avatarNodePath.getPosDelta(render)
         self.__oldPosDelta = self.avatarNodePath.getPosDelta(render)
         # How far did we move based on the amount of time elapsed?
         # How far did we move based on the amount of time elapsed?
         self.__oldDt = ClockObject.getGlobalClock().getDt()
         self.__oldDt = ClockObject.getGlobalClock().getDt()
-        dt=min(self.__oldDt, 0.1)
+        dt=self.__oldDt
 
 
         # Check to see if we're moving at all:
         # Check to see if we're moving at all:
         self.moving = self.speed or self.slideSpeed or self.rotationSpeed or (self.priorParent!=Vec3.zero())
         self.moving = self.speed or self.slideSpeed or self.rotationSpeed or (self.priorParent!=Vec3.zero())

+ 1 - 1
direct/src/showbase/NonPhysicsWalker.py

@@ -181,7 +181,7 @@ class NonPhysicsWalker(DirectObject.DirectObject):
                 (turnRight and -self.avatarControlRotateSpeed))
                 (turnRight and -self.avatarControlRotateSpeed))
             
             
         # How far did we move based on the amount of time elapsed?
         # 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:
         # Check to see if we're moving at all:
         if self.speed or self.slideSpeed or self.rotationSpeed:
         if self.speed or self.slideSpeed or self.rotationSpeed:
             if self.stopThisFrame:
             if self.stopThisFrame:

+ 1 - 1
direct/src/showbase/PhysicsWalker.py

@@ -440,7 +440,7 @@ class PhysicsWalker(DirectObject.DirectObject):
                 (turnRight and -self.avatarControlRotateSpeed))
                 (turnRight and -self.avatarControlRotateSpeed))
 
 
         # How far did we move based on the amount of time elapsed?
         # 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:
         if self.needToDeltaPos:
             self.setPriorParentVector()
             self.setPriorParentVector()

+ 1 - 1
direct/src/showbase/ShowBase.py

@@ -696,7 +696,7 @@ class ShowBase(DirectObject.DirectObject):
 
 
     def updateManagers(self, state):
     def updateManagers(self, state):
         """updateManagers(self)"""
         """updateManagers(self)"""
-        dt = min(globalClock.getDt(), 0.1)
+        dt = globalClock.getDt()
         if (self.particleMgrEnabled == 1):
         if (self.particleMgrEnabled == 1):
             self.particleMgr.doParticles(dt)
             self.particleMgr.doParticles(dt)
         if (self.physicsMgrEnabled == 1):
         if (self.physicsMgrEnabled == 1):

+ 1 - 1
panda/src/collide/collisionHandlerGravity.cxx

@@ -123,7 +123,7 @@ handle_entries() {
           if (_current_velocity > 0.0f || adjust < -0.001f) {
           if (_current_velocity > 0.0f || adjust < -0.001f) {
             // ...we have a vertical thrust,
             // ...we have a vertical thrust,
             // ...or the node is above the floor, so it is airborne.
             // ...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
             // The sign in this equation is reversed from normal.  This is
             // because _current_velocity is a scaler and the equation normally
             // because _current_velocity is a scaler and the equation normally
             // has a vector.  I suppose the sign of _gravity could have been
             // has a vector.  I suppose the sign of _gravity could have been