diff --git a/TODO b/TODO index a0ec2d1b2..9ce7500ec 100644 --- a/TODO +++ b/TODO @@ -4,6 +4,7 @@ * add examples (and credits) from @alanjfs :) WIP: +* use identity with dense hash map: cache (review api with hashed string), registry * fast-contains for sparse sets (low prio but nice-to-have) * runtime components (registry), runtime events (dispatcher/emitter), runtime context variables ... * runtime_view/registry, remove reference to basic_sparse_set diff --git a/src/entt/entity/organizer.hpp b/src/entt/entity/organizer.hpp index 4663724bf..cd61db319 100644 --- a/src/entt/entity/organizer.hpp +++ b/src/entt/entity/organizer.hpp @@ -9,6 +9,7 @@ #include "../container/dense_hash_map.hpp" #include "../core/type_info.hpp" #include "../core/type_traits.hpp" +#include "../core/utility.hpp" #include "fwd.hpp" #include "helper.hpp" @@ -477,7 +478,7 @@ public: } private: - dense_hash_map>> dependencies; + dense_hash_map>, identity> dependencies; std::vector vertices; }; diff --git a/src/entt/signal/dispatcher.hpp b/src/entt/signal/dispatcher.hpp index 36cdff6fe..cb03f9bd7 100644 --- a/src/entt/signal/dispatcher.hpp +++ b/src/entt/signal/dispatcher.hpp @@ -10,6 +10,7 @@ #include "../container/dense_hash_map.hpp" #include "../core/fwd.hpp" #include "../core/type_info.hpp" +#include "../core/utility.hpp" #include "sigh.hpp" namespace entt { @@ -85,7 +86,7 @@ class dispatcher { template [[nodiscard]] pool_handler &assure() { - if(auto &&ptr = pools[type_id().hash()]; !ptr) { + if(auto &&ptr = pools[type_hash::value()]; !ptr) { auto *cpool = new pool_handler{}; ptr.reset(cpool); return *cpool; @@ -255,7 +256,7 @@ public: } private: - dense_hash_map> pools; + dense_hash_map, identity> pools; }; } // namespace entt diff --git a/src/entt/signal/emitter.hpp b/src/entt/signal/emitter.hpp index 4da0065d8..3e55b8741 100644 --- a/src/entt/signal/emitter.hpp +++ b/src/entt/signal/emitter.hpp @@ -12,6 +12,7 @@ #include "../container/dense_hash_map.hpp" #include "../core/fwd.hpp" #include "../core/type_info.hpp" +#include "../core/utility.hpp" namespace entt { @@ -120,7 +121,7 @@ class emitter { template [[nodiscard]] pool_handler *assure() { - if(auto &&ptr = pools[type_id().hash()]; !ptr) { + if(auto &&ptr = pools[type_hash::value()]; !ptr) { auto *cpool = new pool_handler{}; ptr.reset(cpool); return cpool; @@ -131,7 +132,7 @@ class emitter { template [[nodiscard]] const pool_handler *assure() const { - const auto it = pools.find(type_id().hash()); + const auto it = pools.find(type_hash::value()); return (it == pools.cend()) ? nullptr : static_cast *>(it->second.get()); } @@ -307,7 +308,7 @@ public: } private: - dense_hash_map> pools{}; + dense_hash_map, identity> pools{}; }; } // namespace entt