diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp index 8289a2d43..493ae2c5d 100644 --- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp @@ -146,14 +146,10 @@ void ConcaveDemo::initPhysics() totalVerts,(float*) &gVertices[0].x(),vertStride); btCollisionShape* trimeshShape = new btBvhTriangleMeshShape(indexVertexArrays); - - - // btConstraintSolver* solver = new btSequentialImpulseConstraintSolver; - - btCollisionDispatcher* dispatcher = new btCollisionDispatcher(); - - btOverlappingPairCache* broadphase = new btSimpleBroadphase(); + //btConstraintSolver* solver = new btSequentialImpulseConstraintSolver; + //btCollisionDispatcher* dispatcher = new btCollisionDispatcher(); + //btOverlappingPairCache* broadphase = new btSimpleBroadphase(); m_dynamicsWorld = new btDiscreteDynamicsWorld(); diff --git a/Demos/ConstraintDemo/ConstraintDemo.cpp b/Demos/ConstraintDemo/ConstraintDemo.cpp index 0983dacf0..6b67d2015 100644 --- a/Demos/ConstraintDemo/ConstraintDemo.cpp +++ b/Demos/ConstraintDemo/ConstraintDemo.cpp @@ -52,11 +52,8 @@ void ConstraintDemo::initPhysics() { //ConstraintSolver* solver = new btSequentialImpulseConstraintSolver; //ConstraintSolver* solver = new OdeConstraintSolver; - - btCollisionDispatcher* dispatcher = new btCollisionDispatcher(); - - btOverlappingPairCache* broadphase = new btSimpleBroadphase(); - + //btCollisionDispatcher* dispatcher = new btCollisionDispatcher(); + //btOverlappingPairCache* broadphase = new btSimpleBroadphase(); m_dynamicsWorld = new btDiscreteDynamicsWorld(); @@ -80,8 +77,6 @@ void ConstraintDemo::initPhysics() clientResetScene(); { - int constraintId; - btVector3 pivotInA(CUBE_HALF_EXTENTS,-CUBE_HALF_EXTENTS,-CUBE_HALF_EXTENTS); btVector3 axisInA(0,0,1); @@ -110,7 +105,6 @@ void ConstraintDemo::clientMoveAndDisplay() glFlush(); glutSwapBuffers(); - } diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp index fa9ee66f6..25b456a4a 100644 --- a/Demos/OpenGL/DemoApplication.cpp +++ b/Demos/OpenGL/DemoApplication.cpp @@ -479,9 +479,6 @@ void DemoApplication::mouseFunc(int button, int state, int x, int y) //apply an impulse if (m_dynamicsWorld) { - float hit[3]; - float normal[3]; - btCollisionWorld::ClosestRayResultCallback rayCallback(m_cameraPosition,rayTo); m_dynamicsWorld->rayTest(m_cameraPosition,rayTo,rayCallback); if (rayCallback.HasHit()) @@ -517,8 +514,6 @@ void DemoApplication::mouseFunc(int button, int state, int x, int y) //add a point to point constraint for picking if (m_dynamicsWorld) { - float hit[3]; - float normal[3]; btCollisionWorld::ClosestRayResultCallback rayCallback(m_cameraPosition,rayTo); m_dynamicsWorld->rayTest(m_cameraPosition,rayTo,rayCallback); if (rayCallback.HasHit()) @@ -768,7 +763,7 @@ void DemoApplication::renderme() BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),buf); yStart += yIncr; - bool useBulletLCP = !(getDebugMode() & btIDebugDraw::DBG_DisableBulletLCP); + //bool useBulletLCP = !(getDebugMode() & btIDebugDraw::DBG_DisableBulletLCP); bool useCCD = (getDebugMode() & btIDebugDraw::DBG_EnableCCD); diff --git a/Demos/OpenGL/RenderTexture.cpp b/Demos/OpenGL/RenderTexture.cpp index 46bb1a78b..90ea08513 100644 --- a/Demos/OpenGL/RenderTexture.cpp +++ b/Demos/OpenGL/RenderTexture.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "renderTexture.h" +#include "RenderTexture.h" #include #include "BMF_FontData.h" diff --git a/Demos/OpenGL/RenderTexture.h b/Demos/OpenGL/RenderTexture.h index 5964f9fb9..2fd70614b 100644 --- a/Demos/OpenGL/RenderTexture.h +++ b/Demos/OpenGL/RenderTexture.h @@ -51,3 +51,4 @@ public: }; #endif //RENDER_TEXTURE_H + diff --git a/Demos/Raytracer/Raytracer.cpp b/Demos/Raytracer/Raytracer.cpp index 9f997757f..af5a1b7d8 100644 --- a/Demos/Raytracer/Raytracer.cpp +++ b/Demos/Raytracer/Raytracer.cpp @@ -46,7 +46,7 @@ Very basic raytracer, rendering into a texture. -#include "renderTexture.h" +#include "RenderTexture.h" btVoronoiSimplexSolver simplexSolver; diff --git a/Extras/GPUphysics/GPU_physics_demo.cpp b/Extras/GPUphysics/GPU_physics_demo.cpp index ff4496c4a..5a23b77b8 100644 --- a/Extras/GPUphysics/GPU_physics_demo.cpp +++ b/Extras/GPUphysics/GPU_physics_demo.cpp @@ -395,8 +395,6 @@ void initCubeVBO () for ( int i = 0 ; i < (noVertexTextureSupport ? 1 : TEX_SIZE) ; i++ ) for ( int j = 0 ; j < (noVertexTextureSupport ? 1 : TEX_SIZE) ; j++ ) { - int n = i * TEX_SIZE + j ; - /* I use the colour data to set which cube is which in the physics textures. diff --git a/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp index b5b5cf306..2e6ce9ea2 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp @@ -16,11 +16,11 @@ subject to the following restrictions: #include "btCollisionObject.h" btCollisionObject::btCollisionObject() - : m_collisionFlags(0), + : m_broadphaseHandle(0), + m_collisionShape(0), + m_collisionFlags(0), m_activationState1(1), m_deactivationTime(0.f), - m_broadphaseHandle(0), - m_collisionShape(0), m_hitFraction(1.f), m_ccdSweptShereRadius(0.f), m_ccdSquareMotionTreshold(0.f) diff --git a/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp index b03309338..0bb254a62 100644 --- a/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp @@ -54,7 +54,6 @@ void btSphereBoxCollisionAlgorithm::processCollision (btBroadphaseProxy*,btBroad return; btSphereShape* sphere0 = (btSphereShape*)m_sphereColObj ->m_collisionShape; - btBoxShape* box = (btBoxShape*)m_boxColObj->m_collisionShape; btVector3 normalOnSurfaceB; btVector3 pOnBox,pOnSphere; diff --git a/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h b/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h index 216fcf342..5a52eb9c3 100644 --- a/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h +++ b/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h @@ -61,4 +61,5 @@ public: }; -#endif //SPHERE_BOX_COLLISION_ALGORITHM_H \ No newline at end of file +#endif //SPHERE_BOX_COLLISION_ALGORITHM_H + diff --git a/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/src/BulletCollision/CollisionShapes/btConvexShape.cpp index 6f8dfaad5..9537235ff 100644 --- a/src/BulletCollision/CollisionShapes/btConvexShape.cpp +++ b/src/BulletCollision/CollisionShapes/btConvexShape.cpp @@ -16,8 +16,8 @@ subject to the following restrictions: #include "btConvexShape.h" btConvexShape::btConvexShape() -:m_collisionMargin(CONVEX_DISTANCE_MARGIN), -m_localScaling(1.f,1.f,1.f) +: m_localScaling(1.f,1.f,1.f), +m_collisionMargin(CONVEX_DISTANCE_MARGIN) { } diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp index 9a988d631..2cb2b8bf1 100644 --- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp +++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp @@ -116,7 +116,7 @@ void btDiscreteDynamicsWorld::updateVehicles(float timeStep) { BEGIN_PROFILE("updateVehicles"); - for (int i=0;iupdateVehicle( timeStep); @@ -128,7 +128,7 @@ void btDiscreteDynamicsWorld::updateActivationState(float timeStep) { BEGIN_PROFILE("updateActivationState"); - for (int i=0;i