ref: make headers and include cpp files in CMakeLists.txt

phuwit · Oct 19, 2023 · 58d2dfb · 58d2dfb
1 parent a06c1f1
commit 58d2dfb
Show file tree

Hide file tree

Showing 52 changed files with 319 additions and 240 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,8 +14,38 @@ FetchContent_Declare(SFML
     GIT_TAG 2.6.x)
 FetchContent_MakeAvailable(SFML)
 
-add_executable(BrainBlast source/Main.cpp
-        source/Collision/Collision.cpp)
+add_executable(BrainBlast 
+    source/Main.cpp
+    source/CommonEnum.cpp
+    source/Bullet/Bullet.cpp
+    source/Collision/Collision.cpp
+    source/Holders/FontHolder.cpp
+    source/Holders/MusicHolder.cpp
+    source/Holders/SoundHolder.cpp
+    source/Holders/TextureHolder.cpp
+    source/PickUps/PickUps.cpp
+    source/Player/Player.cpp
+    source/Scenes/Scenes.cpp
+    source/Scenes/SceneChange.cpp
+    source/Scenes/Game.cpp
+    source/Scenes/GameOver.cpp
+    source/Scenes/Info.cpp
+    source/Scenes/Leaderboard.cpp
+    source/Scenes/LevelUp.cpp
+    source/Scenes/Menu.cpp
+    source/Scenes/Paused.cpp
+    source/Scores/ReadScores.cpp
+    source/Scores/SaveScores.cpp
+    source/Scores/Score.cpp
+    source/Scores/SortScores.cpp
+    source/Tools/GetOS.cpp
+    source/Tools/GetScreenshot.cpp
+    source/Tools/OpenURL.cpp
+    source/Tools/SetOriginCenter.cpp
+    source/Tools/SetRectangleShapeOnMouseHover.cpp
+    source/Tools/CreateBackground.cpp
+    source/Zombie/Zombie.cpp
+    source/Zombie/ZombieHorde.cpp)
 
 target_link_libraries(BrainBlast PRIVATE sfml-graphics)
 target_link_libraries(BrainBlast PRIVATE sfml-audio)

diff --git a/source/Bullet/Bullet.cpp b/source/Bullet/Bullet.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <cmath>
 #include <SFML/Graphics.hpp>
 #include "Bullet.hpp"

diff --git a/source/Collision/Collision.cpp b/source/Collision/Collision.cpp
@@ -1,5 +1,5 @@
 /* 
- * File:   collision.cpp
+ * File:   collision.hpp
  * Author: Nick (original version), ahnonay (SFML2 compatibility), Paweł Syska (C++17 refactor + naming convention)
  */
 

diff --git a/source/CommonEnum.cpp b/source/CommonEnum.cpp
@@ -0,0 +1,6 @@
+#include "CommonEnum.hpp"
+
+Color COLOR_BACKGROUND = Color(37, 19, 26);
+int ZombieDifficulty[sizeof(ZombieType)] = {30, 40, 40};
+int currentLevel = 1;
+bool paused = false;
diff --git a/source/CommonEnum.hpp b/source/CommonEnum.hpp
@@ -8,13 +8,12 @@ enum OS {OS_WINDOWS, OS_LINUX, OS_MAC, OS_OTHER};
 
 enum ScenesList {SCENE_MENU, SCENE_INFO, SCENE_GAME, SCENE_PAUSED, SCENE_LEVELUP, SCENE_GAMEOVER, SCENE_LEADERBOARD, EXIT = -1};
 
-Color COLOR_BACKGROUND = Color(37, 19, 26);
+extern Color COLOR_BACKGROUND;
 enum MovementKey {MOVEMENT_UP, MOVEMENT_DOWN, MOVEMENT_LEFT, MOVEMENT_RIGHT};
 enum MouseButton {MOUSE_LEFT, MOUSE_LRIGHT};
 enum ZombieType {ZOMBIE_NORMAL, ZOMBIE_BOOMER, ZOMBIE_HUNTER};
 enum ZombieMoveStyle {ZOMBIE_MOVESTYLE_LINEAR, ZOMBIE_MOVESTYLE_XFIRST, ZOMBIE_MOVESTYLE_YFIRST, ZOMBIE_MOVESTYLE_RANDOM};
 enum PickupsType {PICKUPS_HEALTH, PICKUPS_AMMO, PICKUPS_SPEED, PICKUPS_SCORE};
