Capabilities and Game folder

curzel-it · Jun 23, 2024 · 5ecb066 · 5ecb066
1 parent 1d70685
commit 5ecb066
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 25 deletions.
diff --git a/Sources/cpp/CMakeLists.txt b/Sources/cpp/CMakeLists.txt
@@ -6,20 +6,28 @@ set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 include_directories("src")
-include_directories("src/sprites")
+include_directories("src/capabilities")
+include_directories("src/game")
 include_directories("src/species")
+include_directories("src/sprites")
 include_directories("src/utils")
 
 # Get all sources except tests
 file(GLOB MAIN_SOURCES "src/*.cpp")
 list(FILTER MAIN_SOURCES EXCLUDE REGEX ".*_tests\\.cpp$")
 
-file(GLOB SPRITES_SOURCES "src/sprites/*.cpp")
-list(FILTER SPRITES_SOURCES EXCLUDE REGEX ".*_tests\\.cpp$")
+file(GLOB CAPABILITIES_SOURCES "src/capabilities/*.cpp")
+list(FILTER CAPABILITIES_SOURCES EXCLUDE REGEX ".*_tests\\.cpp$")
+
+file(GLOB GAME_SOURCES "src/game/*.cpp")
+list(FILTER GAME_SOURCES EXCLUDE REGEX ".*_tests\\.cpp$")
 
 file(GLOB SPECIES_SOURCES "src/species/*.cpp")
 list(FILTER SPECIES_SOURCES EXCLUDE REGEX ".*_tests\\.cpp$")
 
+file(GLOB SPRITES_SOURCES "src/sprites/*.cpp")
+list(FILTER SPRITES_SOURCES EXCLUDE REGEX ".*_tests\\.cpp$")
+
 file(GLOB UTILS_SOURCES "src/utils/*.cpp")
 list(FILTER UTILS_SOURCES EXCLUDE REGEX ".*_tests\\.cpp$")
 
@@ -33,7 +41,7 @@ find_package(Qt6 COMPONENTS Widgets REQUIRED)
 find_package(nlohmann_json 3.2.0 REQUIRED)
 
 # App executable
-add_executable(Main ${MAIN_SOURCES} ${UTILS_SOURCES} ${SPECIES_SOURCES} ${SPRITES_SOURCES})
+add_executable(Main ${MAIN_SOURCES} ${CAPABILITIES_SOURCES} ${GAME_SOURCES} ${SPECIES_SOURCES} ${SPRITES_SOURCES} ${UTILS_SOURCES})
 target_link_libraries(Main PRIVATE nlohmann_json::nlohmann_json Qt6::Widgets)
 
 # Google Test
@@ -45,14 +53,18 @@ include(GoogleTest)
 file(GLOB TEST_SOURCES "src/*.cpp")
 list(FILTER TEST_SOURCES EXCLUDE REGEX ".*main\\.cpp$")
 
-file(GLOB TEST_SPRITES_SOURCES "src/sprites/*.cpp")
+file(GLOB TEST_CAPABILITIES_SOURCES "src/capabilities/*.cpp")
+
+file(GLOB TEST_GAME_SOURCES "src/game/*.cpp")
 
 file(GLOB TEST_SPECIES_SOURCES "src/species/*.cpp")
 
+file(GLOB TEST_SPRITES_SOURCES "src/sprites/*.cpp")
+
 file(GLOB TEST_UTILS_SOURCES "src/utils/*.cpp")
 
 # Test executable
-add_executable(Test ${TEST_SOURCES} ${TEST_SPRITES_SOURCES} ${TEST_SPECIES_SOURCES} ${TEST_UTILS_SOURCES})
+add_executable(Test ${TEST_SOURCES} ${TEST_CAPABILITIES_SOURCES} ${TEST_GAME_SOURCES} ${TEST_SPECIES_SOURCES} ${TEST_SPRITES_SOURCES} ${TEST_UTILS_SOURCES})
 target_link_libraries(Test GTest::GTest GTest::Main Qt6::Widgets)
 
 # Test discovery

diff --git a/Sources/cpp/src/app_window.cpp b/Sources/cpp/src/app_window.cpp
@@ -1,5 +1,5 @@
 #include "app_window.h"
-#include "geometry.h"
+#include "game/game.h"
 #include "utils/utils.h"
 #include "sprites/sprites.h"
 

diff --git a/Sources/cpp/src/capabilities/capabilities.h b/Sources/cpp/src/capabilities/capabilities.h
@@ -0,0 +1 @@
+#include "linear_movement.h"
diff --git a/Sources/cpp/src/linear_movement.cpp → .../cpp/src/capabilities/linear_movement.cpp b/Sources/cpp/src/linear_movement.cpp → .../cpp/src/capabilities/linear_movement.cpp
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <iostream>
 
