From f2d429109b6a91215aad5bed315ffdc782f20f68 Mon Sep 17 00:00:00 2001 From: cat Date: Sun, 1 Feb 2026 00:54:25 +0200 Subject: [PATCH] Changing casing of dualkey map to PascalCase --- headers/Containers/DualkeyMap.hpp | 12 ++++++------ headers/Systems/ECS.hpp | 8 ++++---- source/Systems/ECS/World.cpp | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/headers/Containers/DualkeyMap.hpp b/headers/Containers/DualkeyMap.hpp index e7c8390..b96c779 100644 --- a/headers/Containers/DualkeyMap.hpp +++ b/headers/Containers/DualkeyMap.hpp @@ -43,7 +43,7 @@ public: } } - Entry insert(AKey firstKey, BKey secondKey, Value value) { + Entry Insert(AKey firstKey, BKey secondKey, Value value) { DualkeyHash *hash = new DualkeyHash(std::move(firstKey), std::move(secondKey), std::move(value)); @@ -57,7 +57,7 @@ public: return {hash->firstKey, hash->secondKey, hash->value}; } - std::size_t remove(std::optional firstKey, + std::size_t Remove(std::optional firstKey, std::optional secondKey) { bool isFirstKeyGiven = firstKey.has_value(); bool isSecondKeyGiven = secondKey.has_value(); @@ -120,7 +120,7 @@ public: } [[nodiscard("Discarding an expensive query!")]] - std::vector query(std::optional firstKey, + std::vector Query(std::optional firstKey, std::optional secondKey) { bool isFirstKeyGiven = firstKey.has_value(); bool isSecondKeyGiven = secondKey.has_value(); @@ -175,7 +175,7 @@ public: return finishedQuery; } - void scan(std::function scanFunction) { for (DualkeyHash *hash : hashList) { @@ -188,7 +188,7 @@ public: } } - void scan(std::function scanFunction) { for (DualkeyHash *hash : hashList) { @@ -202,7 +202,7 @@ public: } [[nodiscard]] - std::size_t count() { + std::size_t Count() { return hashList.size() - graveyard.size(); } diff --git a/headers/Systems/ECS.hpp b/headers/Systems/ECS.hpp index f737e34..bae87ba 100644 --- a/headers/Systems/ECS.hpp +++ b/headers/Systems/ECS.hpp @@ -39,7 +39,7 @@ public: template component &AddComponent(const Entity &entity, Args &&...constructionArguments) { - auto newComponent = entityComponentMap.insert( + auto newComponent = entityComponentMap.Insert( entity, typeid(component), component(constructionArguments...)); return std::any_cast(std::get<2>(newComponent)); @@ -48,7 +48,7 @@ public: template [[nodiscard("Discarding an expensive operation's result!")]] component &GetComponent(const Entity &entity) { - auto result = entityComponentMap.query(entity, typeid(component)); + auto result = entityComponentMap.Query(entity, typeid(component)); if (result.empty()) { Logging::Log(std::format("Entity {} does not have component {}!", entity.asString(), typeid(component).name()), @@ -60,14 +60,14 @@ public: template [[nodiscard("Discarding an expensive operation's result!")]] bool HasComponent(const Entity &entity) { - return entityComponentMap.query(entity, typeid(component)).size(); + return entityComponentMap.Query(entity, typeid(component)).size(); } template [[nodiscard("It is not guaranteed that a component can always be removed, " "please make sure by checking the returned bool")]] bool RemoveComponent(const Entity &entity) { - return entityComponentMap.remove(entity, typeid(component)); + return entityComponentMap.Remove(entity, typeid(component)); } // Copying is not allowed since the ECS world is meant to be diff --git a/source/Systems/ECS/World.cpp b/source/Systems/ECS/World.cpp index 11b7a34..d540ad4 100644 --- a/source/Systems/ECS/World.cpp +++ b/source/Systems/ECS/World.cpp @@ -34,7 +34,7 @@ Entity World::CreateEntity() { auto newEntity = Random::GenerateUUID(); // Default components - entityComponentMap.insert(newEntity, typeid(Components::Base), + entityComponentMap.Insert(newEntity, typeid(Components::Base), Components::Base()); return newEntity; @@ -42,7 +42,7 @@ Entity World::CreateEntity() { bool World::EntityExists(const Entity &entity) noexcept { bool exists = false; - entityComponentMap.scan( + entityComponentMap.Scan( [&exists, entity](const Tourmaline::Type::UUID ¤tEntity, const std::type_index &, std::any &) -> bool { if (currentEntity == entity) { @@ -55,5 +55,5 @@ bool World::EntityExists(const Entity &entity) noexcept { } bool World::DestroyEntity(Entity entity) { - return entityComponentMap.remove(entity, std::nullopt); + return entityComponentMap.Remove(entity, std::nullopt); }