From b0744efbce9ad023ec9d21311148e2764d0e1133 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Fri, 12 Oct 2007 06:16:23 +0000 Subject: [PATCH] fixed demo, accidently committed some testing configuration --- Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp index a27a5c9f7..4ef30d8b3 100644 --- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp +++ b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp @@ -20,8 +20,8 @@ subject to the following restrictions: //Note: some of those settings need 'DO_WALL' demo //#define USE_KINEMATIC_GROUND 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_CUSTOM_COLLISION_ALGORITHM 1 +//#define REGISTER_BOX_BOX 1 //needs to be used in combination with REGISTER_CUSTOM_COLLISION_ALGORITHM //#define USER_DEFINED_FRICTION_MODEL 1 //#define USE_CUSTOM_NEAR_CALLBACK 1 //#define CENTER_OF_MASS_SHIFT 1 @@ -121,13 +121,13 @@ btCollisionShape* shapePtr[numShapes] = #ifdef DO_BENCHMARK_PYRAMIDS new btBoxShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)), #else - //new btCylinderShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)), + new btCylinderShape (btVector3(CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS)), #endif //new btSphereShape (CUBE_HALF_EXTENTS), //new btCapsuleShape(0.5*CUBE_HALF_EXTENTS,CUBE_HALF_EXTENTS), //new btCylinderShape (btVector3(1-gCollisionMargin,CUBE_HALF_EXTENTS-gCollisionMargin,1-gCollisionMargin)), - new btConeShapeX(CUBE_HALF_EXTENTS,2.f*CUBE_HALF_EXTENTS), + //new btConeShapeX(CUBE_HALF_EXTENTS,2.f*CUBE_HALF_EXTENTS), new btSphereShape (CUBE_HALF_EXTENTS),