diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2006-12-03 02:27:23 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2006-12-03 02:27:23 +0300 |
commit | 76616f2a3bc483e369c7349d2b3e072bde7c7325 (patch) | |
tree | adab23d33870a5b1bf9a31605fe7f26887e5f320 | |
parent | 438d114f1ac3c8eaa4c1d9d8ffa31271a51c85e6 (diff) |
gameengine: reverted some timing experiment
-rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 8 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index dcb8e082065..84fb5094b81 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -378,17 +378,11 @@ else bool doRender = frames>0; - float remainingTimeFraction = 0.f; - - if (frames>0) - { - remainingTimeFraction = (m_clockTime - m_frameTime - frames*(1.0/m_ticrate)) / frames; - } while (frames) { - m_frameTime += 1.0/m_ticrate + remainingTimeFraction; + m_frameTime += 1.0/m_ticrate; for (sceneit = m_scenes.begin();sceneit != m_scenes.end(); ++sceneit) // for each scene, call the proceed functions diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index a4fdffd0b58..5f5e54a2f3a 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -457,7 +457,7 @@ bool CcdPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep) ctrl->SynchronizeMotionStates(timeStep); } - m_dynamicsWorld->stepSimulation(timeStep,2); + m_dynamicsWorld->stepSimulation(timeStep,5); numCtrl = GetNumControllers(); for (i=0;i<numCtrl;i++) |