Bump box2d version from v2.3.1 to v2.4.1

Modernize build system as well.

.gitignore

@@ -27,4 +27,4 @@
 *.exe
 *.out
 *.app
-
+bin/

Car.cpp

@@ -88,7 +88,7 @@ void Car::drive( command cmd )
 	}
 }
 
-void Car::jump( float32 correction )
+void Car::jump( float correction )
 {
      // Jump
      b2Vec2 spring;
@@ -103,7 +103,7 @@ void Car::jump( float32 correction )
      m_bodyCar->ApplyAngularImpulse( - m_bodyCar->GetAngle() * correction, true );
 }
 
-void Car::spin( float32 tq )
+void Car::spin( float tq )
 {
     // Couple sur le carénage
     m_bodyCar->ApplyAngularImpulse( tq, true );
@@ -135,12 +135,12 @@ b2Vec2 Car::GetVelocity()
 	return m_bodyCar->GetLinearVelocity();
 }
 
-float32 Car::GetTorque()
+float Car::GetTorque()
 {
 	return m_currentTorque;
 }
 
-float32 Car::GetSpeed()
+float Car::GetSpeed()
 {
 	return m_currentSpeed;
 }
@@ -155,7 +155,7 @@ bool Car::GetIsOnGround()
     return rep;
 }
 
