From e86f83fff17ea7c09e58e547805b0f5f156c86ce Mon Sep 17 00:00:00 2001 From: light7734 Date: Fri, 11 Jul 2025 02:18:27 +0330 Subject: [PATCH] refactor: move serializer from engine to ecs --- modules/ecs/CMakeLists.txt | 7 +++++-- .../engine/utils => ecs/include/ecs}/serializer.hpp | 8 ++++++-- modules/{engine/src/utils => ecs/src}/serializer.cpp | 4 ++-- modules/engine/CMakeLists.txt | 5 ----- modules/mirror/src/editor_layer.cpp | 2 +- modules/mirror/src/panel/asset_browser.cpp | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) rename modules/{engine/include/engine/utils => ecs/include/ecs}/serializer.hpp (93%) rename modules/{engine/src/utils => ecs/src}/serializer.cpp (99%) diff --git a/modules/ecs/CMakeLists.txt b/modules/ecs/CMakeLists.txt index 1c7641f..fc3b21f 100644 --- a/modules/ecs/CMakeLists.txt +++ b/modules/ecs/CMakeLists.txt @@ -1,2 +1,5 @@ -add_library_module(ecs entity.cpp scene.cpp uuid.cpp) -target_link_libraries(ecs PUBLIC logger lt_debug EnTT::EnTT renderer input camera) +add_library_module(ecs entity.cpp scene.cpp uuid.cpp serializer.cpp) +target_link_libraries(ecs + PUBLIC logger lt_debug EnTT::EnTT renderer input camera + PRIVATE yaml-cpp::yaml-cpp asset_manager +) diff --git a/modules/engine/include/engine/utils/serializer.hpp b/modules/ecs/include/ecs/serializer.hpp similarity index 93% rename from modules/engine/include/engine/utils/serializer.hpp rename to modules/ecs/include/ecs/serializer.hpp index c672632..3d1d0d9 100644 --- a/modules/engine/include/engine/utils/serializer.hpp +++ b/modules/ecs/include/ecs/serializer.hpp @@ -1,9 +1,13 @@ #pragma once - #include #include -#include + +namespace YAML { + +class Emitter; + +} namespace lt { diff --git a/modules/engine/src/utils/serializer.cpp b/modules/ecs/src/serializer.cpp similarity index 99% rename from modules/engine/src/utils/serializer.cpp rename to modules/ecs/src/serializer.cpp index 942bf8b..43be5be 100644 --- a/modules/engine/src/utils/serializer.cpp +++ b/modules/ecs/src/serializer.cpp @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include namespace YAML { diff --git a/modules/engine/CMakeLists.txt b/modules/engine/CMakeLists.txt index eb65947..d9dde7e 100644 --- a/modules/engine/CMakeLists.txt +++ b/modules/engine/CMakeLists.txt @@ -4,7 +4,6 @@ if(NOT WIN32) layer/layer.cpp layer/layer_stack.cpp time/timer.cpp - utils/serializer.cpp ) else() add_library_module(engine @@ -12,7 +11,6 @@ else() layer/layer.cpp layer/layer_stack.cpp time/timer.cpp - utils/serializer.cpp ) endif() @@ -26,10 +24,7 @@ PUBLIC lt_debug ecs window - glad - opengl::opengl - yaml-cpp::yaml-cpp EnTT::EnTT ) diff --git a/modules/mirror/src/editor_layer.cpp b/modules/mirror/src/editor_layer.cpp index 12f7ea2..4c51f2f 100644 --- a/modules/mirror/src/editor_layer.cpp +++ b/modules/mirror/src/editor_layer.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/mirror/src/panel/asset_browser.cpp b/modules/mirror/src/panel/asset_browser.cpp index c6192ec..6cadbfe 100644 --- a/modules/mirror/src/panel/asset_browser.cpp +++ b/modules/mirror/src/panel/asset_browser.cpp @@ -1,7 +1,7 @@ #include #include +#include #include -#include #include #include