Organisation du code dans des sous-dossiers

CMakeLists.txt

@@ -3,7 +3,7 @@ project(skizzle)
 
 # Inclusion des fichiers d'en-tête et de source
 include_directories(include)
-file(GLOB SOURCES "src/*.cpp")
+file(GLOB_RECURSE SOURCES "src/*.cpp")
 
 # Affichage de tous les avertisements
 if(MSVC)

include/gui/toolbar.hpp

@@ -5,9 +5,9 @@
 #include <SFML/Graphics.hpp>
 #include <map>
 #include <functional>
-#include "object.hpp"
+#include "../objects/object.hpp"
+#include "../states/level.hpp"
 #include "object_button.hpp"
-#include "level.hpp"
 
 class Editor;
 

include/states/editor.hpp

@@ -1,10 +1,8 @@
 #ifndef __SKIZZLE_EDITOR_HPP__
 #define __SKIZZLE_EDITOR_HPP__
 
+#include "../gui/toolbar.hpp"
 #include "level.hpp"
-#include "toolbar.hpp"
-#include <unordered_map>
-#include <memory>
 
 /**
  * La classe Editor permet l'édition de

include/states/level.hpp

@@ -3,9 +3,9 @@
 
 #include <fstream>
 #include <vector>
+#include "../objects/object.hpp"
+#include "../objects/player.hpp"
 #include "state.hpp"
-#include "object.hpp"
-#include "player.hpp"
 
 class Manager;
 

include/states/menu.hpp

@@ -1,10 +1,10 @@
 #ifndef __SKIZZLE_MENU_HPP__
 #define __SKIZZLE_MENU_HPP__
 
-#include "state.hpp"
 #include <functional>
 #include <vector>
 #include <memory>
+#include "state.hpp"
 
 class Manager;
 

src/gui/object_button.cpp

@@ -3,7 +3,7 @@
 #include <SFGUI/Renderer.hpp>
 #include <SFGUI/RenderQueue.hpp>
 #include <cmath>
-#include "object_button.hpp"
+#include "gui/object_button.hpp"
 
 ObjectButton::Ptr ObjectButton::Create(
     sfg::Image::Ptr image,

src/gui/toolbar.cpp

@@ -1,12 +1,12 @@
 #include "resource_manager.hpp"
-#include "editor.hpp"
+#include "states/editor.hpp"
-#include "toolbar.hpp"
+#include "objects/block.hpp"
-#include "block.hpp"
+#include "objects/player.hpp"
-#include "player.hpp"
+#include "objects/switch_block.hpp"
-#include "switch_block.hpp"
+#include "objects/gravity_block.hpp"
-#include "gravity_block.hpp"
+#include "objects/kill_block.hpp"
-#include "kill_block.hpp"
+#include "objects/finish_block.hpp"
-#include "finish_block.hpp"
+#include "gui/toolbar.hpp"
 
 const int Toolbar::CREATORS_TABLE_WIDTH = 3;
 

src/main.cpp

@@ -1,9 +1,8 @@
-#include "manager.hpp"
-#include "editor.hpp"
-#include "menu.hpp"
-#include "game.hpp"
 #include <iostream>
 #include <memory>
+#include <utility>
+#include "manager.hpp"
+#include "states/menu.hpp"
 
 int main() {
     // le gestionnaire du jeu gère la pile d'états

src/manager.cpp

@@ -1,7 +1,7 @@
-#include "state.hpp"
-#include "manager.hpp"
-#include "resource_manager.hpp"
 #include <algorithm>
+#include "states/state.hpp"
+#include "resource_manager.hpp"
+#include "manager.hpp"
 
 const unsigned int Manager::FPS = 60;
 const sf::Time Manager::FRAME_TIME = sf::seconds(1.f / Manager::FPS);

src/objects/block.cpp

@@ -1,9 +1,8 @@
-#include "block.hpp"
-#include "level.hpp"
-#include "game.hpp"
-#include "player.hpp"
 #include "manager.hpp"
 #include "resource_manager.hpp"
+#include "states/game.hpp"
+#include "objects/player.hpp"
+#include "objects/block.hpp"
 
 const unsigned int Block::TYPE_ID = 2;
 

src/objects/collision.cpp

@@ -1,11 +1,6 @@
-#include "collision.hpp"
-#include "player.hpp"
-#include "block.hpp"
-#include "gravity_block.hpp"
-#include "object.hpp"
-#include <functional>
-#include <utility>
 #include <cmath>
+#include "objects/object.hpp"
+#include "objects/collision.hpp"
 
 /**
  * Définition des variables et fonctions globales internes

src/objects/finish_block.cpp

@@ -1,7 +1,7 @@
 #include "manager.hpp"
 #include "resource_manager.hpp"
-#include "finish_block.hpp"
+#include "states/game.hpp"
-#include "game.hpp"
+#include "objects/finish_block.hpp"
 
 const unsigned int FinishBlock::TYPE_ID = 4;
 

src/objects/gravity_block.cpp

@@ -1,8 +1,8 @@
 #include "manager.hpp"
 #include "resource_manager.hpp"
 #include "utility.hpp"
-#include "gravity_block.hpp"
+#include "states/game.hpp"
-#include "game.hpp"
+#include "objects/gravity_block.hpp"
 
 const unsigned int GravityBlock::TYPE_ID = 3;
 

src/objects/kill_block.cpp

@@ -1,8 +1,8 @@
 #include "manager.hpp"
 #include "resource_manager.hpp"
-#include "kill_block.hpp"
+#include "states/game.hpp"
-#include "game.hpp"
+#include "objects/player.hpp"
-#include "player.hpp"
+#include "objects/kill_block.hpp"
 
 const unsigned int KillBlock::TYPE_ID = 5;
 

src/objects/object.cpp

@@ -1,8 +1,8 @@
-#include "manager.hpp"
-#include "object.hpp"
-#include "game.hpp"
-#include "collision.hpp"
 #include <cmath>
+#include "manager.hpp"
+#include "states/game.hpp"
+#include "objects/collision.hpp"
+#include "objects/object.hpp"
 
 /**
  * Définition des variables et fonctions globales internes

src/objects/player.cpp

@@ -1,7 +1,7 @@
 #include "manager.hpp"
 #include "resource_manager.hpp"
-#include "player.hpp"
+#include "states/game.hpp"
-#include "game.hpp"
+#include "objects/player.hpp"
 
 const unsigned int Player::TYPE_ID = 1;
 

src/objects/switch_block.cpp

@@ -1,8 +1,8 @@
 #include "manager.hpp"
 #include "resource_manager.hpp"
 #include "utility.hpp"
-#include "switch_block.hpp"
+#include "states/game.hpp"
-#include "game.hpp"
+#include "objects/switch_block.hpp"
 
 const unsigned int SwitchBlock::TYPE_ID = 6;
 

src/resource_manager.cpp

@@ -1,6 +1,6 @@
-#include "resource_manager.hpp"
 #include <iostream>
 #include <utility>
+#include "resource_manager.hpp"
 
 namespace fs = boost::filesystem;
 

src/states/editor.cpp

@@ -1,9 +1,9 @@
-#include "manager.hpp"
-#include "resource_manager.hpp"
-#include "editor.hpp"
-#include "game.hpp"
 #include <cmath>
 #include <algorithm>
+#include "manager.hpp"
+#include "resource_manager.hpp"
+#include "states/game.hpp"
+#include "states/editor.hpp"
 
 /**
  * Définition des variables et fonctions globales internes

src/states/game.cpp

@@ -1,10 +1,10 @@
 #include <iostream>
 #include <cmath>
-#include "utility.hpp"
 #include "manager.hpp"
 #include "resource_manager.hpp"
-#include "game.hpp"
+#include "utility.hpp"
-#include "player.hpp"
+#include "objects/player.hpp"
+#include "states/game.hpp"
 
 /**
  * Définition des variables et fonctions globales internes

src/states/level.cpp

@@ -1,18 +1,17 @@
-#include "manager.hpp"
-#include "resource_manager.hpp"
-#include "level.hpp"
-#include "player.hpp"
-#include "block.hpp"
-#include "utility.hpp"
-#include "gravity_block.hpp"
-#include "switch_block.hpp"
-#include "finish_block.hpp"
-#include "kill_block.hpp"
 #include <boost/filesystem.hpp>
 #include <arpa/inet.h>
 #include <cstring>
 #include <functional>
-#include <queue>
+#include "manager.hpp"
+#include "resource_manager.hpp"
+#include "utility.hpp"
+#include "objects/player.hpp"
+#include "objects/block.hpp"
+#include "objects/gravity_block.hpp"
+#include "objects/switch_block.hpp"
+#include "objects/finish_block.hpp"
+#include "objects/kill_block.hpp"
+#include "states/level.hpp"
 
 /**
  * Définition des variables et fonctions globales internes

src/states/menu.cpp

@@ -1,11 +1,11 @@
-#include "manager.hpp"
-#include "resource_manager.hpp"
-#include "menu.hpp"
-#include "rules.hpp"
-#include "editor.hpp"
-#include "game.hpp"
 #include <boost/filesystem.hpp>
 #include <cmath>
+#include "manager.hpp"
+#include "resource_manager.hpp"
+#include "states/rules.hpp"
+#include "states/editor.hpp"
+#include "states/game.hpp"
+#include "states/menu.hpp"
 
 /**
  * Définition des variables et fonctions globales internes

src/states/rules.cpp

@@ -1,9 +1,9 @@
-#include "rules.hpp"
 #include "manager.hpp"
 #include "resource_manager.hpp"
+#include "states/rules.hpp"
 
 Rules::Rules(Manager& manager) : State(manager) {
-    background.setTexture(*ResourceManager::get().getTexture("rules.png"));
+    background.setTexture(*ResourceManager::get().getTexture("rules.tga"));
 }
 
 Rules::~Rules() {}

src/states/state.cpp

@@ -1,5 +1,5 @@
-#include "state.hpp"
 #include "manager.hpp"
+#include "states/state.hpp"
 
 State::State(Manager& manager) : manager(manager) {}
 State::~State() {}

src/utility.cpp

@@ -1,6 +1,6 @@
-#include "utility.hpp"
-#include "manager.hpp"
 #include <cmath>
+#include "manager.hpp"
+#include "utility.hpp"
 
 float Utility::animateValue(float current, float speed, float goal) {
     float gap = goal - current;