-void Car::createMotorWheel( b2World &world, b2Vec2 rel, float32 friction, float32 density )
+void Car::createMotorWheel( b2World &world, b2Vec2 rel, float friction, float density )
 {
      // Vérifie la présence d'image
      if ( m_imgWheel == 0x0 )
@@ -172,8 +172,8 @@ void Car::createMotorWheel( b2World &world, b2Vec2 rel, float32 friction, float3
      }
 
      // Dimensions
-     float32 rwheel;
-     rwheel = (float32)m_imgWheel->h / MULTI / 2 ;
+     float rwheel;
+     rwheel = (float)m_imgWheel->h / MULTI / 2 ;
 
      // Définition body
      b2BodyDef bodyDef;
@@ -182,7 +182,7 @@ void Car::createMotorWheel( b2World &world, b2Vec2 rel, float32 friction, float3
      bodyDef.type = b2_dynamicBody;
 
      // Roue moteur
-     bodyDef.userData = m_imgWheel ;
+     bodyDef.userData.pointer = (uintptr_t) m_imgWheel ;
      bodyDef.position = m_bodyCar->GetPosition() + rel ;
 
      dynamicCircle.m_radius = rwheel ;
@@ -210,7 +210,7 @@ void Car::createMotorWheel( b2World &world, b2Vec2 rel, float32 friction, float3
      return ;
 }
 
-void Car::createFreeWheel( b2World &world, b2Vec2 rel, float32 friction, float32 density )
+void Car::createFreeWheel( b2World &world, b2Vec2 rel, float friction, float density )
 {
      // Vérifie la présence d'image
      if ( m_imgWheel == 0x0 )
@@ -227,8 +227,8 @@ void Car::createFreeWheel( b2World &world, b2Vec2 rel, float32 friction, float32
      }
 
      // Dimensions
-     float32 rwheel;
-     rwheel = (float32)m_imgWheel->h / MULTI / 2 ;
+     float rwheel;
+     rwheel = (float)m_imgWheel->h / MULTI / 2 ;
 
      // Définition body
      b2BodyDef bodyDef;
@@ -237,7 +237,7 @@ void Car::createFreeWheel( b2World &world, b2Vec2 rel, float32 friction, float32
      bodyDef.type = b2_dynamicBody;
 
      // Roue avant
-     bodyDef.userData = m_imgWheel ;
+     bodyDef.userData.pointer = (uintptr_t) m_imgWheel ;
      bodyDef.position = m_bodyCar->GetPosition() + rel ;
 
      dynamicCircle.m_radius = rwheel ;
@@ -261,7 +261,7 @@ void Car::createFreeWheel( b2World &world, b2Vec2 rel, float32 friction, float32
      return ;
 }
 
-void Car::createCarenage( b2World &world, float32 x, float32 y, float32 friction, float32 density )
+void Car::createCarenage( b2World &world, float x, float y, float friction, float density )
 {
      // Vérifie si présence de carénage
      if ( m_bodyCar != 0x0 )
@@ -271,9 +271,9 @@ void Car::createCarenage( b2World &world, float32 x, float32 y, float32 friction
      }
 
      // Dimensions
-     float32 wtruck, htruck ;
-     wtruck = (float32)m_imgCar->w / MULTI / 2 ;
-     htruck = (float32)m_imgCar->h / MULTI / 2 ;
+     float wtruck, htruck ;
+     wtruck = (float)m_imgCar->w / MULTI / 2 ;
+     htruck = (float)m_imgCar->h / MULTI / 2 ;
 
      // Définition body
      b2BodyDef bodyDef;
@@ -282,7 +282,7 @@ void Car::createCarenage( b2World &world, float32 x, float32 y, float32 friction
      bodyDef.type = b2_dynamicBody;
 
      // Carrosserie
-     bodyDef.userData = m_imgCar ;
+	 bodyDef.userData.pointer = (uintptr_t) m_imgCar ;
      bodyDef.position.Set( x, y );
 
      dynamicBox.SetAsBox( wtruck, htruck );

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 };
@@ -30,23 +30,23 @@ public:
 	virtual ~Car();
 
 	void destroy( b2World &world );
-	virtual void init( b2World &world, float32 x, float32 y, float32 angle = 0.0f ) = 0;
+	virtual void init( b2World &world, float x, float y, float angle = 0.0f ) = 0;
 
 	void drive( command cmd );
-	void jump( float32 correction = 0.0f );
-	void spin( float32 tq );
+	void jump( float correction = 0.0f );
+	void spin( float tq );
 	virtual void update();
 
 	b2Vec2 GetPosition();
 	b2Vec2 GetVelocity();
-	float32 GetTorque();
-	float32 GetSpeed();
+	float GetTorque();
+	float GetSpeed();
 	bool GetIsOnGround();
 
 protected:
-	void createMotorWheel( b2World &world, b2Vec2 rel, float32 friction = 10.0f, float32 density = 0.25f );
-	void createFreeWheel( b2World &world, b2Vec2 rel, float32 friction = 10.0f, float32 density = 0.25f );
-	void createCarenage( b2World &world, float32 x, float32 y, float32 friction = 1.0f, float32 density = 1.0f );
+	void createMotorWheel( b2World &world, b2Vec2 rel, float friction = 10.0f, float density = 0.25f );
+	void createFreeWheel( b2World &world, b2Vec2 rel, float friction = 10.0f, float density = 0.25f );
+	void createCarenage( b2World &world, float x, float y, float friction = 1.0f, float density = 1.0f );
 
 /// Attributs
 protected:
@@ -63,14 +63,14 @@ private:
 
 	command m_cmd ;
 
-	float32 m_currentTorque ;
-	float32 m_currentSpeed ;
-	float32 m_sense ;
-	float32 m_latence ;
+	float m_currentTorque ;
+	float m_currentSpeed ;
+	float m_sense ;
+	float m_latence ;
 
-	float32 m_goTorque ;
-	float32 m_minTorque ;
-	float32 m_maxSpeed ;
+	float m_goTorque ;
+	float m_minTorque ;
+	float m_maxSpeed ;
 };
 
 

Cars/PickUp.cpp

@@ -10,7 +10,7 @@ PickUp::~PickUp()
      //dtor
 }
 
-void PickUp::init( b2World &world, float32 x, float32 y, float32 angle )
+void PickUp::init( b2World &world, float x, float y, float angle )
 {
 	// Images
 	if ( m_imgCar == nullptr )

Cars/PickUp.h

@@ -11,7 +11,7 @@ class PickUp : public Car
           PickUp();
           virtual ~PickUp();
 
-          virtual void init( b2World &world, float32 x, float32 y, float32 angle = 0.0f );
+          virtual void init( b2World &world, float x, float y, float angle = 0.0f );
 
 /// Attributs
      protected:

Cars/PinkLiner.cpp

@@ -10,7 +10,7 @@ PinkLiner::~PinkLiner()
      //dtor
 }
 
-void PinkLiner::init( b2World &world, float32 x, float32 y, float32 angle )
+void PinkLiner::init( b2World &world, float x, float y, float angle )
 {
 	// Images
 	if ( m_imgCar == nullptr )

Cars/PinkLiner.h

@@ -11,7 +11,7 @@ class PinkLiner : public Car
           PinkLiner();
           virtual ~PinkLiner();
 
-          virtual void init( b2World &world, float32 x, float32 y, float32 angle = 0.0f );
+          virtual void init( b2World &world, float x, float y, float angle = 0.0f );
 
 /// Attributs
      protected:

Makefile

@@ -1,25 +0,0 @@
-# Flags:
-#  -g    adds debugging information to the executable file
-#  -Wall turns on most, but not all, compiler warnings
-FLAGS = -g -Wall -std=c++11 -O
-
-# Libraries :
-# Box2D -Wl,-rpath=/usr/local/lib/
-# SDL
-# SDL_gfx
-# SDL_image
-LIBS = -l Box2D -Wl,-rpath=/usr/local/lib/ -l SDL -l SDL_gfx -l SDL_image
-
-# Name of output:
-NAME = a.out
-
-# Names of cpp files:
-FILES = main.cpp Terrain.cpp Cars/PickUp.cpp Cars/PinkLiner.cpp Car.cpp SnapFile.cpp
-
-default: build
-
-build: $(FILES)
-	g++ $(FLAGS) $(FILES) $(LIBS) -o $(NAME)
-
-clean:
-	$(RM) $(NAME)

Terrain.cpp

@@ -93,7 +93,8 @@ void Terrain::build( b2World &world )
 	m_areaBody = world.CreateBody(&areaDef);
 
 	b2ChainShape chain;
-	chain.CreateChain( m_plot, m_size );
+	b2Vec2 prev(m_plot[0]), next(m_plot[m_size - 1]);
+	chain.CreateChain( m_plot, m_size, prev, next );
 	m_areaBody->CreateFixture( &chain, 0.0f );
 }
 

Terrain.h

@@ -18,7 +18,7 @@
 # include <SDL/SDL_image.h>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 # define MULTI 100.0f
 
 class Terrain

main.cpp

@@ -14,7 +14,7 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 
 // Local
 # include "Cars/PickUp.h"
@@ -77,15 +77,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, multi(MULTI);
+    float angle, multi(MULTI);
     b2Vec2 position, ref, decalage;
 
 	// 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 );
 
     // Terrain
     //std::cout << "Quel niveau ?" << std::endl;
@@ -240,7 +240,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 ;
 

makefile

@@ -0,0 +1,25 @@
+CXX=g++
+CXXFLAGS=-std=c++11 -O
+LDFLAGS=-l SDL -l SDL_gfx -l SDL_image -l box2d
+INC=
+LIB=
+
+EXEC=BouncyDriver
+SRC=$(shell find . -name '*.cpp') 
+OBJ=$(SRC:.cpp=.o)
+
+$(EXEC): $(OBJ)
+	@mkdir -p bin
+	$(CXX) -o bin/$@ $^ $(LDFLAGS) $(LIB)
+
+%.o : %.cpp 
+	$(CXX) -o $@ -c $< $(CXXFLAGS) $(INC)
+	
+clean:
+	rm -rf $(OBJ)
+
+distclean: clean
+	rm -rf $(EXEC)
+
+exec: $(EXEC)
+	./bin/$(EXEC)