diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-16 15:46:10 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-16 15:46:10 +0300 |
commit | 147bd16ed1bb3415b30408b0eab110d0854eadd2 (patch) | |
tree | 8b232d5867b47e7364aa6d1db1c2a519096ec507 /source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | |
parent | e7a33d8bf4c736efe7e99fe780b3664543c365a0 (diff) | |
parent | 86c828d9fdf6df9f392f70d8ed1f0e10ce10e098 (diff) |
Merge branch 'master' into temp-ghash-experiments
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h')
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index ff8a3f4f9f9..009eb5cde24 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -22,6 +22,8 @@ subject to the following restrictions: #define __CCDPHYSICSENVIRONMENT_H__ #include "PHY_IPhysicsEnvironment.h" +#include "KX_KetsjiEngine.h" + #include <vector> #include <set> #include <map> @@ -131,8 +133,7 @@ protected: virtual void SetFixedTimeStep(bool useFixedTimeStep,float fixedTimeStep) { - //based on DEFAULT_PHYSICS_TIC_RATE of 60 hertz - SetNumTimeSubSteps((int)(fixedTimeStep / 60.f)); + SetNumTimeSubSteps((int)(fixedTimeStep / KX_KetsjiEngine::GetTicRate())); } //returns 0.f if no fixed timestep is used |