Make the project compile

carTest/Car.cpp

@@ -22,7 +22,7 @@ Car::~Car()
 		SDL_FreeSurface( m_imgWheel );
 }
 
-void Car::init( b2World &world, float32 x, float32 y, float32 angle )
+void Car::init( b2World &world, float x, float y, float angle )
 {
 	// Images
 	m_imgCar = SDL_LoadBMP("Truck.bmp");
@@ -32,10 +32,10 @@ void Car::init( b2World &world, float32 x, float32 y, float32 angle )
     SDL_SetColorKey( m_imgWheel, SDL_SRCCOLORKEY, SDL_MapRGBA( m_imgWheel->format, 0, 0, 0, 255 ) );
 
     // Dimensions
-    float32 wtruck, htruck, rwheel;
-    wtruck = (float32)m_imgCar->w / MULTI / 2 ;
-    htruck = (float32)m_imgCar->h / MULTI / 2 ;
-    rwheel = (float32)m_imgWheel->h / MULTI / 2 ;
+    float wtruck, htruck, rwheel;
+    wtruck = (float)m_imgCar->w / MULTI / 2 ;
+    htruck = (float)m_imgCar->h / MULTI / 2 ;
+    rwheel = (float)m_imgWheel->h / MULTI / 2 ;
 
     // Définition body
     b2BodyDef bodyDef;
@@ -44,7 +44,7 @@ void Car::init( b2World &world, float32 x, float32 y, float32 angle )
     bodyDef.type = b2_dynamicBody;
 
 	// Roue arrière
-	bodyDef.userData = m_imgWheel ;
+	bodyDef.userData.pointer = (uintptr_t) m_imgWheel ;
     bodyDef.position.Set( x - wtruck + rwheel, y + htruck + rwheel );
 
     b2CircleShape dynamicCircle;
@@ -70,7 +70,7 @@ void Car::init( b2World &world, float32 x, float32 y, float32 angle )
     m_bodyWheelFwd->CreateFixture(&fixtureDef);
 
     // Carrosserie
-    bodyDef.userData = m_imgCar ;
+    bodyDef.userData.pointer = (uintptr_t) m_imgCar ;
     bodyDef.position.Set( x, y );
 
     dynamicBox.SetAsBox( wtruck, htruck );
@@ -145,4 +145,4 @@ void Car::update()
 b2Vec2 Car::GetPosition()
 {
 	return m_bodyCar->GetPosition();
-}
+}

carTest/Car.h

@@ -17,7 +17,7 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 # define MULTI 100.0f
 
 enum command { FREE, BREAK, GO, REVERSE };
@@ -28,7 +28,7 @@ public:
 	Car();
 	virtual ~Car();
 
-	void init( b2World &world, float32 x, float32 y, float32 angle = 0.0f );
+	void init( b2World &world, float x, float y, float angle = 0.0f );
 
 	void drive( command cmd );
 	void update();
@@ -48,12 +48,12 @@ protected:
 
 	command m_cmd ;
 
-	float32 m_currentTorque ;
-	float32 m_currentSpeed ;
+	float m_currentTorque ;
+	float m_currentSpeed ;
 
-	float32 m_goTorque ;
-	float32 m_minTorque ;
-	float32 m_maxSpeed ;
+	float m_goTorque ;
+	float m_minTorque ;
+	float m_maxSpeed ;
 };
 
 

carTest/Terrain.cpp

@@ -12,7 +12,7 @@ Terrain::~Terrain()
 	m_plot = 0x0 ;
 }
 	
-void Terrain::addPlot( float32 x, float32 y )
+void Terrain::addPlot( float x, float y )
 {
 	if ( m_nextAdd == m_size )
 		return ;
@@ -29,7 +29,7 @@ void Terrain::build( b2World &world )
 	b2Body* areaBody = world.CreateBody(&areaDef);
 
 	b2ChainShape chain;
-	chain.CreateChain( m_plot, m_nextAdd );
+	chain.CreateChain( m_plot, m_nextAdd, m_plot[0], m_plot[m_size - 1]  );
 	areaBody->CreateFixture( &chain, 0.0f );
 }
 
@@ -46,4 +46,4 @@ void Terrain::draw( SDL_Surface* screen, b2Vec2 origin )
 
 		lineRGBA (screen, x1, y1, x2, y2, 255, 0, 0, 255);
 	}
-}
+}

carTest/Terrain.h

@@ -15,7 +15,7 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 # define MULTI 100.0f
 
 class Terrain
@@ -24,7 +24,7 @@ public:
 	Terrain( const unsigned int size );
 	~Terrain();
 	
-	void addPlot( float32 x, float32 y );
+	void addPlot( float x, float y );
 	void build( b2World &world );
 
 	void draw( SDL_Surface* screen, b2Vec2 origin );

carTest/main.cpp

@@ -14,7 +14,7 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 # define MULTI 100.0f
 
 // Local
@@ -74,15 +74,15 @@ int main(int argc, char** argv)
     b2World world(gravity);
 
     // Simulation settings
-    float32 timeStep = 1.0f / frameRate;
+    float timeStep = 1.0f / frameRate;
     int32 velocityIterations = 8;
     int32 positionIterations = 3;
-    float32 angle ;
+    float angle ;
     b2Vec2 position, ref ;
 
 	// Define the edge body
-	float32 areah( (float32)screen->h / MULTI );
-	float32 areaw( (float32)screen->w / MULTI );
+	float areah( (float)screen->h / MULTI );
+	float areaw( (float)screen->w / MULTI );
 
     # define NB_PLOT 400
     Terrain myTerrain( NB_PLOT );
@@ -186,7 +186,7 @@ int main(int argc, char** argv)
             position = b->GetPosition() - ref ;
             angle = b->GetAngle();
 
-            tempo = (SDL_Surface*)b->GetUserData();
+            tempo = (SDL_Surface*)b->GetUserData().pointer;
             if ( tempo == 0x0 )
                 continue ;