From a3576c401e6cb8cee9c5efc7cb0e48eaff524bae Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 2 Jan 2022 00:13:35 +0100 Subject: [PATCH] refactoring --- README | 3 +-- headers/configData.h | 2 +- headers/game.h | 6 +++--- headers/{pixel_manager.h => pixelManager.h} | 0 headers/{play_mode.h => playMode.h} | 0 headers/{player_def.h => playerDef.h} | 0 src/{game_basics.cpp => gameBasics.cpp} | 2 +- src/{game_managers.cpp => gameManagers.cpp} | 0 src/{pixel_manager.cpp => pixelManager.cpp} | 2 +- 9 files changed, 7 insertions(+), 8 deletions(-) rename headers/{pixel_manager.h => pixelManager.h} (100%) rename headers/{play_mode.h => playMode.h} (100%) rename headers/{player_def.h => playerDef.h} (100%) rename src/{game_basics.cpp => gameBasics.cpp} (99%) rename src/{game_managers.cpp => gameManagers.cpp} (100%) rename src/{pixel_manager.cpp => pixelManager.cpp} (99%) diff --git a/README b/README index 01e1edf..7df8beb 100644 --- a/README +++ b/README @@ -1,7 +1,6 @@ Conventions à suivre : -camelCase pour les noms de variables/fonctions +camelCase pour les noms de variables/fonctions/fichiers PascalCase pour les noms de classes/structures -snake case pour les noms de fichiers Nommage en anglais Pas de fonctions de +100 lignes Les guards sont de cette forme : GUARD__H diff --git a/headers/configData.h b/headers/configData.h index eead2c0..3f84374 100644 --- a/headers/configData.h +++ b/headers/configData.h @@ -3,7 +3,7 @@ #include #include "utils.h" -#include "player_def.h" +#include "playerDef.h" typedef string configKey; diff --git a/headers/game.h b/headers/game.h index 27d8dec..cd52b01 100644 --- a/headers/game.h +++ b/headers/game.h @@ -2,11 +2,11 @@ #define GUARD_GAME_H #include #include "mingl/mingl.h" -#include "pixel_manager.h" +#include "pixelManager.h" #include "utils.h" -#include "player_def.h" +#include "playerDef.h" #include "player.h" -#include "play_mode.h" +#include "playMode.h" #include "configData.h" #include "projectiles.h" diff --git a/headers/pixel_manager.h b/headers/pixelManager.h similarity index 100% rename from headers/pixel_manager.h rename to headers/pixelManager.h diff --git a/headers/play_mode.h b/headers/playMode.h similarity index 100% rename from headers/play_mode.h rename to headers/playMode.h diff --git a/headers/player_def.h b/headers/playerDef.h similarity index 100% rename from headers/player_def.h rename to headers/playerDef.h diff --git a/src/game_basics.cpp b/src/gameBasics.cpp similarity index 99% rename from src/game_basics.cpp rename to src/gameBasics.cpp index 1c12ec5..e676736 100644 --- a/src/game_basics.cpp +++ b/src/gameBasics.cpp @@ -1,7 +1,7 @@ #include #include #include "game.h" -#include "play_mode.h" +#include "playMode.h" #define WININIT window("space invader du turfu", nsGraphics::Vec2D(1280, 720), nsGraphics::Vec2D(128, 128), nsGraphics::KBlack) diff --git a/src/game_managers.cpp b/src/gameManagers.cpp similarity index 100% rename from src/game_managers.cpp rename to src/gameManagers.cpp diff --git a/src/pixel_manager.cpp b/src/pixelManager.cpp similarity index 99% rename from src/pixel_manager.cpp rename to src/pixelManager.cpp index f3e0fde..0b64f66 100644 --- a/src/pixel_manager.cpp +++ b/src/pixelManager.cpp @@ -1,4 +1,4 @@ -#include "pixel_manager.h" +#include "pixelManager.h" #include "utils.h" PixelManager::PixelManager(MinGL& a) : window(a) {