Merge branch 'fix/compile'

Fix and improve build system.

.gitignore

@@ -0,0 +1,40 @@
+# Created by https://www.toptal.com/developers/gitignore/api/c++
+# Edit at https://www.toptal.com/developers/gitignore?templates=c++
+
+### C++ ###
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# End of https://www.toptal.com/developers/gitignore/api/c++
+
+bin/

Compile.sh

@@ -1 +0,0 @@
-g++ main.cpp Missiles.cpp -l Box2D -Wl,-rpath=/usr/local/lib/ -l SDL -l SDL_gfx -std=c++11

Missiles.cpp

@@ -21,7 +21,7 @@ void updateMissiles( b2World &world, b2Body* target, bool foresee )
 	for ( b2Body* b( world.GetBodyList() ); b; b = b->GetNext() )
     {
     	// Description de l'entité
-        descr = (Entity*)b->GetUserData();
+        descr = (Entity*)b->GetUserData().pointer;
 
         // Skip entités non missile
         if ( descr == 0x0 || descr->id == LAND || descr->id == PLANE )
@@ -70,7 +70,7 @@ void updateMissiles( b2World &world, b2Body* target, bool foresee )
     // Destruction des missiles détruits
     for ( unsigned int k(0); k < dustbin.size(); k++ )
     {
-    	delete (Entity*)dustbin[k]->GetUserData() ;
+    	delete (Entity*)dustbin[k]->GetUserData().pointer;
 
     	world.DestroyBody( dustbin[k] );
     	dustbin[k] = nullptr;
@@ -82,7 +82,7 @@ void createInert( b2Vec2 from, b2Body* target, b2World &world, Identity missile
 	// Body
 	b2BodyDef bodyDef;
 	bodyDef.position = from;
-    bodyDef.userData = new Entity( {0.01f, missile} );
+    bodyDef.userData.pointer = (uintptr_t) new Entity( {0.01f, missile} );
 
     bodyDef.type = b2_dynamicBody;
     bodyDef.linearDamping = 0.01f;
@@ -133,19 +133,19 @@ b2Vec2 anticipate( b2Body* missile, b2Body* target )
 {
     // Vecteur entre le missile et la cible
     b2Vec2 destination( target->GetPosition() - missile->GetPosition() );
-    float32 distance( destination.Length() );
+    float distance( destination.Length() );
     destination *= ( 1.0f / distance );
 
     // Données sur le missile
     b2Vec2 vMissile_vec( missile->GetLinearVelocity() );
 
     // Vitesse d'approche
-    float32 incoming( b2Dot(vMissile_vec, destination) );
+    float incoming( b2Dot(vMissile_vec, destination) );
     if ( incoming == 0.0f )
         return target->GetPosition() ;
 
     // Temps d'approche
-    float32 tau( distance / incoming );
+    float tau( distance / incoming );
 
     // Données de la cible
     b2Vec2 vPlane_vec( target->GetLinearVelocity() );
@@ -155,4 +155,4 @@ b2Vec2 anticipate( b2Body* missile, b2Body* target )
 
     // Fin du calcul
     return rep;
-}
+}

Missiles.h

@@ -6,7 +6,7 @@
 # include <vector>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 
 // Identification
 enum Identity { LAND = 0, PLANE = 1, INERT = 2, ANG = 3, ARROW = 4, CHARGE = 5 };
@@ -26,4 +26,4 @@ void createInert( b2Vec2 from, b2Body* target, b2World &world, Identity missile
 
 b2Vec2 anticipate( b2Body* missile, b2Body* target );
 
-# endif // MISSILES_H
+# endif // MISSILES_H

main.cpp

@@ -7,7 +7,7 @@
 # include <SDL/SDL_gfxPrimitives.h>
 
 // bBox2D
-# include <Box2D/Box2D.h>
+# include <box2d/box2d.h>
 
 // Missiles
 # define MULTI 200.0f
@@ -84,24 +84,24 @@ int main(int argc, char** argv)
     std::vector<b2Body*> deadBodies;
 
     // Simulation settings
-    float32 timeStep = 1.0f / frameRate;
+    float timeStep = 1.0f / frameRate;
     int32 velocityIterations = 8;
     int32 positionIterations = 3;
 
     // Variables
     b2Vec2 position, force;
-    float32 angle;
+    float angle;
     Entity* descr( nullptr );
 
 	// Define the edge body
 	b2BodyDef bodyDef;
 	bodyDef.position.Set(0.0f, 0.0f);
-    bodyDef.userData = new Entity( {0.0f, LAND} );
+    bodyDef.userData.pointer = (uintptr_t) new Entity( {0.0f, LAND} );
 	b2Body* areaBody = world.CreateBody(&bodyDef);
 
 	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 );
@@ -113,7 +113,7 @@ int main(int argc, char** argv)
     // Define the plane body
     bodyDef.type = b2_dynamicBody;
     bodyDef.position.Set(areaw * 0.5f, areaw * 0.5f );
-    bodyDef.userData = new Entity( {0.05f, PLANE} );
+    bodyDef.userData.pointer = (uintptr_t) new Entity( {0.05f, PLANE} );
     bodyDef.linearDamping = 0.01f;
     bodyDef.fixedRotation = true ;
     b2Body* plane = world.CreateBody(&bodyDef);
@@ -250,7 +250,7 @@ int main(int argc, char** argv)
                 break;
             case SDL_MOUSEBUTTONDOWN:
                 std::cout << "Création tourelle." << std::endl;
-                tourelle.push_back({b2Vec2( (float32)mouse.x/MULTI, (float32)mouse.y/MULTI),
+                tourelle.push_back({b2Vec2( (float)mouse.x/MULTI, (float)mouse.y/MULTI),
                                     missile,
                                     SDL_GetTicks(),
                                     weap_wait});
@@ -321,7 +321,7 @@ int main(int argc, char** argv)
         for ( b2Body* b( world.GetBodyList() ); b; b = b->GetNext() )
         {
             // Besoin d'afficher ?
-            descr = (Entity*)b->GetUserData();
+            descr = (Entity*)b->GetUserData().pointer;
 
             if ( descr == nullptr || descr->id == LAND )
                 continue ;

makefile

@@ -0,0 +1,25 @@
+CXX=g++
+CXXFLAGS=-std=c++11
+LDFLAGS=-lSDL -lSDL_gfx -lbox2d
+INC=
+LIB=
+
+EXEC=BulletPilot
+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)