diff --git a/scenes/engine/CMakeLists.txt b/scenes/engine/CMakeLists.txt index adc0473..e533b2f 100644 --- a/scenes/engine/CMakeLists.txt +++ b/scenes/engine/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(EC) +add_subdirectory(sc) add_library(lib_engine STATIC assets.c AABB.c @@ -6,6 +6,8 @@ add_library(lib_engine STATIC engine.c collisions.c rres.c + mempool.c + entManager.c ${LIBZSTD_DIR}/lib/libzstd.a ) target_include_directories(lib_engine @@ -13,9 +15,18 @@ target_include_directories(lib_engine ${LIBZSTD_DIR}/include PUBLIC ${CMAKE_CURRENT_LIST_DIR} + ${RAYLIB_DIR}/include +) +target_link_directories(lib_engine + PUBLIC + ${RAYLIB_DIR}/lib ) target_link_libraries(lib_engine PUBLIC - lib_EC zstd + raylib + sc_queue + sc_map + sc_array + m ) diff --git a/scenes/engine/EC/EC.h b/scenes/engine/EC.h similarity index 100% rename from scenes/engine/EC/EC.h rename to scenes/engine/EC.h diff --git a/scenes/engine/EC/CMakeLists.txt b/scenes/engine/EC/CMakeLists.txt deleted file mode 100644 index ff872d6..0000000 --- a/scenes/engine/EC/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -add_subdirectory(sc) -add_library(lib_EC STATIC - mempool.c - entManager.c -) -target_include_directories(lib_EC - PUBLIC - ${CMAKE_CURRENT_LIST_DIR} - ${RAYLIB_DIR}/include -) - -target_link_directories(lib_EC - PUBLIC - ${RAYLIB_DIR}/lib -) -target_link_libraries(lib_EC - PUBLIC - raylib - sc_queue - sc_map - sc_array - m -) diff --git a/scenes/engine/engine.c b/scenes/engine/engine.c index 2315547..9f223db 100644 --- a/scenes/engine/engine.c +++ b/scenes/engine/engine.c @@ -62,6 +62,7 @@ bool load_sfx(GameEngine_t* engine, const char* snd_name, uint32_t tag_idx) engine->sfx_list.sfx[tag_idx].snd = snd; engine->sfx_list.sfx[tag_idx].cooldown = 0; engine->sfx_list.sfx[tag_idx].plays = 0; + return true; } void play_sfx(GameEngine_t* engine, unsigned int tag_idx) diff --git a/scenes/engine/EC/entManager.c b/scenes/engine/entManager.c similarity index 100% rename from scenes/engine/EC/entManager.c rename to scenes/engine/entManager.c diff --git a/scenes/engine/EC/mempool.c b/scenes/engine/mempool.c similarity index 100% rename from scenes/engine/EC/mempool.c rename to scenes/engine/mempool.c diff --git a/scenes/engine/EC/mempool.h b/scenes/engine/mempool.h similarity index 100% rename from scenes/engine/EC/mempool.h rename to scenes/engine/mempool.h diff --git a/scenes/engine/EC/sc/CMakeLists.txt b/scenes/engine/sc/CMakeLists.txt similarity index 100% rename from scenes/engine/EC/sc/CMakeLists.txt rename to scenes/engine/sc/CMakeLists.txt diff --git a/scenes/engine/EC/sc/LICENSE b/scenes/engine/sc/LICENSE similarity index 100% rename from scenes/engine/EC/sc/LICENSE rename to scenes/engine/sc/LICENSE diff --git a/scenes/engine/EC/sc/array/CMakeLists.txt b/scenes/engine/sc/array/CMakeLists.txt similarity index 100% rename from scenes/engine/EC/sc/array/CMakeLists.txt rename to scenes/engine/sc/array/CMakeLists.txt diff --git a/scenes/engine/EC/sc/array/README.md b/scenes/engine/sc/array/README.md similarity index 100% rename from scenes/engine/EC/sc/array/README.md rename to scenes/engine/sc/array/README.md diff --git a/scenes/engine/EC/sc/array/sc_array.h b/scenes/engine/sc/array/sc_array.h similarity index 100% rename from scenes/engine/EC/sc/array/sc_array.h rename to scenes/engine/sc/array/sc_array.h diff --git a/scenes/engine/EC/sc/heap/CMakeLists.txt b/scenes/engine/sc/heap/CMakeLists.txt similarity index 100% rename from scenes/engine/EC/sc/heap/CMakeLists.txt rename to scenes/engine/sc/heap/CMakeLists.txt diff --git a/scenes/engine/EC/sc/heap/README.md b/scenes/engine/sc/heap/README.md similarity index 100% rename from scenes/engine/EC/sc/heap/README.md rename to scenes/engine/sc/heap/README.md diff --git a/scenes/engine/EC/sc/heap/sc_heap.c b/scenes/engine/sc/heap/sc_heap.c similarity index 100% rename from scenes/engine/EC/sc/heap/sc_heap.c rename to scenes/engine/sc/heap/sc_heap.c diff --git a/scenes/engine/EC/sc/heap/sc_heap.h b/scenes/engine/sc/heap/sc_heap.h similarity index 100% rename from scenes/engine/EC/sc/heap/sc_heap.h rename to scenes/engine/sc/heap/sc_heap.h diff --git a/scenes/engine/EC/sc/map/CMakeLists.txt b/scenes/engine/sc/map/CMakeLists.txt similarity index 100% rename from scenes/engine/EC/sc/map/CMakeLists.txt rename to scenes/engine/sc/map/CMakeLists.txt diff --git a/scenes/engine/EC/sc/map/README.md b/scenes/engine/sc/map/README.md similarity index 100% rename from scenes/engine/EC/sc/map/README.md rename to scenes/engine/sc/map/README.md diff --git a/scenes/engine/EC/sc/map/sc_map.c b/scenes/engine/sc/map/sc_map.c similarity index 100% rename from scenes/engine/EC/sc/map/sc_map.c rename to scenes/engine/sc/map/sc_map.c diff --git a/scenes/engine/EC/sc/map/sc_map.h b/scenes/engine/sc/map/sc_map.h similarity index 100% rename from scenes/engine/EC/sc/map/sc_map.h rename to scenes/engine/sc/map/sc_map.h diff --git a/scenes/engine/EC/sc/queue/CMakeLists.txt b/scenes/engine/sc/queue/CMakeLists.txt similarity index 100% rename from scenes/engine/EC/sc/queue/CMakeLists.txt rename to scenes/engine/sc/queue/CMakeLists.txt diff --git a/scenes/engine/EC/sc/queue/README.md b/scenes/engine/sc/queue/README.md similarity index 100% rename from scenes/engine/EC/sc/queue/README.md rename to scenes/engine/sc/queue/README.md diff --git a/scenes/engine/EC/sc/queue/sc_queue.h b/scenes/engine/sc/queue/sc_queue.h similarity index 100% rename from scenes/engine/EC/sc/queue/sc_queue.h rename to scenes/engine/sc/queue/sc_queue.h