diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-12-03 04:16:17 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-12-03 04:16:17 +0300 |
| commit | 869a9e4881d29ce69f61c84c8922f8e6742b1a01 (patch) | |
| tree | e3bb18b67a8758b25020c2324857388708cddf4b /source/gameengine | |
| parent | 1f4ac018ff9cc17e1516e67b3a821de213be498f (diff) | |
more work on Bullet 2.x
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 6 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_MotionState.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index 84fb5094b81..2e0c5d713dc 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -256,9 +256,9 @@ void KX_KetsjiEngine::SetSceneConverter(KX_ISceneConverter* sceneconverter) */ void KX_KetsjiEngine::StartEngine(bool clearIpo) { - m_clockTime = 0.f;// m_kxsystem->GetTimeInSeconds(); - m_frameTime = 0.f;//m_kxsystem->GetTimeInSeconds(); - m_previousClockTime = 0.f;//m_kxsystem->GetTimeInSeconds(); + m_clockTime = m_kxsystem->GetTimeInSeconds(); + m_frameTime = m_kxsystem->GetTimeInSeconds(); + m_previousClockTime = m_kxsystem->GetTimeInSeconds(); m_firstframe = true; m_bInitialized = true; diff --git a/source/gameengine/Ketsji/KX_MotionState.cpp b/source/gameengine/Ketsji/KX_MotionState.cpp index cd01c0466cd..14849ef704c 100644 --- a/source/gameengine/Ketsji/KX_MotionState.cpp +++ b/source/gameengine/Ketsji/KX_MotionState.cpp @@ -73,7 +73,7 @@ void KX_MotionState::getWorldOrientation(float& quatIma0,float& quatIma1,float& void KX_MotionState::setWorldPosition(float posX,float posY,float posZ) { m_node->SetLocalPosition(MT_Point3(posX,posY,posZ)); - m_node->SetWorldPosition(MT_Point3(posX,posY,posZ)); + //m_node->SetWorldPosition(MT_Point3(posX,posY,posZ)); } void KX_MotionState::setWorldOrientation(float quatIma0,float quatIma1,float quatIma2,float quatReal) @@ -85,7 +85,7 @@ void KX_MotionState::setWorldOrientation(float quatIma0,float quatIma1,float qua orn[3] = quatReal; m_node->SetLocalOrientation(orn); - m_node->SetWorldOrientation(orn); + //m_node->SetWorldOrientation(orn); } |