-#include "geometry.h"
+#include "../game/game.h"
 
 void LinearMovement::update(std::chrono::milliseconds timeSinceLastUpdate, Entity * entity) {
     auto frameDuration = std::chrono::duration_cast<std::chrono::milliseconds>(timeSinceLastUpdate).count();

diff --git a/Sources/cpp/src/linear_movement.h → ...es/cpp/src/capabilities/linear_movement.h b/Sources/cpp/src/linear_movement.h → ...es/cpp/src/capabilities/linear_movement.h
@@ -3,7 +3,7 @@
 
 #include <chrono>
 
-#include "entity.h"
+#include "../game/game.h"
 
 class LinearMovement : public EntityCapability {
 public:

diff --git a/Sources/cpp/src/entity.cpp → Sources/cpp/src/game/entity.cpp b/Sources/cpp/src/entity.cpp → Sources/cpp/src/game/entity.cpp
@@ -6,10 +6,10 @@
 #include <string>
 #include <vector>
 
-#include "geometry.h"
-#include "linear_movement.h"
-#include "sprites/sprites.h"
-#include "utils/utils.h"
+#include "../game/game.h"
+#include "../capabilities/capabilities.h"
+#include "../sprites/sprites.h"
+#include "../utils/utils.h"
 
 Entity::Entity(
     double fps, 

diff --git a/Sources/cpp/src/entity.h → Sources/cpp/src/game/entity.h b/Sources/cpp/src/entity.h → Sources/cpp/src/game/entity.h
@@ -7,8 +7,8 @@
 #include <vector>
 
 #include "geometry.h"
-#include "species/species.h"
-#include "sprites/sprites.h"
+#include "../species/species.h"
+#include "../sprites/sprites.h"
 
 class EntityCapability;
 

diff --git a/Sources/cpp/src/game.cpp → Sources/cpp/src/game/game.cpp b/Sources/cpp/src/game.cpp → Sources/cpp/src/game/game.cpp
@@ -5,7 +5,7 @@
 #include <sstream>
 
 #include "geometry.h"
-#include "utils/utils.h"
+#include "../utils/utils.h"
 
 RenderedItem::RenderedItem(std::string spritePath, Rect frame) : spritePath(spritePath), frame(frame) {}
 

diff --git a/Sources/cpp/src/game.h → Sources/cpp/src/game/game.h b/Sources/cpp/src/game.h → Sources/cpp/src/game/game.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "entity.h"
+#include "geometry.h"
 
 struct RenderedItem {
     std::string spritePath;

diff --git a/Sources/cpp/src/game_tests.cpp → Sources/cpp/src/game/game_tests.cpp b/Sources/cpp/src/game_tests.cpp → Sources/cpp/src/game/game_tests.cpp
@@ -1,7 +1,7 @@
 #include "game.h"
 #include "geometry.h"
-#include "species/species.h"
-#include "sprites/sprites.h"
+#include "../species/species.h"
+#include "../sprites/sprites.h"
 
 #include <chrono>
 #include <gtest/gtest.h>

diff --git a/Sources/cpp/src/geometry.cpp → Sources/cpp/src/game/geometry.cpp b/Sources/cpp/src/geometry.cpp → Sources/cpp/src/game/geometry.cpp
diff --git a/Sources/cpp/src/geometry.h → Sources/cpp/src/game/geometry.h b/Sources/cpp/src/geometry.h → Sources/cpp/src/game/geometry.h
diff --git a/Sources/cpp/src/geometry_tests.cpp → Sources/cpp/src/game/geometry_tests.cpp b/Sources/cpp/src/geometry_tests.cpp → Sources/cpp/src/game/geometry_tests.cpp
diff --git a/Sources/cpp/src/game_window.cpp b/Sources/cpp/src/game_window.cpp
@@ -12,9 +12,8 @@
 
 #include <format>
 
-#include "game.h"
+#include "game/game.h"
 #include "game_window.h"
-#include "geometry.h"
 #include "utils/utils.h"
 #include "sprites/sprites.h"
 

diff --git a/Sources/cpp/src/game_window.h b/Sources/cpp/src/game_window.h
@@ -1,8 +1,7 @@
 #ifndef GAME_WINDOW_H
 #define GAME_WINDOW_H
 
-#include "game.h"
-#include "geometry.h"
+#include "game/game.h"
 
 #include <QGraphicsScene>
 #include <QLabel>

diff --git a/Sources/cpp/src/main.cpp b/Sources/cpp/src/main.cpp
@@ -6,10 +6,8 @@
 #include <thread>
 
 #include "app_window.h"
-#include "game.h"
+#include "game/game.h"
 #include "game_window.h"
-#include "geometry.h"
-#include "entity.h"
 
 #include "species/species.h"
 #include "sprites/sprites.h"