From b72cf5d364e0cdf6c03673527b54e2a05e36ea07 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Tue, 17 Sep 2019 16:13:58 +0200 Subject: [PATCH] review: observer --- src/entt/entity/observer.hpp | 28 ++++--- test/entt/entity/observer.cpp | 151 ++++++++++++++++------------------ 2 files changed, 87 insertions(+), 92 deletions(-) diff --git a/src/entt/entity/observer.hpp b/src/entt/entity/observer.hpp index 9aa41e058..fa75e7917 100644 --- a/src/entt/entity/observer.hpp +++ b/src/entt/entity/observer.hpp @@ -52,7 +52,7 @@ struct basic_collector<> { */ template static constexpr auto group(exclude_t = {}) ENTT_NOEXCEPT { - return basic_collector, type_list<>>, type_list, type_list>>{}; + return basic_collector, type_list<>, type_list, AllOf...>>{}; } /** @@ -62,18 +62,23 @@ struct basic_collector<> { */ template static constexpr auto replace() ENTT_NOEXCEPT { - return basic_collector, type_list<>>, AnyOf>>{}; + return basic_collector, type_list<>, AnyOf>>{}; } }; /** * @brief Collector. * @copydetails basic_collector<> - * @tparam AnyOf Types of components for which changes should be detected. - * @tparam Matcher Types of grouping matchers. + * @tparam Reject Untracked types used to filter out entities. + * @tparam Require Untracked types required by the matcher. + * @tparam Rule Specific details of the current matcher. + * @tparam Other Other matchers. */ template -struct basic_collector, type_list>, Rule...>, Other...> { +struct basic_collector, type_list, Rule...>, Other...> { + /*! @brief Current matcher. */ + using current_type = matcher, type_list, Rule...>; + /** * @brief Adds a grouping matcher to the collector. * @tparam AllOf Types of components tracked by the matcher. @@ -82,8 +87,7 @@ struct basic_collector, type_list static constexpr auto group(exclude_t = {}) ENTT_NOEXCEPT { - using first = matcher, type_list>, Rule...>; - return basic_collector, type_list<>>, type_list, type_list>, first, Other...>{}; + return basic_collector, type_list<>, type_list, AllOf...>, current_type, Other...>{}; } /** @@ -93,8 +97,7 @@ struct basic_collector, type_list static constexpr auto replace() ENTT_NOEXCEPT { - using first = matcher, type_list>, Rule...>; - return basic_collector, type_list<>>, AnyOf>, first, Other...>{}; + return basic_collector, type_list<>, AnyOf>, current_type, Other...>{}; } /** @@ -105,7 +108,8 @@ struct basic_collector, type_list static constexpr auto where(exclude_t = {}) ENTT_NOEXCEPT { - return basic_collector, type_list>, Rule...>, Other...>{}; + using extended_type = matcher, type_list, Rule...>; + return basic_collector{}; } }; @@ -171,7 +175,7 @@ class basic_observer { struct matcher_handler; template - struct matcher_handler, type_list>, AnyOf>> { + struct matcher_handler, type_list, AnyOf>> { template static void maybe_valid_if(basic_observer &obs, const Entity entt, const basic_registry ®) { if(reg.template has(entt) && !(reg.template has(entt) || ...)) { @@ -204,7 +208,7 @@ class basic_observer { }; template - struct matcher_handler, type_list>, type_list, type_list>> { + struct matcher_handler, type_list, type_list, AllOf...>> { template static void maybe_valid_if(basic_observer &obs, const Entity entt, const basic_registry ®) { if(reg.template has(entt) && !(reg.template has(entt) || ...) diff --git a/test/entt/entity/observer.cpp b/test/entt/entity/observer.cpp index 28f78843b..4c3ec9e12 100644 --- a/test/entt/entity/observer.cpp +++ b/test/entt/entity/observer.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -8,14 +9,14 @@ TEST(Observer, Functionalities) { entt::registry registry; entt::observer observer{registry, entt::collector.group()}; - ASSERT_EQ(observer.size(), entt::observer::size_type{}); + ASSERT_EQ(observer.size(), 0u); ASSERT_TRUE(observer.empty()); ASSERT_EQ(observer.data(), nullptr); ASSERT_EQ(observer.begin(), observer.end()); const auto entity = std::get<0>(registry.create()); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); ASSERT_FALSE(observer.empty()); ASSERT_NE(observer.data(), nullptr); ASSERT_EQ(*observer.data(), entity); @@ -25,14 +26,14 @@ TEST(Observer, Functionalities) { observer.clear(); - ASSERT_EQ(observer.size(), entt::observer::size_type{}); + ASSERT_EQ(observer.size(), 0u); ASSERT_TRUE(observer.empty()); observer.disconnect(); registry.remove(entity); registry.assign(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{}); + ASSERT_EQ(observer.size(), 0u); ASSERT_TRUE(observer.empty()); } @@ -50,7 +51,7 @@ TEST(Observer, AllOf) { registry.assign(entity); registry.assign(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); ASSERT_FALSE(observer.empty()); ASSERT_EQ(*observer.data(), entity); @@ -96,7 +97,7 @@ TEST(Observer, AllOfFiltered) { registry.assign(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{}); + ASSERT_EQ(observer.size(), 0u); ASSERT_TRUE(observer.empty()); ASSERT_EQ(observer.data(), nullptr); @@ -111,7 +112,7 @@ TEST(Observer, AllOfFiltered) { registry.remove(entity); registry.assign(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); ASSERT_FALSE(observer.empty()); ASSERT_EQ(*observer.data(), entity); @@ -130,72 +131,6 @@ TEST(Observer, AllOfFiltered) { ASSERT_TRUE(observer.empty()); } -TEST(Observer, WhereChain) { - constexpr auto collector = entt::collector - .replace().where() - .replace().where(); - - entt::registry registry; - entt::observer observer{registry, collector}; - const auto entity = registry.create(); - - ASSERT_TRUE(observer.empty()); - - registry.assign(entity); - - ASSERT_TRUE(observer.empty()); - - registry.assign_or_replace(entity); - - ASSERT_TRUE(observer.empty()); - - registry.assign(entity); - - ASSERT_TRUE(observer.empty()); - - registry.assign_or_replace(entity); - - ASSERT_EQ(observer.size(), entt::observer::size_type{ 1 }); - ASSERT_FALSE(observer.empty()); - ASSERT_EQ(*observer.data(), entity); - - observer.clear(); - registry.assign(entity); - - ASSERT_TRUE(observer.empty()); - - registry.assign_or_replace(entity); - - ASSERT_TRUE(observer.empty()); - - registry.assign(entity); - - ASSERT_TRUE(observer.empty()); - - registry.assign_or_replace(entity); - - ASSERT_EQ(observer.size(), entt::observer::size_type{ 1 }); - ASSERT_FALSE(observer.empty()); - ASSERT_EQ(*observer.data(), entity); - - registry.remove(entity); - - ASSERT_TRUE(observer.empty()); - - registry.assign_or_replace(entity); - - ASSERT_EQ(observer.size(), entt::observer::size_type{ 1 }); - ASSERT_FALSE(observer.empty()); - ASSERT_EQ(*observer.data(), entity); - - observer.clear(); - observer.disconnect(); - - registry.assign_or_replace(entity); - - ASSERT_TRUE(observer.empty()); -} - TEST(Observer, Observe) { entt::registry registry; entt::observer observer{registry, entt::collector.replace().replace()}; @@ -210,7 +145,7 @@ TEST(Observer, Observe) { registry.assign_or_replace(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); ASSERT_FALSE(observer.empty()); ASSERT_EQ(*observer.data(), entity); @@ -243,7 +178,7 @@ TEST(Observer, ObserveFiltered) { registry.assign(entity); registry.replace(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{}); + ASSERT_EQ(observer.size(), 0u); ASSERT_TRUE(observer.empty()); ASSERT_EQ(observer.data(), nullptr); @@ -256,7 +191,7 @@ TEST(Observer, ObserveFiltered) { registry.remove(entity); registry.replace(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); ASSERT_FALSE(observer.empty()); ASSERT_EQ(*observer.data(), entity); @@ -288,7 +223,7 @@ TEST(Observer, AllOfObserve) { registry.replace(entity); registry.remove(entity); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); ASSERT_FALSE(observer.empty()); ASSERT_EQ(*observer.data(), entity); @@ -331,19 +266,75 @@ TEST(Observer, Each) { const auto entity = std::get<0>(registry.create()); ASSERT_FALSE(observer.empty()); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); std::as_const(observer).each([entity](const auto entt) { ASSERT_EQ(entity, entt); }); ASSERT_FALSE(observer.empty()); - ASSERT_EQ(observer.size(), entt::observer::size_type{1}); + ASSERT_EQ(observer.size(), 1u); observer.each([entity](const auto entt) { ASSERT_EQ(entity, entt); }); ASSERT_TRUE(observer.empty()); - ASSERT_EQ(observer.size(), entt::observer::size_type{}); + ASSERT_EQ(observer.size(), 0u); +} + +TEST(Observer, MultipleFilters) { + constexpr auto collector = entt::collector + .replace().where() + .replace().where(); + + entt::registry registry; + entt::observer observer{registry, collector}; + const auto entity = registry.create(); + + ASSERT_TRUE(observer.empty()); + + registry.assign_or_replace(entity); + registry.assign(entity); + + ASSERT_TRUE(observer.empty()); + + registry.assign_or_replace(entity); + + ASSERT_EQ(observer.size(), 1u); + ASSERT_FALSE(observer.empty()); + ASSERT_EQ(*observer.data(), entity); + + observer.clear(); + registry.assign(entity); + + ASSERT_TRUE(observer.empty()); + + registry.assign_or_replace(entity); + registry.assign(entity); + + ASSERT_TRUE(observer.empty()); + + registry.assign_or_replace(entity); + + ASSERT_EQ(observer.size(), 1u); + ASSERT_FALSE(observer.empty()); + ASSERT_EQ(*observer.data(), entity); + + registry.remove(entity); + + ASSERT_TRUE(observer.empty()); + + registry.assign_or_replace(entity); + + ASSERT_EQ(observer.size(), 1u); + ASSERT_FALSE(observer.empty()); + ASSERT_EQ(*observer.data(), entity); + + observer.clear(); + observer.disconnect(); + + registry.assign_or_replace(entity); + + ASSERT_TRUE(observer.empty()); }