diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2005-07-30 22:21:02 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2005-07-30 22:21:02 +0400 |
commit | 6eeaacde0aef77b294e0ac425aa68a14f38dce1b (patch) | |
tree | 716123db10af8323a3b8c0e936334628ca526d9b | |
parent | ed997ca8d27b9eeb90c9fba38693a471a312efce (diff) |
enable bullet for vc7 too by default (can be switched off easily)
-rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | 5 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_OdePhysicsController.cpp | 5 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index 2a322e52002..cf231adfd2a 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -36,10 +36,11 @@ //#define USE_SUMO_SOLID //#define USE_ODE -//on visual studio 8, always enable BULLET for now +//on visual studio 7/8, always enable BULLET for now //you can have multiple physics engines running anyway, and //the scons build system doesn't really support this at the moment. -#if 1400 <= _MSC_VER +//if you got troubles, just comment out USE_BULLET +#if 1300 <= _MSC_VER #define USE_BULLET #endif diff --git a/source/gameengine/Ketsji/KX_OdePhysicsController.cpp b/source/gameengine/Ketsji/KX_OdePhysicsController.cpp index cce2ceb70c2..58c04d34149 100644 --- a/source/gameengine/Ketsji/KX_OdePhysicsController.cpp +++ b/source/gameengine/Ketsji/KX_OdePhysicsController.cpp @@ -19,6 +19,10 @@ * * ***** 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" @@ -244,3 +248,4 @@ void KX_OdePhysicsController::SetSimulatedTime(double time) } +#endif //USE_ODE diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index fa4f45cab43..5b6db434f8b 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -33,7 +33,7 @@ bool useIslands = true; //#include "BroadphaseCollision/QueryBox.h" //todo: change this to allow dynamic registration of types! -unsigned long gNumIterations = 20; +unsigned long gNumIterations = 10; #ifdef WIN32 void DrawRasterizerLine(const float* from,const float* to,int color); |