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

more demo cleanup

Browse Source
This commit is contained in:
ejcoumans
2007-11-01 06:01:07 +00:00
parent f3424f491c
commit b70f5cda39
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
View File

@@ -20,7 +20,6 @@ subject to the following restrictions:
//Note: some of those settings need 'DO_WALL' demo //Note: some of those settings need 'DO_WALL' demo
//#define USE_KINEMATIC_GROUND 1 //#define USE_KINEMATIC_GROUND 1
//#define PRINT_CONTACT_STATISTICS 1 //#define PRINT_CONTACT_STATISTICS 1
//#define REGISTER_CUSTOM_COLLISION_ALGORITHM 1
//#define REGISTER_BOX_BOX 1 //needs to be used in combination with REGISTER_CUSTOM_COLLISION_ALGORITHM //#define REGISTER_BOX_BOX 1 //needs to be used in combination with REGISTER_CUSTOM_COLLISION_ALGORITHM
//#define USER_DEFINED_FRICTION_MODEL 1 //#define USER_DEFINED_FRICTION_MODEL 1
//#define USE_CUSTOM_NEAR_CALLBACK 1 //#define USE_CUSTOM_NEAR_CALLBACK 1
@@ -342,7 +341,7 @@ void CcdPhysicsDemo::initPhysics()
#ifdef DO_BENCHMARK_PYRAMIDS #ifdef DO_BENCHMARK_PYRAMIDS
setCameraDistance(2.5f); setCameraDistance(32.5f);
#endif #endif
#ifdef DO_BENCHMARK_PYRAMIDS #ifdef DO_BENCHMARK_PYRAMIDS
@@ -441,7 +440,7 @@ int maxNumOutstandingTasks = 4;
#ifdef USER_DEFINED_FRICTION_MODEL #ifdef USER_DEFINED_FRICTION_MODEL
//user defined friction model is not supported in 'cache friendly' solver yet, so switch to old solver //user defined friction model is not supported in 'cache friendly' solver yet, so switch to old solver
m_solver->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER); m_solver->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
#endif //USER_DEFINED_FRICTION_MODEL #endif //USER_DEFINED_FRICTION_MODEL
btDiscreteDynamicsWorld* world = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration); btDiscreteDynamicsWorld* world = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
@@ -601,6 +600,7 @@ int maxNumOutstandingTasks = 4;
sphereTrans.setIdentity(); sphereTrans.setIdentity();
sphereTrans.setOrigin(btVector3(0,2,40)); sphereTrans.setOrigin(btVector3(0,2,40));
btSphereShape* ball = new btSphereShape(2.f); btSphereShape* ball = new btSphereShape(2.f);
m_collisionShapes.push_back(ball);
btRigidBody* ballBody = localCreateRigidBody(10000.f,sphereTrans,ball); btRigidBody* ballBody = localCreateRigidBody(10000.f,sphereTrans,ball);
ballBody->setLinearVelocity(btVector3(0,0,-10)); ballBody->setLinearVelocity(btVector3(0,0,-10));
#endif #endif