From a5d135aaf2cc6d1a5f4192283be05b0136ebe3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Fonseca?= Date: Tue, 26 Sep 2023 13:41:44 +0100 Subject: [PATCH] chore: move serialization utils to imgui plugin --- engine/CMakeLists.txt | 2 +- .../cubos/engine/{tools/utils => imgui}/serialization.hpp | 5 +---- .../cubos/engine/{tools/utils => imgui}/serialization.cpp | 2 +- engine/src/cubos/engine/tools/entity_inspector/plugin.cpp | 2 +- engine/src/cubos/engine/tools/settings_inspector/plugin.cpp | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) rename engine/include/cubos/engine/{tools/utils => imgui}/serialization.hpp (96%) rename engine/src/cubos/engine/{tools/utils => imgui}/serialization.cpp (99%) diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index eea83aa95..f484dbf4d 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -20,8 +20,8 @@ set(CUBOS_ENGINE_SOURCE "src/cubos/engine/imgui/plugin.cpp" "src/cubos/engine/imgui/imgui.cpp" + "src/cubos/engine/imgui/serialization.cpp" - "src/cubos/engine/tools/utils/serialization.cpp" "src/cubos/engine/tools/asset_explorer/plugin.cpp" "src/cubos/engine/tools/settings_inspector/plugin.cpp" "src/cubos/engine/tools/entity_selector/plugin.cpp" diff --git a/engine/include/cubos/engine/tools/utils/serialization.hpp b/engine/include/cubos/engine/imgui/serialization.hpp similarity index 96% rename from engine/include/cubos/engine/tools/utils/serialization.hpp rename to engine/include/cubos/engine/imgui/serialization.hpp index 349ff841b..019b4181a 100644 --- a/engine/include/cubos/engine/tools/utils/serialization.hpp +++ b/engine/include/cubos/engine/imgui/serialization.hpp @@ -1,9 +1,6 @@ -/// @dir -/// @brief @ref utils-tool-plugin plugin directory. - /// @file /// @brief Functions for showing and editing serializable objects in the UI. -/// @ingroup utils-tool-plugin +/// @ingroup imgui-plugin #pragma once diff --git a/engine/src/cubos/engine/tools/utils/serialization.cpp b/engine/src/cubos/engine/imgui/serialization.cpp similarity index 99% rename from engine/src/cubos/engine/tools/utils/serialization.cpp rename to engine/src/cubos/engine/imgui/serialization.cpp index fb113be28..ace73fc13 100644 --- a/engine/src/cubos/engine/tools/utils/serialization.cpp +++ b/engine/src/cubos/engine/imgui/serialization.cpp @@ -2,7 +2,7 @@ #include -#include +#include using namespace cubos::engine; diff --git a/engine/src/cubos/engine/tools/entity_inspector/plugin.cpp b/engine/src/cubos/engine/tools/entity_inspector/plugin.cpp index 26ce06c0e..17c72de3d 100644 --- a/engine/src/cubos/engine/tools/entity_inspector/plugin.cpp +++ b/engine/src/cubos/engine/tools/entity_inspector/plugin.cpp @@ -1,9 +1,9 @@ #include #include +#include #include #include -#include using cubos::core::data::Context; using cubos::core::data::SerializationMap; diff --git a/engine/src/cubos/engine/tools/settings_inspector/plugin.cpp b/engine/src/cubos/engine/tools/settings_inspector/plugin.cpp index 885f0aae6..b086bf399 100644 --- a/engine/src/cubos/engine/tools/settings_inspector/plugin.cpp +++ b/engine/src/cubos/engine/tools/settings_inspector/plugin.cpp @@ -1,9 +1,9 @@ #include #include +#include #include #include -#include using cubos::core::ecs::Write;