From dd96b23d32bf5eeb2eee5ae6a08f37353283eaea Mon Sep 17 00:00:00 2001
From: Klemen Plestenjak <plestenjak.klemen@gmail.com>
Date: Thu, 9 Nov 2023 12:22:56 +0100
Subject: [PATCH] Rename world directory to map

---
 engine/CMakeLists.txt                  | 12 ++++++------
 engine/breeze.h                        |  4 ++--
 engine/breeze/game.h                   | 10 ++++++++++
 engine/breeze/{world => map}/map.c     |  0
 engine/breeze/{world => map}/map.h     |  0
 engine/breeze/{world => map}/tileset.c |  0
 engine/breeze/{world => map}/tileset.h |  0
 7 files changed, 18 insertions(+), 8 deletions(-)
 rename engine/breeze/{world => map}/map.c (100%)
 rename engine/breeze/{world => map}/map.h (100%)
 rename engine/breeze/{world => map}/tileset.c (100%)
 rename engine/breeze/{world => map}/tileset.h (100%)

diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 2342705..19f3ec9 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -27,10 +27,10 @@ set(BreezeSources
         breeze/core/memory.c
         breeze/core/module_system.c
 
-        breeze/utils/tokenizer.c
+        breeze/map/map.c
+        breeze/map/tileset.c
 
-        breeze/world/map.c
-        breeze/world/tileset.c
+        breeze/utils/tokenizer.c
     )
 
 set(BreezeHeaders
@@ -39,12 +39,12 @@ set(BreezeHeaders
 
         breeze/math/vec2i.h
 
+        breeze/map/map.h
+        breeze/map/tileset.h
+
         breeze/utils/string.h
         breeze/utils/tokenizer.h
 
-        breeze/world/map.h
-        breeze/world/tileset.h
-
         breeze/defines.h
         breeze/game.h
 
diff --git a/engine/breeze.h b/engine/breeze.h
index 6e5ab05..8a134d7 100644
--- a/engine/breeze.h
+++ b/engine/breeze.h
@@ -9,8 +9,8 @@
 #include "breeze/utils/string.h"
 #include "breeze/utils/tokenizer.h"
 
-#include "breeze/world/map.h"
-#include "breeze/world/tileset.h"
+#include "breeze/map/map.h"
+#include "breeze/map/tileset.h"
 
 #include "breeze/defines.h"
 #include "breeze/game.h"
diff --git a/engine/breeze/game.h b/engine/breeze/game.h
index 660e945..5cb94ef 100644
--- a/engine/breeze/game.h
+++ b/engine/breeze/game.h
@@ -20,6 +20,7 @@ typedef struct BzAppDesc {
     BzAppDeinitFunc deinit;
 
     bool useNuklear;
+    bool useFlecs;
 
     void *userData;
 } BzAppDesc;
@@ -30,8 +31,10 @@ extern bool bzMain(BzAppDesc *appDesc, int argc, const char **argv);
 
 #ifdef BZ_ENTRYPOINT
 #include <raylib-nuklear.h>
+#include <flecs.h>
 
 struct nk_context *NK = NULL;
+ecs_world_t *ECS = NULL;
 
 // https://www.raylib.com/examples/core/loader.html?name=core_custom_logging
 static void bzRaylibLogger(int msgType, const char *text, va_list args) {
@@ -94,6 +97,9 @@ int main(int argc, const char **argv) {
     if (appDesc.useNuklear) {
         NK = InitNuklear(16);
     }
+    if (appDesc.useFlecs) {
+        ECS = ecs_init();
+    }
 
     // User initialize
     if (appDesc.init && !appDesc.init(appDesc.userData)) {
@@ -119,6 +125,10 @@ int main(int argc, const char **argv) {
         appDesc.deinit(appDesc.userData);
 
     // Deinitialize modules
+    if (ECS) {
+        ecs_fini(ECS);
+        ECS = NULL;
+    }
     if (NK) {
         UnloadNuklear(NK);
         NK = NULL;
diff --git a/engine/breeze/world/map.c b/engine/breeze/map/map.c
similarity index 100%
rename from engine/breeze/world/map.c
rename to engine/breeze/map/map.c
diff --git a/engine/breeze/world/map.h b/engine/breeze/map/map.h
similarity index 100%
rename from engine/breeze/world/map.h
rename to engine/breeze/map/map.h
diff --git a/engine/breeze/world/tileset.c b/engine/breeze/map/tileset.c
similarity index 100%
rename from engine/breeze/world/tileset.c
rename to engine/breeze/map/tileset.c
diff --git a/engine/breeze/world/tileset.h b/engine/breeze/map/tileset.h
similarity index 100%
rename from engine/breeze/world/tileset.h
rename to engine/breeze/map/tileset.h