-int ZombieDifficulty[sizeof(ZombieType)] {30, 40, 40};
-
-int currentLevel = 1;
-bool paused = false;
+extern int ZombieDifficulty[sizeof(ZombieType)];
+extern int currentLevel;
+extern bool paused;
diff --git a/source/Holders/FontHolder.cpp b/source/Holders/FontHolder.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <assert.h>
 #include "FontHolder.hpp"
 

diff --git a/source/Holders/MusicHolder.cpp b/source/Holders/MusicHolder.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #include <cassert>
 #include "MusicHolder.hpp"
 

diff --git a/source/Holders/SoundHolder.cpp b/source/Holders/SoundHolder.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <cassert>
 #include "SoundHolder.hpp"
 

diff --git a/source/Holders/TextureHolder.cpp b/source/Holders/TextureHolder.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <cassert>
 #include "TextureHolder.hpp"
 

diff --git a/source/Main.cpp b/source/Main.cpp
@@ -1,17 +1,17 @@
 #include "CommonEnum.hpp"
-#include "Holders/TextureHolder.cpp"
-#include "Holders/FontHolder.cpp"
-#include "Holders/SoundHolder.cpp"
+#include "Holders/TextureHolder.hpp"
+#include "Holders/FontHolder.hpp"
+#include "Holders/SoundHolder.hpp"
 #include "Holders/MusicHolder.hpp"
 
 #include "Scenes/Scenes.hpp"
