From b9b0c11524c3ca25a44bc88eadd41e5103889a84 Mon Sep 17 00:00:00 2001 From: En Yi Date: Fri, 13 Oct 2023 21:26:42 +0800 Subject: [PATCH] Separate out engine from scenes This creates stronger separation the engine stuff from game implementations. way overdue tbh --- CMakeLists.txt | 2 +- {scenes/engine => engine}/AABB.c | 0 {scenes/engine => engine}/AABB.h | 0 {scenes/engine => engine}/CMakeLists.txt | 0 {scenes/engine => engine}/EC.h | 0 {scenes/engine => engine}/actions.h | 0 {scenes/engine => engine}/assets.c | 0 {scenes/engine => engine}/assets.h | 0 {scenes/engine => engine}/collisions.c | 0 {scenes/engine => engine}/collisions.h | 0 {scenes/engine => engine}/engine.c | 0 {scenes/engine => engine}/engine.h | 0 {scenes/engine => engine}/entManager.c | 0 {scenes/engine => engine}/gui.c | 0 {scenes/engine => engine}/gui.h | 0 {scenes/engine => engine}/mempool.c | 0 {scenes/engine => engine}/mempool.h | 0 {scenes/engine => engine}/raygui.h | 0 {scenes/engine => engine}/rres.c | 0 {scenes/engine => engine}/rres.h | 0 {scenes/engine => engine}/sc/CMakeLists.txt | 0 {scenes/engine => engine}/sc/LICENSE | 0 {scenes/engine => engine}/sc/array/CMakeLists.txt | 0 {scenes/engine => engine}/sc/array/README.md | 0 {scenes/engine => engine}/sc/array/sc_array.h | 0 {scenes/engine => engine}/sc/heap/CMakeLists.txt | 0 {scenes/engine => engine}/sc/heap/README.md | 0 {scenes/engine => engine}/sc/heap/sc_heap.c | 0 {scenes/engine => engine}/sc/heap/sc_heap.h | 0 {scenes/engine => engine}/sc/map/CMakeLists.txt | 0 {scenes/engine => engine}/sc/map/README.md | 0 {scenes/engine => engine}/sc/map/sc_map.c | 0 {scenes/engine => engine}/sc/map/sc_map.h | 0 {scenes/engine => engine}/sc/queue/CMakeLists.txt | 0 {scenes/engine => engine}/sc/queue/README.md | 0 {scenes/engine => engine}/sc/queue/sc_queue.h | 0 scenes/CMakeLists.txt | 1 - 37 files changed, 1 insertion(+), 2 deletions(-) rename {scenes/engine => engine}/AABB.c (100%) rename {scenes/engine => engine}/AABB.h (100%) rename {scenes/engine => engine}/CMakeLists.txt (100%) rename {scenes/engine => engine}/EC.h (100%) rename {scenes/engine => engine}/actions.h (100%) rename {scenes/engine => engine}/assets.c (100%) rename {scenes/engine => engine}/assets.h (100%) rename {scenes/engine => engine}/collisions.c (100%) rename {scenes/engine => engine}/collisions.h (100%) rename {scenes/engine => engine}/engine.c (100%) rename {scenes/engine => engine}/engine.h (100%) rename {scenes/engine => engine}/entManager.c (100%) rename {scenes/engine => engine}/gui.c (100%) rename {scenes/engine => engine}/gui.h (100%) rename {scenes/engine => engine}/mempool.c (100%) rename {scenes/engine => engine}/mempool.h (100%) rename {scenes/engine => engine}/raygui.h (100%) rename {scenes/engine => engine}/rres.c (100%) rename {scenes/engine => engine}/rres.h (100%) rename {scenes/engine => engine}/sc/CMakeLists.txt (100%) rename {scenes/engine => engine}/sc/LICENSE (100%) rename {scenes/engine => engine}/sc/array/CMakeLists.txt (100%) rename {scenes/engine => engine}/sc/array/README.md (100%) rename {scenes/engine => engine}/sc/array/sc_array.h (100%) rename {scenes/engine => engine}/sc/heap/CMakeLists.txt (100%) rename {scenes/engine => engine}/sc/heap/README.md (100%) rename {scenes/engine => engine}/sc/heap/sc_heap.c (100%) rename {scenes/engine => engine}/sc/heap/sc_heap.h (100%) rename {scenes/engine => engine}/sc/map/CMakeLists.txt (100%) rename {scenes/engine => engine}/sc/map/README.md (100%) rename {scenes/engine => engine}/sc/map/sc_map.c (100%) rename {scenes/engine => engine}/sc/map/sc_map.h (100%) rename {scenes/engine => engine}/sc/queue/CMakeLists.txt (100%) rename {scenes/engine => engine}/sc/queue/README.md (100%) rename {scenes/engine => engine}/sc/queue/sc_queue.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e985d04..104321b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(GAME_LIBS lib_scenes ) - +add_subdirectory(engine) add_subdirectory(scenes) add_subdirectory(res) diff --git a/scenes/engine/AABB.c b/engine/AABB.c similarity index 100% rename from scenes/engine/AABB.c rename to engine/AABB.c diff --git a/scenes/engine/AABB.h b/engine/AABB.h similarity index 100% rename from scenes/engine/AABB.h rename to engine/AABB.h diff --git a/scenes/engine/CMakeLists.txt b/engine/CMakeLists.txt similarity index 100% rename from scenes/engine/CMakeLists.txt rename to engine/CMakeLists.txt diff --git a/scenes/engine/EC.h b/engine/EC.h similarity index 100% rename from scenes/engine/EC.h rename to engine/EC.h diff --git a/scenes/engine/actions.h b/engine/actions.h similarity index 100% rename from scenes/engine/actions.h rename to engine/actions.h diff --git a/scenes/engine/assets.c b/engine/assets.c similarity index 100% rename from scenes/engine/assets.c rename to engine/assets.c diff --git a/scenes/engine/assets.h b/engine/assets.h similarity index 100% rename from scenes/engine/assets.h rename to engine/assets.h diff --git a/scenes/engine/collisions.c b/engine/collisions.c similarity index 100% rename from scenes/engine/collisions.c rename to engine/collisions.c diff --git a/scenes/engine/collisions.h b/engine/collisions.h similarity index 100% rename from scenes/engine/collisions.h rename to engine/collisions.h diff --git a/scenes/engine/engine.c b/engine/engine.c similarity index 100% rename from scenes/engine/engine.c rename to engine/engine.c diff --git a/scenes/engine/engine.h b/engine/engine.h similarity index 100% rename from scenes/engine/engine.h rename to engine/engine.h diff --git a/scenes/engine/entManager.c b/engine/entManager.c similarity index 100% rename from scenes/engine/entManager.c rename to engine/entManager.c diff --git a/scenes/engine/gui.c b/engine/gui.c similarity index 100% rename from scenes/engine/gui.c rename to engine/gui.c diff --git a/scenes/engine/gui.h b/engine/gui.h similarity index 100% rename from scenes/engine/gui.h rename to engine/gui.h diff --git a/scenes/engine/mempool.c b/engine/mempool.c similarity index 100% rename from scenes/engine/mempool.c rename to engine/mempool.c diff --git a/scenes/engine/mempool.h b/engine/mempool.h similarity index 100% rename from scenes/engine/mempool.h rename to engine/mempool.h diff --git a/scenes/engine/raygui.h b/engine/raygui.h similarity index 100% rename from scenes/engine/raygui.h rename to engine/raygui.h diff --git a/scenes/engine/rres.c b/engine/rres.c similarity index 100% rename from scenes/engine/rres.c rename to engine/rres.c diff --git a/scenes/engine/rres.h b/engine/rres.h similarity index 100% rename from scenes/engine/rres.h rename to engine/rres.h diff --git a/scenes/engine/sc/CMakeLists.txt b/engine/sc/CMakeLists.txt similarity index 100% rename from scenes/engine/sc/CMakeLists.txt rename to engine/sc/CMakeLists.txt diff --git a/scenes/engine/sc/LICENSE b/engine/sc/LICENSE similarity index 100% rename from scenes/engine/sc/LICENSE rename to engine/sc/LICENSE diff --git a/scenes/engine/sc/array/CMakeLists.txt b/engine/sc/array/CMakeLists.txt similarity index 100% rename from scenes/engine/sc/array/CMakeLists.txt rename to engine/sc/array/CMakeLists.txt diff --git a/scenes/engine/sc/array/README.md b/engine/sc/array/README.md similarity index 100% rename from scenes/engine/sc/array/README.md rename to engine/sc/array/README.md diff --git a/scenes/engine/sc/array/sc_array.h b/engine/sc/array/sc_array.h similarity index 100% rename from scenes/engine/sc/array/sc_array.h rename to engine/sc/array/sc_array.h diff --git a/scenes/engine/sc/heap/CMakeLists.txt b/engine/sc/heap/CMakeLists.txt similarity index 100% rename from scenes/engine/sc/heap/CMakeLists.txt rename to engine/sc/heap/CMakeLists.txt diff --git a/scenes/engine/sc/heap/README.md b/engine/sc/heap/README.md similarity index 100% rename from scenes/engine/sc/heap/README.md rename to engine/sc/heap/README.md diff --git a/scenes/engine/sc/heap/sc_heap.c b/engine/sc/heap/sc_heap.c similarity index 100% rename from scenes/engine/sc/heap/sc_heap.c rename to engine/sc/heap/sc_heap.c diff --git a/scenes/engine/sc/heap/sc_heap.h b/engine/sc/heap/sc_heap.h similarity index 100% rename from scenes/engine/sc/heap/sc_heap.h rename to engine/sc/heap/sc_heap.h diff --git a/scenes/engine/sc/map/CMakeLists.txt b/engine/sc/map/CMakeLists.txt similarity index 100% rename from scenes/engine/sc/map/CMakeLists.txt rename to engine/sc/map/CMakeLists.txt diff --git a/scenes/engine/sc/map/README.md b/engine/sc/map/README.md similarity index 100% rename from scenes/engine/sc/map/README.md rename to engine/sc/map/README.md diff --git a/scenes/engine/sc/map/sc_map.c b/engine/sc/map/sc_map.c similarity index 100% rename from scenes/engine/sc/map/sc_map.c rename to engine/sc/map/sc_map.c diff --git a/scenes/engine/sc/map/sc_map.h b/engine/sc/map/sc_map.h similarity index 100% rename from scenes/engine/sc/map/sc_map.h rename to engine/sc/map/sc_map.h diff --git a/scenes/engine/sc/queue/CMakeLists.txt b/engine/sc/queue/CMakeLists.txt similarity index 100% rename from scenes/engine/sc/queue/CMakeLists.txt rename to engine/sc/queue/CMakeLists.txt diff --git a/scenes/engine/sc/queue/README.md b/engine/sc/queue/README.md similarity index 100% rename from scenes/engine/sc/queue/README.md rename to engine/sc/queue/README.md diff --git a/scenes/engine/sc/queue/sc_queue.h b/engine/sc/queue/sc_queue.h similarity index 100% rename from scenes/engine/sc/queue/sc_queue.h rename to engine/sc/queue/sc_queue.h diff --git a/scenes/CMakeLists.txt b/scenes/CMakeLists.txt index 47789c8..26a16d1 100644 --- a/scenes/CMakeLists.txt +++ b/scenes/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(engine) add_library(lib_scenes STATIC assets_loader.c player_ent.c