From f65b241bbf69a92a9760cd29e4e2c9486a75557a Mon Sep 17 00:00:00 2001 From: Ricardo Antunes Date: Sun, 1 Oct 2023 19:33:53 +0100 Subject: [PATCH] refactor(ecs): move storages to component dir --- core/include/cubos/core/ecs/component/manager.hpp | 2 +- core/include/cubos/core/ecs/{ => component}/map_storage.hpp | 6 +++--- .../include/cubos/core/ecs/{ => component}/null_storage.hpp | 6 +++--- core/include/cubos/core/ecs/{ => component}/storage.hpp | 6 +++--- core/include/cubos/core/ecs/{ => component}/vec_storage.hpp | 6 +++--- core/samples/ecs/general/main.cpp | 6 +++--- core/tests/ecs/registry.cpp | 2 +- tools/quadrados-gen/src/main.cpp | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) rename core/include/cubos/core/ecs/{ => component}/map_storage.hpp (90%) rename core/include/cubos/core/ecs/{ => component}/null_storage.hpp (90%) rename core/include/cubos/core/ecs/{ => component}/storage.hpp (96%) rename core/include/cubos/core/ecs/{ => component}/vec_storage.hpp (92%) diff --git a/core/include/cubos/core/ecs/component/manager.hpp b/core/include/cubos/core/ecs/component/manager.hpp index b30c5a4a7..c2a4e35c1 100644 --- a/core/include/cubos/core/ecs/component/manager.hpp +++ b/core/include/cubos/core/ecs/component/manager.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include namespace cubos::core::ecs { diff --git a/core/include/cubos/core/ecs/map_storage.hpp b/core/include/cubos/core/ecs/component/map_storage.hpp similarity index 90% rename from core/include/cubos/core/ecs/map_storage.hpp rename to core/include/cubos/core/ecs/component/map_storage.hpp index 832b414f8..51883e3a7 100644 --- a/core/include/cubos/core/ecs/map_storage.hpp +++ b/core/include/cubos/core/ecs/component/map_storage.hpp @@ -1,17 +1,17 @@ /// @file /// @brief Class @ref cubos::core::ecs::MapStorage. -/// @ingroup core-ecs +/// @ingroup core-ecs-component #pragma once -#include +#include namespace cubos::core::ecs { /// @brief Storage implementation that uses an `std::unordered_map`. /// @tparam T Component type. - /// @ingroup core-ecs + /// @ingroup core-ecs-component template class MapStorage : public Storage { diff --git a/core/include/cubos/core/ecs/null_storage.hpp b/core/include/cubos/core/ecs/component/null_storage.hpp similarity index 90% rename from core/include/cubos/core/ecs/null_storage.hpp rename to core/include/cubos/core/ecs/component/null_storage.hpp index ae50862f7..83f2e880a 100644 --- a/core/include/cubos/core/ecs/null_storage.hpp +++ b/core/include/cubos/core/ecs/component/null_storage.hpp @@ -1,10 +1,10 @@ /// @file /// @brief Class @ref cubos::core::ecs::NullStorage. -/// @ingroup core-ecs +/// @ingroup core-ecs-component #pragma once -#include +#include namespace cubos::core::ecs { @@ -12,7 +12,7 @@ namespace cubos::core::ecs /// @brief Storage implementation that doesn't keep any data, made for /// zero-sized components. /// @tparam T Component type. - /// @ingroup core-ecs + /// @ingroup core-ecs-component template class NullStorage : public Storage { diff --git a/core/include/cubos/core/ecs/storage.hpp b/core/include/cubos/core/ecs/component/storage.hpp similarity index 96% rename from core/include/cubos/core/ecs/storage.hpp rename to core/include/cubos/core/ecs/component/storage.hpp index 684e3c0ec..7ce3d9626 100644 --- a/core/include/cubos/core/ecs/storage.hpp +++ b/core/include/cubos/core/ecs/component/storage.hpp @@ -1,6 +1,6 @@ /// @file /// @brief Class @ref cubos::core::ecs::Storage and related types. -/// @ingroup core-ecs +/// @ingroup core-ecs-component #pragma once @@ -15,7 +15,7 @@ namespace cubos::core::ecs /// Necessary to provide a type-erased interface for erasing and packaging/unpackaging /// components. /// - /// @ingroup core-ecs + /// @ingroup core-ecs-component class IStorage { public: @@ -45,7 +45,7 @@ namespace cubos::core::ecs /// @brief Abstract container for a component type @p T. /// @tparam T Component type. - /// @ingroup core-ecs + /// @ingroup core-ecs-component template class Storage : public IStorage { diff --git a/core/include/cubos/core/ecs/vec_storage.hpp b/core/include/cubos/core/ecs/component/vec_storage.hpp similarity index 92% rename from core/include/cubos/core/ecs/vec_storage.hpp rename to core/include/cubos/core/ecs/component/vec_storage.hpp index 78d7084cf..5ff3d61d0 100644 --- a/core/include/cubos/core/ecs/vec_storage.hpp +++ b/core/include/cubos/core/ecs/component/vec_storage.hpp @@ -1,16 +1,16 @@ /// @file /// @brief Class @ref cubos::core::ecs::VecStorage. -/// @ingroup core-ecs +/// @ingroup core-ecs-component #pragma once -#include +#include namespace cubos::core::ecs { /// @brief Storage implementation that uses a `std::vector`. /// @tparam T Component type. - /// @ingroup core-ecs + /// @ingroup core-ecs-component template class VecStorage : public Storage { diff --git a/core/samples/ecs/general/main.cpp b/core/samples/ecs/general/main.cpp index 16b0ad765..bf531fc0f 100644 --- a/core/samples/ecs/general/main.cpp +++ b/core/samples/ecs/general/main.cpp @@ -2,12 +2,12 @@ #include #include +#include +#include #include +#include #include -#include -#include #include -#include #include using namespace cubos::core; diff --git a/core/tests/ecs/registry.cpp b/core/tests/ecs/registry.cpp index 16e6b045e..483968d01 100644 --- a/core/tests/ecs/registry.cpp +++ b/core/tests/ecs/registry.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include "utils.hpp" diff --git a/tools/quadrados-gen/src/main.cpp b/tools/quadrados-gen/src/main.cpp index f7de4467b..ea86e5033 100644 --- a/tools/quadrados-gen/src/main.cpp +++ b/tools/quadrados-gen/src/main.cpp @@ -792,9 +792,9 @@ static bool generate(const GenerateOptions& options) file << "/// Do not edit this file." << std::endl; file << std::endl; file << "#include " << std::endl; - file << "#include " << std::endl; - file << "#include " << std::endl; - file << "#include " << std::endl; + file << "#include " << std::endl; + file << "#include " << std::endl; + file << "#include " << std::endl; file << std::endl; // Include all the component headers.