more work on Bullet 2.x
authorErwin Coumans <blender@erwincoumans.com>
Sun, 3 Dec 2006 01:16:17 +0000 (01:16 +0000)
committerErwin Coumans <blender@erwincoumans.com>
Sun, 3 Dec 2006 01:16:17 +0000 (01:16 +0000)
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_MotionState.cpp

index 84fb5094b81bbcc68a9cee6c55ae64a6be12676f..2e0c5d713dc40665b5539c56925d6e2601917c57 100644 (file)
@@ -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;
index cd01c0466cd6deae80bfe6902813ce04f500a30d..14849ef704c38ab54ca68648874882faec0ab17c 100644 (file)
@@ -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);
 
 }