Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable comparison by default

Browse Source
This commit is contained in:
ejcoumans
2006-10-14 00:06:46 +00:00
parent d878885db4
commit 3db4afa4ec
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
View File

@@ -18,8 +18,16 @@ subject to the following restrictions:
//#define USE_KINEMATIC_GROUND 1 //#define USE_KINEMATIC_GROUND 1
#define REGISTER_CUSTOM_COLLISION_ALGORITHM 1 #define REGISTER_CUSTOM_COLLISION_ALGORITHM 1
//following define allows to compare/replace Bullet's constraint solver with ODE quickstep
//#define COMPARE_WITH_QUICKSTEP 1
#include "btBulletDynamicsCommon.h" #include "btBulletDynamicsCommon.h"
#ifdef COMPARE_WITH_QUICKSTEP 1
#include "../Extras/quickstep/OdeConstraintSolver.h" #include "../Extras/quickstep/OdeConstraintSolver.h"
#endif //COMPARE_WITH_QUICKSTEP
#include "LinearMath/btQuickprof.h" #include "LinearMath/btQuickprof.h"
#include "LinearMath/btIDebugDraw.h" #include "LinearMath/btIDebugDraw.h"
#include "GLDebugDrawer.h" #include "GLDebugDrawer.h"
@@ -250,8 +258,13 @@ void CcdPhysicsDemo::initPhysics()
dispatcher->registerCollisionCreateFunc(SPHERE_SHAPE_PROXYTYPE,SPHERE_SHAPE_PROXYTYPE,new btSphereSphereCollisionAlgorithm::CreateFunc); dispatcher->registerCollisionCreateFunc(SPHERE_SHAPE_PROXYTYPE,SPHERE_SHAPE_PROXYTYPE,new btSphereSphereCollisionAlgorithm::CreateFunc);
#endif //REGISTER_CUSTOM_COLLISION_ALGORITHM #endif //REGISTER_CUSTOM_COLLISION_ALGORITHM
//btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver; #ifdef COMPARE_WITH_QUICKSTEP
btConstraintSolver* solver = new OdeConstraintSolver(); btConstraintSolver* solver = new OdeConstraintSolver();
#else
//default constraint solver
btSequentialImpulseConstraintSolver* solver = new btSequentialImpulseConstraintSolver;
#endif
m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,broadphase,solver); m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,broadphase,solver);
m_dynamicsWorld->setGravity(btVector3(0,-10,0)); m_dynamicsWorld->setGravity(btVector3(0,-10,0));