From e9bdc623fcbd417a52715d321f6498e257535105 Mon Sep 17 00:00:00 2001
From: Klemen Plestenjak <plestenjak.klemen@gmail.com>
Date: Wed, 15 Nov 2023 08:23:58 +0100
Subject: [PATCH] Restructure files

---
 CMakeLists.txt                                      | 11 +++++------
 game/main.c                                         |  4 ++--
 game/{utils => }/pathfinding.c                      |  0
 game/{utils => }/pathfinding.h                      |  2 +-
 game/{systems => }/systems.h                        |  7 ++++++-
 game/{systems/entity_systems.c => systems_entity.c} |  2 +-
 game/{systems/ui_systems.c => systems_ui.c}         |  2 +-
 7 files changed, 16 insertions(+), 12 deletions(-)
 rename game/{utils => }/pathfinding.c (100%)
 rename game/{utils => }/pathfinding.h (95%)
 rename game/{systems => }/systems.h (75%)
 rename game/{systems/entity_systems.c => systems_entity.c} (99%)
 rename game/{systems/ui_systems.c => systems_ui.c} (93%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf023eb..ff54160 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,7 @@ add_subdirectory(engine/)
 
 
 add_executable(PixelDefense
-        game/systems/entity_systems.c
-        game/systems/systems.h
-        game/systems/ui_systems.c
-
         game/utils/building_types.h
-        game/utils/pathfinding.c
-        game/utils/pathfinding.h
 
         game/buildings.c
         game/buildings.h
@@ -26,6 +20,11 @@ add_executable(PixelDefense
         game/map_init.c
         game/map_init.h
         game/map_layers.h
+        game/pathfinding.c
+        game/pathfinding.h
+        game/systems.h
+        game/systems_entity.c
+        game/systems_ui.c
 )
 
 
diff --git a/game/main.c b/game/main.c
index d91cbaa..9b750b1 100644
--- a/game/main.c
+++ b/game/main.c
@@ -1,6 +1,6 @@
 #include <rlImGui.h>
 
-#include "systems/systems.h"
+#include "systems.h"
 #include "utils/building_types.h"
 #include "components.h"
 #include "game_state.h"
@@ -8,7 +8,7 @@
 #include "map_layers.h"
 #include "buildings.h"
 
-#include "utils/pathfinding.h"
+#include "pathfinding.h"
 
 ECS_COMPONENT_DECLARE(Game);
 
diff --git a/game/utils/pathfinding.c b/game/pathfinding.c
similarity index 100%
rename from game/utils/pathfinding.c
rename to game/pathfinding.c
diff --git a/game/utils/pathfinding.h b/game/pathfinding.h
similarity index 95%
rename from game/utils/pathfinding.h
rename to game/pathfinding.h
index 1ff055e..0df3a64 100644
--- a/game/utils/pathfinding.h
+++ b/game/pathfinding.h
@@ -3,7 +3,7 @@
 
 #include <breeze.h>
 
-#include "../components.h"
+#include "components.h"
 
 typedef struct PathMove {
     i8 x;
diff --git a/game/systems/systems.h b/game/systems.h
similarity index 75%
rename from game/systems/systems.h
rename to game/systems.h
index b3c60a8..1596cd1 100644
--- a/game/systems/systems.h
+++ b/game/systems.h
@@ -3,7 +3,12 @@
 
 #include <flecs.h>
 
-#include "../components.h"
+#include "components.h"
+
+
+/**********************************
+ * Entity Systems
+ **********************************/
 
 void renderEntities(ecs_iter_t *it);
 void updateAnimations(ecs_iter_t *it);
diff --git a/game/systems/entity_systems.c b/game/systems_entity.c
similarity index 99%
rename from game/systems/entity_systems.c
rename to game/systems_entity.c
index d23c971..bb18556 100644
--- a/game/systems/entity_systems.c
+++ b/game/systems_entity.c
@@ -1,7 +1,7 @@
 #include "systems.h"
 
 
-#include "../game_state.h"
+#include "game_state.h"
 #include <math.h>
 #include <raymath.h>
 
diff --git a/game/systems/ui_systems.c b/game/systems_ui.c
similarity index 93%
rename from game/systems/ui_systems.c
rename to game/systems_ui.c
index 56cae2c..722f029 100644
--- a/game/systems/ui_systems.c
+++ b/game/systems_ui.c
@@ -1,6 +1,6 @@
 #include "systems.h"
 
-#include "../game_state.h"
+#include "game_state.h"
 
 void uiTask(ecs_iter_t *it) {
     const Game *game = ecs_singleton_get(ECS, Game);