Assorted cleanup of compilation warnings. Also fixed some actual errors:

#include "renderTexture.h"...when the file is actually called 'RenderTexture.h'.

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;
-	// btConstraintSolver* solver = new btSequentialImpulseConstraintSolver;
+	//btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
-	
+	//btOverlappingPairCache* broadphase = new btSimpleBroadphase();
-	btCollisionDispatcher* dispatcher = new	btCollisionDispatcher();
-		
-	btOverlappingPairCache* broadphase = new btSimpleBroadphase();
 
 	m_dynamicsWorld = new btDiscreteDynamicsWorld();
 	

Demos/ConstraintDemo/ConstraintDemo.cpp

@@ -52,11 +52,8 @@ void	ConstraintDemo::initPhysics()
 {
 	//ConstraintSolver* solver = new btSequentialImpulseConstraintSolver;
 	//ConstraintSolver* solver = new OdeConstraintSolver;
-
+	//btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
-	btCollisionDispatcher* dispatcher = new	btCollisionDispatcher();
+	//btOverlappingPairCache* broadphase = new btSimpleBroadphase();
-		
-	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();
-
 }
 
 

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);
 

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 <memory.h>
 #include "BMF_FontData.h"
 

Demos/OpenGL/RenderTexture.h

@@ -51,3 +51,4 @@ public:
 };
 
 #endif //RENDER_TEXTURE_H
+

Demos/Raytracer/Raytracer.cpp

@@ -46,7 +46,7 @@ Very basic raytracer, rendering into a texture.
 
 
 
-#include "renderTexture.h"
+#include "RenderTexture.h"
 
 btVoronoiSimplexSolver	simplexSolver;
 

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.

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)

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;

src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h

@@ -61,4 +61,5 @@ public:
 
 };
 
-#endif //SPHERE_BOX_COLLISION_ALGORITHM_H
+#endif //SPHERE_BOX_COLLISION_ALGORITHM_H
+

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)
 {
 }
 

src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp

@@ -116,7 +116,7 @@ void	btDiscreteDynamicsWorld::updateVehicles(float timeStep)
 {
 	BEGIN_PROFILE("updateVehicles");
 
-	for (int i=0;i<m_vehicles.size();i++)
+	for (unsigned int i=0;i<m_vehicles.size();i++)
 	{
 		btRaycastVehicle* vehicle = m_vehicles[i];
 		vehicle->updateVehicle( timeStep);
@@ -128,7 +128,7 @@ void	btDiscreteDynamicsWorld::updateActivationState(float timeStep)
 {
 	BEGIN_PROFILE("updateActivationState");
 
-	for (int i=0;i<m_collisionObjects.size();i++)
+	for (unsigned int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
 		btRigidBody* body = btRigidBody::upcast(colObj);
@@ -326,7 +326,7 @@ void	btDiscreteDynamicsWorld::updateAabbs()
 	
 	btVector3 colorvec(1,0,0);
 	btTransform predictedTrans;
-	for (int i=0;i<m_collisionObjects.size();i++)
+	for (unsigned int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
 		
@@ -354,7 +354,7 @@ void	btDiscreteDynamicsWorld::integrateTransforms(float timeStep)
 {
 	BEGIN_PROFILE("integrateTransforms");
 	btTransform predictedTrans;
-	for (int i=0;i<m_collisionObjects.size();i++)
+	for (unsigned int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
 		btRigidBody* body = btRigidBody::upcast(colObj);
@@ -375,7 +375,7 @@ void	btDiscreteDynamicsWorld::integrateTransforms(float timeStep)
 void	btDiscreteDynamicsWorld::predictUnconstraintMotion(float timeStep)
 {
 	BEGIN_PROFILE("predictUnconstraintMotion");
-	for (int i=0;i<m_collisionObjects.size();i++)
+	for (unsigned int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
 		btRigidBody* body = btRigidBody::upcast(colObj);
@@ -427,4 +427,6 @@ void	btDiscreteDynamicsWorld::startProfiling(float timeStep)
 		}
 	}
 #endif //USE_QUICKPROF
-}
+}
+
+

src/BulletDynamics/Dynamics/btRigidBody.h

@@ -289,3 +289,4 @@ public:
 
 
 #endif
+

src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp

@@ -73,7 +73,7 @@ void	btSimpleDynamicsWorld::stepSimulation(float timeStep)
 void	btSimpleDynamicsWorld::updateAabbs()
 {
 	btTransform predictedTrans;
-	for (int i=0;i<m_collisionObjects.size();i++)
+	for (unsigned int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
 		btRigidBody* body = btRigidBody::upcast(colObj);
@@ -93,7 +93,7 @@ void	btSimpleDynamicsWorld::updateAabbs()
 void	btSimpleDynamicsWorld::integrateTransforms(float timeStep)
 {
 	btTransform predictedTrans;
-	for (int i=0;i<m_collisionObjects.size();i++)
+	for (unsigned int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
 		btRigidBody* body = btRigidBody::upcast(colObj);
@@ -112,7 +112,7 @@ void	btSimpleDynamicsWorld::integrateTransforms(float timeStep)
 
 void	btSimpleDynamicsWorld::predictUnconstraintMotion(float timeStep)
 {
-	for (int i=0;i<m_collisionObjects.size();i++)
+	for (unsigned int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
 		btRigidBody* body = btRigidBody::upcast(colObj);

src/LinearMath/btQuickprof.h

@@ -683,4 +683,5 @@ std::string btProfiler::createStatsString(BlockTimingMethod method)
 
 #endif //USE_QUICKPROF
 
-#endif //QUICK_PROF_H
+#endif //QUICK_PROF_H
+