From 56cb65fc791dba95f14c364af2c98a34b2c9b770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= Date: Wed, 20 Apr 2016 18:31:53 +0200 Subject: [PATCH] Organisation du code dans des sous-dossiers --- CMakeLists.txt | 2 +- include/{ => gui}/object_button.hpp | 0 include/{ => gui}/toolbar.hpp | 4 ++-- include/{ => objects}/block.hpp | 0 include/{ => objects}/collision.hpp | 0 include/{ => objects}/finish_block.hpp | 0 include/{ => objects}/gravity_block.hpp | 0 include/{ => objects}/kill_block.hpp | 0 include/{ => objects}/object.hpp | 0 include/{ => objects}/player.hpp | 0 include/{ => objects}/switch_block.hpp | 0 include/{ => states}/editor.hpp | 4 +--- include/{ => states}/game.hpp | 0 include/{ => states}/level.hpp | 4 ++-- include/{ => states}/menu.hpp | 2 +- include/{ => states}/rules.hpp | 0 include/{ => states}/state.hpp | 0 src/{ => gui}/object_button.cpp | 2 +- src/{ => gui}/toolbar.cpp | 16 ++++++++-------- src/main.cpp | 7 +++---- src/manager.cpp | 6 +++--- src/{ => objects}/block.cpp | 7 +++---- src/{ => objects}/collision.cpp | 9 ++------- src/{ => objects}/finish_block.cpp | 4 ++-- src/{ => objects}/gravity_block.cpp | 4 ++-- src/{ => objects}/kill_block.cpp | 6 +++--- src/{ => objects}/object.cpp | 8 ++++---- src/{ => objects}/player.cpp | 4 ++-- src/{ => objects}/switch_block.cpp | 4 ++-- src/resource_manager.cpp | 2 +- src/{ => states}/editor.cpp | 8 ++++---- src/{ => states}/game.cpp | 6 +++--- src/{ => states}/level.cpp | 21 ++++++++++----------- src/{ => states}/menu.cpp | 12 ++++++------ src/{ => states}/rules.cpp | 4 ++-- src/{ => states}/state.cpp | 2 +- src/utility.cpp | 4 ++-- 37 files changed, 71 insertions(+), 81 deletions(-) rename include/{ => gui}/object_button.hpp (100%) rename include/{ => gui}/toolbar.hpp (96%) rename include/{ => objects}/block.hpp (100%) rename include/{ => objects}/collision.hpp (100%) rename include/{ => objects}/finish_block.hpp (100%) rename include/{ => objects}/gravity_block.hpp (100%) rename include/{ => objects}/kill_block.hpp (100%) rename include/{ => objects}/object.hpp (100%) rename include/{ => objects}/player.hpp (100%) rename include/{ => objects}/switch_block.hpp (100%) rename include/{ => states}/editor.hpp (97%) rename include/{ => states}/game.hpp (100%) rename include/{ => states}/level.hpp (98%) rename include/{ => states}/menu.hpp (100%) rename include/{ => states}/rules.hpp (100%) rename include/{ => states}/state.hpp (100%) rename src/{ => gui}/object_button.cpp (98%) rename src/{ => gui}/toolbar.cpp (95%) rename src/{ => objects}/block.cpp (96%) rename src/{ => objects}/collision.cpp (97%) rename src/{ => objects}/finish_block.cpp (96%) rename src/{ => objects}/gravity_block.cpp (97%) rename src/{ => objects}/kill_block.cpp (94%) rename src/{ => objects}/object.cpp (99%) rename src/{ => objects}/player.cpp (98%) rename src/{ => objects}/switch_block.cpp (96%) rename src/{ => states}/editor.cpp (99%) rename src/{ => states}/game.cpp (99%) rename src/{ => states}/level.cpp (98%) rename src/{ => states}/menu.cpp (98%) rename src/{ => states}/rules.cpp (97%) rename src/{ => states}/state.cpp (88%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcb5571..a672f2f 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/include/object_button.hpp b/include/gui/object_button.hpp similarity index 100% rename from include/object_button.hpp rename to include/gui/object_button.hpp diff --git a/include/toolbar.hpp b/include/gui/toolbar.hpp similarity index 96% rename from include/toolbar.hpp rename to include/gui/toolbar.hpp index 79ff729..f9e68ec 100644 --- a/include/toolbar.hpp +++ b/include/gui/toolbar.hpp @@ -5,9 +5,9 @@ #include #include #include -#include "object.hpp" +#include "../objects/object.hpp" +#include "../states/level.hpp" #include "object_button.hpp" -#include "level.hpp" class Editor; diff --git a/include/block.hpp b/include/objects/block.hpp similarity index 100% rename from include/block.hpp rename to include/objects/block.hpp diff --git a/include/collision.hpp b/include/objects/collision.hpp similarity index 100% rename from include/collision.hpp rename to include/objects/collision.hpp diff --git a/include/finish_block.hpp b/include/objects/finish_block.hpp similarity index 100% rename from include/finish_block.hpp rename to include/objects/finish_block.hpp diff --git a/include/gravity_block.hpp b/include/objects/gravity_block.hpp similarity index 100% rename from include/gravity_block.hpp rename to include/objects/gravity_block.hpp diff --git a/include/kill_block.hpp b/include/objects/kill_block.hpp similarity index 100% rename from include/kill_block.hpp rename to include/objects/kill_block.hpp diff --git a/include/object.hpp b/include/objects/object.hpp similarity index 100% rename from include/object.hpp rename to include/objects/object.hpp diff --git a/include/player.hpp b/include/objects/player.hpp similarity index 100% rename from include/player.hpp rename to include/objects/player.hpp diff --git a/include/switch_block.hpp b/include/objects/switch_block.hpp similarity index 100% rename from include/switch_block.hpp rename to include/objects/switch_block.hpp diff --git a/include/editor.hpp b/include/states/editor.hpp similarity index 97% rename from include/editor.hpp rename to include/states/editor.hpp index 707559a..c201d48 100644 --- a/include/editor.hpp +++ b/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 -#include /** * La classe Editor permet l'édition de diff --git a/include/game.hpp b/include/states/game.hpp similarity index 100% rename from include/game.hpp rename to include/states/game.hpp diff --git a/include/level.hpp b/include/states/level.hpp similarity index 98% rename from include/level.hpp rename to include/states/level.hpp index 1e082f1..f3ca4a2 100644 --- a/include/level.hpp +++ b/include/states/level.hpp @@ -3,9 +3,9 @@ #include #include +#include "../objects/object.hpp" +#include "../objects/player.hpp" #include "state.hpp" -#include "object.hpp" -#include "player.hpp" class Manager; diff --git a/include/menu.hpp b/include/states/menu.hpp similarity index 100% rename from include/menu.hpp rename to include/states/menu.hpp index e305c25..825c9fa 100644 --- a/include/menu.hpp +++ b/include/states/menu.hpp @@ -1,10 +1,10 @@ #ifndef __SKIZZLE_MENU_HPP__ #define __SKIZZLE_MENU_HPP__ -#include "state.hpp" #include #include #include +#include "state.hpp" class Manager; diff --git a/include/rules.hpp b/include/states/rules.hpp similarity index 100% rename from include/rules.hpp rename to include/states/rules.hpp diff --git a/include/state.hpp b/include/states/state.hpp similarity index 100% rename from include/state.hpp rename to include/states/state.hpp diff --git a/src/object_button.cpp b/src/gui/object_button.cpp similarity index 98% rename from src/object_button.cpp rename to src/gui/object_button.cpp index 15ac684..b82afd7 100644 --- a/src/object_button.cpp +++ b/src/gui/object_button.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "object_button.hpp" +#include "gui/object_button.hpp" ObjectButton::Ptr ObjectButton::Create( sfg::Image::Ptr image, diff --git a/src/toolbar.cpp b/src/gui/toolbar.cpp similarity index 95% rename from src/toolbar.cpp rename to src/gui/toolbar.cpp index e0fcfbd..1854107 100644 --- a/src/toolbar.cpp +++ b/src/gui/toolbar.cpp @@ -1,12 +1,12 @@ #include "resource_manager.hpp" -#include "editor.hpp" -#include "toolbar.hpp" -#include "block.hpp" -#include "player.hpp" -#include "switch_block.hpp" -#include "gravity_block.hpp" -#include "kill_block.hpp" -#include "finish_block.hpp" +#include "states/editor.hpp" +#include "objects/block.hpp" +#include "objects/player.hpp" +#include "objects/switch_block.hpp" +#include "objects/gravity_block.hpp" +#include "objects/kill_block.hpp" +#include "objects/finish_block.hpp" +#include "gui/toolbar.hpp" const int Toolbar::CREATORS_TABLE_WIDTH = 3; diff --git a/src/main.cpp b/src/main.cpp index 4e54a3d..496e883 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,9 +1,8 @@ -#include "manager.hpp" -#include "editor.hpp" -#include "menu.hpp" -#include "game.hpp" #include #include +#include +#include "manager.hpp" +#include "states/menu.hpp" int main() { // le gestionnaire du jeu gère la pile d'états diff --git a/src/manager.cpp b/src/manager.cpp index e508618..4395008 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -1,7 +1,7 @@ -#include "state.hpp" -#include "manager.hpp" -#include "resource_manager.hpp" #include +#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); diff --git a/src/block.cpp b/src/objects/block.cpp similarity index 96% rename from src/block.cpp rename to src/objects/block.cpp index e689e6c..dfe44dd 100644 --- a/src/block.cpp +++ b/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; diff --git a/src/collision.cpp b/src/objects/collision.cpp similarity index 97% rename from src/collision.cpp rename to src/objects/collision.cpp index 5d52872..6be42a9 100644 --- a/src/collision.cpp +++ b/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 -#include #include +#include "objects/object.hpp" +#include "objects/collision.hpp" /** * Définition des variables et fonctions globales internes diff --git a/src/finish_block.cpp b/src/objects/finish_block.cpp similarity index 96% rename from src/finish_block.cpp rename to src/objects/finish_block.cpp index 11f27a7..1613728 100644 --- a/src/finish_block.cpp +++ b/src/objects/finish_block.cpp @@ -1,7 +1,7 @@ #include "manager.hpp" #include "resource_manager.hpp" -#include "finish_block.hpp" -#include "game.hpp" +#include "states/game.hpp" +#include "objects/finish_block.hpp" const unsigned int FinishBlock::TYPE_ID = 4; diff --git a/src/gravity_block.cpp b/src/objects/gravity_block.cpp similarity index 97% rename from src/gravity_block.cpp rename to src/objects/gravity_block.cpp index 0f44120..a9f865d 100644 --- a/src/gravity_block.cpp +++ b/src/objects/gravity_block.cpp @@ -1,8 +1,8 @@ #include "manager.hpp" #include "resource_manager.hpp" #include "utility.hpp" -#include "gravity_block.hpp" -#include "game.hpp" +#include "states/game.hpp" +#include "objects/gravity_block.hpp" const unsigned int GravityBlock::TYPE_ID = 3; diff --git a/src/kill_block.cpp b/src/objects/kill_block.cpp similarity index 94% rename from src/kill_block.cpp rename to src/objects/kill_block.cpp index 711a87a..65be479 100644 --- a/src/kill_block.cpp +++ b/src/objects/kill_block.cpp @@ -1,8 +1,8 @@ #include "manager.hpp" #include "resource_manager.hpp" -#include "kill_block.hpp" -#include "game.hpp" -#include "player.hpp" +#include "states/game.hpp" +#include "objects/player.hpp" +#include "objects/kill_block.hpp" const unsigned int KillBlock::TYPE_ID = 5; diff --git a/src/object.cpp b/src/objects/object.cpp similarity index 99% rename from src/object.cpp rename to src/objects/object.cpp index 553e5c3..8433fa9 100644 --- a/src/object.cpp +++ b/src/objects/object.cpp @@ -1,8 +1,8 @@ -#include "manager.hpp" -#include "object.hpp" -#include "game.hpp" -#include "collision.hpp" #include +#include "manager.hpp" +#include "states/game.hpp" +#include "objects/collision.hpp" +#include "objects/object.hpp" /** * Définition des variables et fonctions globales internes diff --git a/src/player.cpp b/src/objects/player.cpp similarity index 98% rename from src/player.cpp rename to src/objects/player.cpp index e2c938e..3a06b9e 100644 --- a/src/player.cpp +++ b/src/objects/player.cpp @@ -1,7 +1,7 @@ #include "manager.hpp" #include "resource_manager.hpp" -#include "player.hpp" -#include "game.hpp" +#include "states/game.hpp" +#include "objects/player.hpp" const unsigned int Player::TYPE_ID = 1; diff --git a/src/switch_block.cpp b/src/objects/switch_block.cpp similarity index 96% rename from src/switch_block.cpp rename to src/objects/switch_block.cpp index 47300c0..f9d9120 100644 --- a/src/switch_block.cpp +++ b/src/objects/switch_block.cpp @@ -1,8 +1,8 @@ #include "manager.hpp" #include "resource_manager.hpp" #include "utility.hpp" -#include "switch_block.hpp" -#include "game.hpp" +#include "states/game.hpp" +#include "objects/switch_block.hpp" const unsigned int SwitchBlock::TYPE_ID = 6; diff --git a/src/resource_manager.cpp b/src/resource_manager.cpp index 2305074..7a53a69 100644 --- a/src/resource_manager.cpp +++ b/src/resource_manager.cpp @@ -1,6 +1,6 @@ -#include "resource_manager.hpp" #include #include +#include "resource_manager.hpp" namespace fs = boost::filesystem; diff --git a/src/editor.cpp b/src/states/editor.cpp similarity index 99% rename from src/editor.cpp rename to src/states/editor.cpp index 416d7b4..33fc583 100644 --- a/src/editor.cpp +++ b/src/states/editor.cpp @@ -1,9 +1,9 @@ -#include "manager.hpp" -#include "resource_manager.hpp" -#include "editor.hpp" -#include "game.hpp" #include #include +#include "manager.hpp" +#include "resource_manager.hpp" +#include "states/game.hpp" +#include "states/editor.hpp" /** * Définition des variables et fonctions globales internes diff --git a/src/game.cpp b/src/states/game.cpp similarity index 99% rename from src/game.cpp rename to src/states/game.cpp index a465984..82159ea 100644 --- a/src/game.cpp +++ b/src/states/game.cpp @@ -1,10 +1,10 @@ #include #include -#include "utility.hpp" #include "manager.hpp" #include "resource_manager.hpp" -#include "game.hpp" -#include "player.hpp" +#include "utility.hpp" +#include "objects/player.hpp" +#include "states/game.hpp" /** * Définition des variables et fonctions globales internes diff --git a/src/level.cpp b/src/states/level.cpp similarity index 98% rename from src/level.cpp rename to src/states/level.cpp index 02df932..0df6991 100644 --- a/src/level.cpp +++ b/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 #include #include #include -#include +#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 diff --git a/src/menu.cpp b/src/states/menu.cpp similarity index 98% rename from src/menu.cpp rename to src/states/menu.cpp index fa6cec3..1c1e077 100644 --- a/src/menu.cpp +++ b/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 #include +#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 diff --git a/src/rules.cpp b/src/states/rules.cpp similarity index 97% rename from src/rules.cpp rename to src/states/rules.cpp index 02cc1e5..4c0ad7a 100644 --- a/src/rules.cpp +++ b/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() {} diff --git a/src/state.cpp b/src/states/state.cpp similarity index 88% rename from src/state.cpp rename to src/states/state.cpp index 686dbff..9b0c83d 100644 --- a/src/state.cpp +++ b/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() {} diff --git a/src/utility.cpp b/src/utility.cpp index 401722e..4fd502e 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -1,6 +1,6 @@ -#include "utility.hpp" -#include "manager.hpp" #include +#include "manager.hpp" +#include "utility.hpp" float Utility::animateValue(float current, float speed, float goal) { float gap = goal - current;