-#include "Scenes/Menu.cpp"
-#include "Scenes/Info.cpp"
-#include "Scenes/Game.cpp"
-#include "Scenes/Paused.cpp"
-#include "Scenes/LevelUp.cpp"
-#include "Scenes/GameOver.cpp"
-#include "Scenes/Leaderboard.cpp"
+#include "Scenes/Menu.hpp"
+#include "Scenes/Info.hpp"
+#include "Scenes/Game.hpp"
+#include "Scenes/Paused.hpp"
+#include "Scenes/LevelUp.hpp"
+#include "Scenes/GameOver.hpp"
+#include "Scenes/Leaderboard.hpp"
 
 int main() {
     // instance THE singleton instance of texture holder

diff --git a/source/PickUps/PickUps.cpp b/source/PickUps/PickUps.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <utility>
 #include "PickUps.hpp"
 #include "../CommonEnum.hpp"

diff --git a/source/Player/Player.cpp b/source/Player/Player.cpp
@@ -1,11 +1,9 @@
-#pragma once
-
 #include <cmath>
 #include <SFML/Graphics.hpp>
 
 #include "Player.hpp"
 #include "../CommonEnum.hpp"
-#include "../Holders/TextureHolder.cpp"
+#include "../Holders/TextureHolder.hpp"
 
 Player::Player(float spriteScaling) {
     m_SpriteScaling = spriteScaling;

diff --git a/source/Scenes/Game.cpp b/source/Scenes/Game.cpp
@@ -1,22 +1,4 @@
-#include <sstream>
-#include <array>
-#include <iostream>
-#include <SFML/Graphics.hpp>
-#include <SFML/Audio.hpp>
-
 #include "Game.hpp"
-#include "../CommonEnum.hpp"
-#include "../Holders/TextureHolder.cpp"
-#include "../Holders/FontHolder.cpp"
-#include "../Holders/SoundHolder.cpp"
-#include "../Zombie/Zombie.cpp"
-#include "../Zombie/ZombieHorde.cpp"
-#include "../Tools/CreateBackground.cpp"
-#include "../Tools/GetScreenshot.cpp"
-#include "../Tools/SetOriginCenter.cpp"
-#include "../Collision/Collision.hpp"
-
-using namespace sf;
 
 Game::Game(Vector2f screenResolution, Vector2f levelSize) {
     m_ScreenResolution = screenResolution;

diff --git a/source/Scenes/Game.hpp b/source/Scenes/Game.hpp
@@ -1,12 +1,27 @@
 #pragma once
+
 #include <vector>
+#include <sstream>
+#include <array>
+#include <iostream>
 #include <SFML/Graphics.hpp>
+#include <SFML/Audio.hpp>
 
 #include "Scenes.hpp"
+#include "../CommonEnum.hpp"
+#include "../Holders/TextureHolder.hpp"
+#include "../Holders/FontHolder.hpp"
+#include "../Holders/SoundHolder.hpp"
+#include "../Holders/MusicHolder.hpp"
+#include "../Tools/CreateBackground.hpp"
+#include "../Tools/GetScreenshot.hpp"
+#include "../Tools/SetOriginCenter.hpp"
 #include "../Zombie/Zombie.hpp"
-#include "../Player/Player.cpp"
-#include "../Bullet/Bullet.cpp"
-#include "../PickUps/PickUps.cpp"
+#include "../Zombie/ZombieHorde.hpp"
+#include "../PickUps/PickUps.hpp"
+#include "../Player/Player.hpp"
+#include "../Bullet/Bullet.hpp"
+#include "../Collision/Collision.hpp"
 
 using namespace sf;
 
@@ -95,10 +110,4 @@ class Game : public Scenes {
         void setPaused();
         void setPerks(int perks);
         unsigned int getScore();
-};
-
-// prototype createBackground function, with a vertex array reference parameter and intrect parameter
-int createBackground (VertexArray& rVA, IntRect playArea);
-
-// prototype createHorde function, returns a zombie pointer
-Zombie* createHorde(int numZombies, float spriteScaling, IntRect arena);
+};
diff --git a/source/Scenes/GameOver.cpp b/source/Scenes/GameOver.cpp
@@ -1,20 +1,4 @@
-#include <SFML/Graphics.hpp>
-
-#include "Scenes.hpp"
-#include "Game.hpp"
-#include "../CommonEnum.hpp"
-#include "../Holders/FontHolder.cpp"
-#include "../Scores/Score.hpp"
-#include "../Scores/ReadScores.cpp"
-#include "../Scores/SaveScores.cpp"
-#include "../Scores/SortScores.cpp"
-#include "../Tools/SetOriginCenter.cpp"
-#include "../Tools/SetRectangleShapeOnMouseHover.cpp"
-
-class GameOver : public Scenes {
-    public:
-        virtual SceneChange run(RenderWindow &window);
-};
+#include "GameOver.hpp"
 
 SceneChange GameOver::run(RenderWindow &window) {
     Font fontBebas = FontHolder::GetFont("assets/fonts/BebasNeue-Regular.otf");

diff --git a/source/Scenes/GameOver.hpp b/source/Scenes/GameOver.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <SFML/Graphics.hpp>
+
+#include "Scenes.hpp"
+#include "Game.hpp"
+#include "../CommonEnum.hpp"
+#include "../Holders/FontHolder.hpp"
+#include "../Holders/MusicHolder.hpp"
+#include "../Scores/Score.hpp"
+#include "../Scores/ReadScores.hpp"
+#include "../Scores/SaveScores.hpp"
+#include "../Scores/SortScores.hpp"
+#include "../Tools/SetOriginCenter.hpp"
+#include "../Tools/SetRectangleShapeOnMouseHover.hpp"
+
+class GameOver : public Scenes {
+    public:
+        virtual SceneChange run(RenderWindow &window);
+};
diff --git a/source/Scenes/Info.cpp b/source/Scenes/Info.cpp
@@ -1,18 +1,4 @@
-#include <SFML/Graphics.hpp>
-
-#include "Scenes.hpp"
-#include "../CommonEnum.hpp"
-#include "../Holders/FontHolder.cpp"
-#include "../Tools/SetOriginCenter.cpp"
-#include "../Tools/SetRectangleShapeOnMouseHover.cpp"
-#include "../Tools/OpenURL.cpp"
-
-using namespace sf;
-
-class Info : public Scenes {
-    public:
-        virtual SceneChange run(RenderWindow &window);
-};
+#include "Info.hpp"
 
 SceneChange Info::run(RenderWindow &window) {
     int BUTTON_PADDING = 30;

diff --git a/source/Scenes/Info.hpp b/source/Scenes/Info.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <SFML/Graphics.hpp>
+#include <SFML/Audio.hpp>
+
+#include "Scenes.hpp"
+#include "../CommonEnum.hpp"
+#include "../Holders/FontHolder.hpp"
+#include "../Holders/MusicHolder.hpp"
+#include "../Tools/SetOriginCenter.hpp"
+#include "../Tools/SetRectangleShapeOnMouseHover.hpp"
+#include "../Tools/OpenURL.hpp"
+
+using namespace sf;
+
+class Info : public Scenes {
+    public:
+        virtual SceneChange run(RenderWindow &window);
+};
diff --git a/source/Scenes/Leaderboard.cpp b/source/Scenes/Leaderboard.cpp
@@ -1,21 +1,4 @@
-#include <fstream>
-#include <SFML/Graphics.hpp>
-
-#include "Scenes.hpp"
-#include "../CommonEnum.hpp"
-#include "../Holders/FontHolder.cpp"
-#include "../Tools/SetOriginCenter.cpp"
-#include "../Tools/SetRectangleShapeOnMouseHover.cpp"
-#include "../Scores/Score.hpp"
-#include "../Scores/ReadScores.cpp"
-#include "../Scores/SaveScores.cpp"
-#include "../Scores/SortScores.cpp"
-
-
-class Leaderboard : public Scenes {
-    public:
-        virtual SceneChange run(RenderWindow &window);
-};
+#include "Leaderboard.hpp"
 
 SceneChange Leaderboard::run(RenderWindow &window) {
     const int SCORES_COUNT = 5;

diff --git a/source/Scenes/Leaderboard.hpp b/source/Scenes/Leaderboard.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <fstream>
+#include <SFML/Graphics.hpp>
+#include <SFML/Audio.hpp>
+
+#include "Scenes.hpp"
+#include "../CommonEnum.hpp"
+#include "../Holders/FontHolder.hpp"
+#include "../Holders/MusicHolder.hpp"
+#include "../Tools/SetOriginCenter.hpp"
+#include "../Tools/SetRectangleShapeOnMouseHover.hpp"
+#include "../Scores/Score.hpp"
+#include "../Scores/ReadScores.hpp"
+#include "../Scores/SaveScores.hpp"
+#include "../Scores/SortScores.hpp"
+
+
+class Leaderboard : public Scenes {
+    public:
+        virtual SceneChange run(RenderWindow &window);
+};
diff --git a/source/Scenes/LevelUp.cpp b/source/Scenes/LevelUp.cpp
@@ -1,18 +1,4 @@
-#include <SFML/Graphics.hpp>
-#include <SFML/Audio.hpp>
-
-#include "Scenes.hpp"
-#include "Game.hpp"
-#include "../CommonEnum.hpp"
-#include "../Holders/FontHolder.cpp"
-#include "../Holders/SoundHolder.hpp"
-#include "../Tools/SetOriginCenter.cpp"
-#include "../Tools/SetRectangleShapeOnMouseHover.cpp"
-
-class LevelUp : public Scenes {
-public:
-    virtual SceneChange run(RenderWindow &window);
-};
+#include "LevelUp.hpp"
 
 SceneChange LevelUp::run(RenderWindow &window) {
     const int TEXT_BOX_PADDING = 50;

diff --git a/source/Scenes/LevelUp.hpp b/source/Scenes/LevelUp.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <SFML/Graphics.hpp>
+#include <SFML/Audio.hpp>
+
+#include "Scenes.hpp"
+#include "Game.hpp"
+#include "../CommonEnum.hpp"
+#include "../Holders/FontHolder.hpp"
+#include "../Holders/SoundHolder.hpp"
+#include "../Holders/MusicHolder.hpp"
+#include "../Tools/SetOriginCenter.hpp"
+#include "../Tools/SetRectangleShapeOnMouseHover.hpp"
+
+class LevelUp : public Scenes {
+public:
+    virtual SceneChange run(RenderWindow &window);
+};