Fix compilation for box2d 2.4.1

mutltiJoint/creater.cpp

@@ -10,23 +10,23 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // Box2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 # define MULTI 100.0f
 
 // Prototypes
 # include "creater.h"
 
-void createBloc( b2World &world, std::vector<b2Body*> &tbody, SDL_Surface* blc, float32 x, float32 y )
+void createBloc( b2World &world, std::vector<b2Body*> &tbody, SDL_Surface* blc, float x, float y )
 {
 	// Définition
 	b2BodyDef bodyDef;
 	bodyDef.type = b2_dynamicBody;
-	bodyDef.userData = blc;
+	bodyDef.userData.pointer = (uintptr_t) blc;
 	bodyDef.position.Set( x, y );
 
 	// Shape
 	b2PolygonShape dynamicBox;
-	dynamicBox.SetAsBox( (float32)blc->w * 2.0f / MULTI / 2 , (float32)blc->h * 2.0f / MULTI / 2  );
+	dynamicBox.SetAsBox( (float)blc->w * 2.0f / MULTI / 2 , (float)blc->h * 2.0f / MULTI / 2  );
 
 	// Fixture
 	b2FixtureDef fixtureDef;
@@ -57,8 +57,8 @@ void link2ByDist( b2World &world, std::vector<b2Body*> &tbody, std::vector<b2Joi
     posB = myDistJointDef.bodyB->GetPosition();
     myDistJointDef.length = ( posA - posB ).Length() / 2.0f;
 
-    myDistJointDef.frequencyHz = 4.0f ;
-    myDistJointDef.dampingRatio = 0.5f ;
+    myDistJointDef.stiffness = 4.0f ;
+    myDistJointDef.damping = 0.5f ;
 
     tjoint.push_back( 0x0 );
     tjoint.back() = world.CreateJoint(&myDistJointDef);
@@ -74,8 +74,8 @@ void link3ByDist( b2World &world, std::vector<b2Body*> &tbody, std::vector<b2Joi
 
     myDistJointDef.collideConnected = true ;
 
-    myDistJointDef.frequencyHz = 4.0f ;
-    myDistJointDef.dampingRatio = 0.5f ;
+    myDistJointDef.stiffness = 4.0f ;
+    myDistJointDef.damping = 0.5f ;
 
     // Joint 1
 	myDistJointDef.bodyA = tbody[ tbody.size() - 2];
@@ -109,4 +109,4 @@ void link3ByDist( b2World &world, std::vector<b2Body*> &tbody, std::vector<b2Joi
 
     tjoint.push_back( 0x0 );
     tjoint.back() = world.CreateJoint(&myDistJointDef);
-}
+}

mutltiJoint/creater.h

@@ -16,10 +16,10 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // Box2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 # define MULTI 100.0f
 
-void createBloc( b2World &world, std::vector<b2Body*> &tbody, SDL_Surface* blc, float32 x, float32 y );
+void createBloc( b2World &world, std::vector<b2Body*> &tbody, SDL_Surface* blc, float x, float y );
 
 void link2ByDist( b2World &world, std::vector<b2Body*> &tbody, std::vector<b2Joint*> &tjoint );
 void link3ByDist( b2World &world, std::vector<b2Body*> &tbody, std::vector<b2Joint*> &tjoint );

mutltiJoint/main.cpp

@@ -14,7 +14,7 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 
 // Creater
 # include "creater.h"
@@ -85,13 +85,13 @@ int main(int argc, char** argv)
     std::vector<b2Body*> tbody;
 
     // Simulation settings
-    float32 timeStep = 1.0f / frameRate;
+    float timeStep = 1.0f / frameRate;
     int32 velocityIterations = 8;
     int32 positionIterations = 3;
 
     // Variables
     b2Vec2 position;
-    float32 angle;
+    float angle;
 
 	// Define the edge body
 	b2BodyDef areaDef;
@@ -99,8 +99,8 @@ int main(int argc, char** argv)
 	b2Body* areaBody = world.CreateBody(&areaDef);
 
 	b2Vec2 vs[4];
-	float32 areah( (float32)screen->h / MULTI );
-	float32 areaw( (float32)screen->w / MULTI );
+	float areah( (float)screen->h / MULTI );
+	float areaw( (float)screen->w / MULTI );
 	vs[0].Set( 0.0f, 0.0f );
 	vs[1].Set( 0.0f, areah );
 	vs[2].Set( areaw, areah );
@@ -159,7 +159,7 @@ int main(int argc, char** argv)
                 	pause = !pause ;
                 	break;
                 case SDLK_a :
-                    createBloc( world, tbody, blc, (float32)(rand() % 600) / MULTI, 1.5f + (float32)(rand() % 100) / MULTI );
+                    createBloc( world, tbody, blc, (float)(rand() % 600) / MULTI, 1.5f + (float)(rand() % 100) / MULTI );
                     break;
                 case SDLK_z :
                     link2ByDist( world, tbody, tjoint );
@@ -197,7 +197,7 @@ int main(int argc, char** argv)
         {
             position = tbody[i]->GetPosition();
             angle = tbody[i]->GetAngle();
-            tempo = (SDL_Surface*)tbody[i]->GetUserData();
+            tempo = (SDL_Surface*) tbody[i]->GetUserData().pointer;
 
             tempo = rotozoomSurface( tempo, -angle * 180.0f / b2_pi, 2.15f, 0 );