From 518995ddd1bd354f6333010d28b9f663146e34a1 Mon Sep 17 00:00:00 2001 From: cat Date: Fri, 9 Jan 2026 00:23:21 +0200 Subject: [PATCH] Restructuring --- CMakeLists.txt | 4 ++-- headers/{ => Systems}/ECS.hpp | 8 ++++---- source/{ => Systems}/ECS/Component.cpp | 4 ++-- source/{ => Systems}/ECS/World.cpp | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename headers/{ => Systems}/ECS.hpp (97%) rename source/{ => Systems}/ECS/Component.cpp (81%) rename source/{ => Systems}/ECS/World.cpp (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bf7e2b..cbc26c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,8 @@ include(GNUInstallDirs) include_directories(headers) add_library(${PROJECT_NAME} SHARED - "source/ECS/Component.cpp" - "source/ECS/World.cpp" + "source/Systems/ECS/Component.cpp" + "source/Systems/ECS/World.cpp" "source/Systems/Logging.cpp" "source/Systems/Random.cpp" "source/Types/UUID.cpp") diff --git a/headers/ECS.hpp b/headers/Systems/ECS.hpp similarity index 97% rename from headers/ECS.hpp rename to headers/Systems/ECS.hpp index 750dd31..794db3e 100644 --- a/headers/ECS.hpp +++ b/headers/Systems/ECS.hpp @@ -15,10 +15,10 @@ #include #include -#include "Systems/Logging.hpp" -#include "Types.hpp" +#include "../Types.hpp" +#include "Logging.hpp" -namespace Tourmaline::ECS { +namespace Tourmaline::Systems::ECS { using Entity = Tourmaline::Type::UUID; class World; @@ -142,5 +142,5 @@ private: Tourmaline::Systems::Logging::LogLevel severity = Systems::Logging::LogLevel::Warning); }; -} // namespace Tourmaline::ECS +} // namespace Tourmaline::Systems::ECS #endif diff --git a/source/ECS/Component.cpp b/source/Systems/ECS/Component.cpp similarity index 81% rename from source/ECS/Component.cpp rename to source/Systems/ECS/Component.cpp index c5d0228..23f51ec 100644 --- a/source/ECS/Component.cpp +++ b/source/Systems/ECS/Component.cpp @@ -7,8 +7,8 @@ * obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../../headers/ECS.hpp" +#include "../../../headers/Systems/ECS.hpp" -using namespace Tourmaline::ECS; +using namespace Tourmaline::Systems::ECS; const Entity &BaseComponent::GetOwner() { return *this->owner; } diff --git a/source/ECS/World.cpp b/source/Systems/ECS/World.cpp similarity index 92% rename from source/ECS/World.cpp rename to source/Systems/ECS/World.cpp index 78448bc..6a2ee6c 100644 --- a/source/ECS/World.cpp +++ b/source/Systems/ECS/World.cpp @@ -7,10 +7,10 @@ * obtain one at http://mozilla.org/MPL/2.0/. */ -#include "../../headers/ECS.hpp" -#include "../../headers/Systems/Random.hpp" +#include "../../../headers/Systems/ECS.hpp" +#include "../../../headers/Systems/Random.hpp" -using namespace Tourmaline::ECS; +using namespace Tourmaline::Systems::ECS; Entity World::CreateEntity() { auto [iterator, success] =