enable bullet for vc7 too by default (can be switched off easily)
[blender.git] / source / gameengine / Ketsji / KX_OdePhysicsController.cpp
index e6c135b6aea202826c4ea9a342af8519ec85e38c..58c04d34149b239b9dc6d2fe20765f1cba506059 100644 (file)
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
+#include "KX_ConvertPhysicsObject.h"
+
+#ifdef USE_ODE
+
 #include "KX_OdePhysicsController.h"
 #include "KX_GameObject.h"
 #include "KX_MotionState.h"
 
+#include "MT_assert.h"
+
+#include "PHY_IPhysicsEnvironment.h"
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -62,7 +70,7 @@ void                  KX_OdePhysicsController::SetObject (SG_IObject* object)
 
        // cheating here...
        KX_GameObject* gameobj = (KX_GameObject*)       object->GetSGClientObject();
-       gameobj->m_pPhysicsController1 = this;
+       gameobj->SetPhysicsController(this);
        
 }
 
@@ -225,7 +233,7 @@ SG_Controller*      KX_OdePhysicsController::GetReplica(class SG_Node* destnode)
        
 }
 
-void   KX_OdePhysicsController::resolveCombinedVelocities(const MT_Vector3 & lin_vel, const MT_Vector3 & ang_vel )
+void           KX_OdePhysicsController::resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ)
 {
 }
 
@@ -240,3 +248,4 @@ void        KX_OdePhysicsController::SetSimulatedTime(double time)
 
 }
        
+#endif //USE_ODE