From 94e2fe2cbb494be0f217d7f4a4232932d3a84c13 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Wed, 11 Sep 2019 22:54:44 +0200 Subject: [PATCH] make empty components eat arguments on construction --- src/entt/entity/registry.hpp | 5 ++-- test/entt/entity/registry.cpp | 49 +++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index bb6bc4d7b..22dd05e03 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -71,9 +71,10 @@ class basic_registry { template decltype(auto) assign(basic_registry ®istry, const Entity entt, Args &&... args) { if constexpr(std::is_empty_v) { + Component component{std::forward(args)...}; storage::construct(entt); - construction.publish(entt, registry, Component{}); - return Component{std::forward(args)...}; + construction.publish(entt, registry, std::as_const(component)); + return component; } else { auto &component = storage::construct(entt, std::forward(args)...); construction.publish(entt, registry, component); diff --git a/test/entt/entity/registry.cpp b/test/entt/entity/registry.cpp index 1778ad48d..78373b3e7 100644 --- a/test/entt/entity/registry.cpp +++ b/test/entt/entity/registry.cpp @@ -442,13 +442,13 @@ TEST(Registry, View) { registry.assign(e2, 0); registry.assign(e2, 'c'); - ASSERT_EQ(iview.size(), decltype(iview)::size_type{3}); - ASSERT_EQ(cview.size(), decltype(cview)::size_type{2}); + ASSERT_EQ(iview.size(), 3u); + ASSERT_EQ(cview.size(), 2u); - decltype(mview)::size_type cnt{0}; + std::size_t cnt{}; mview.each([&cnt](auto...) { ++cnt; }); - ASSERT_EQ(cnt, decltype(mview)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, NonOwningGroupInitOnFirstUse) { @@ -468,13 +468,13 @@ TEST(Registry, NonOwningGroupInitOnFirstUse) { ASSERT_FALSE(registry.owned()); ASSERT_FALSE(registry.owned()); + std::size_t cnt{}; auto group = registry.group<>(entt::get); - decltype(group)::size_type cnt{0}; group.each([&cnt](auto...) { ++cnt; }); ASSERT_FALSE(registry.owned()); ASSERT_FALSE(registry.owned()); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, NonOwningGroupInitOnAssign) { @@ -495,12 +495,12 @@ TEST(Registry, NonOwningGroupInitOnAssign) { ASSERT_FALSE(registry.owned()); ASSERT_FALSE(registry.owned()); - decltype(group)::size_type cnt{0}; + std::size_t cnt{}; group.each([&cnt](auto...) { ++cnt; }); ASSERT_FALSE(registry.owned()); ASSERT_FALSE(registry.owned()); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, FullOwningGroupInitOnFirstUse) { @@ -520,13 +520,13 @@ TEST(Registry, FullOwningGroupInitOnFirstUse) { ASSERT_FALSE(registry.owned()); ASSERT_FALSE(registry.owned()); + std::size_t cnt{}; auto group = registry.group(); - decltype(group)::size_type cnt{0}; group.each([&cnt](auto...) { ++cnt; }); ASSERT_TRUE(registry.owned()); ASSERT_TRUE(registry.owned()); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, FullOwningGroupInitOnAssign) { @@ -547,12 +547,12 @@ TEST(Registry, FullOwningGroupInitOnAssign) { ASSERT_TRUE(registry.owned()); ASSERT_TRUE(registry.owned()); - decltype(group)::size_type cnt{0}; + std::size_t cnt{}; group.each([&cnt](auto...) { ++cnt; }); ASSERT_TRUE(registry.owned()); ASSERT_TRUE(registry.owned()); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, PartialOwningGroupInitOnFirstUse) { @@ -572,13 +572,13 @@ TEST(Registry, PartialOwningGroupInitOnFirstUse) { ASSERT_FALSE(registry.owned()); ASSERT_FALSE(registry.owned()); + std::size_t cnt{}; auto group = registry.group(entt::get); - decltype(group)::size_type cnt{0}; group.each([&cnt](auto...) { ++cnt; }); ASSERT_TRUE(registry.owned()); ASSERT_FALSE(registry.owned()); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } @@ -600,12 +600,12 @@ TEST(Registry, PartialOwningGroupInitOnAssign) { ASSERT_TRUE(registry.owned()); ASSERT_FALSE(registry.owned()); - decltype(group)::size_type cnt{0}; + std::size_t cnt{}; group.each([&cnt](auto...) { ++cnt; }); ASSERT_TRUE(registry.owned()); ASSERT_FALSE(registry.owned()); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, CleanViewAfterReset) { @@ -1278,10 +1278,10 @@ TEST(Registry, NonOwningGroupInterleaved) { registry.assign(entity); registry.assign(entity); - decltype(group)::size_type cnt{0}; + std::size_t cnt{}; group.each([&cnt](auto...) { ++cnt; }); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, FullOwningGroupInterleaved) { @@ -1298,10 +1298,10 @@ TEST(Registry, FullOwningGroupInterleaved) { registry.assign(entity); registry.assign(entity); - decltype(group)::size_type cnt{0}; + std::size_t cnt{}; group.each([&cnt](auto...) { ++cnt; }); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, PartialOwningGroupInterleaved) { @@ -1318,10 +1318,10 @@ TEST(Registry, PartialOwningGroupInterleaved) { registry.assign(entity); registry.assign(entity); - decltype(group)::size_type cnt{0}; + std::size_t cnt{}; group.each([&cnt](auto...) { ++cnt; }); - ASSERT_EQ(cnt, decltype(group)::size_type{2}); + ASSERT_EQ(cnt, 2u); } TEST(Registry, NonOwningGroupSortInterleaved) { @@ -1602,6 +1602,11 @@ TEST(Registry, GetOrAssign) { TEST(Registry, Constness) { entt::registry registry; + ASSERT_TRUE((std::is_same_v({})), int &>)); + ASSERT_TRUE((std::is_same_v({})), int &>)); + ASSERT_TRUE((std::is_same_v({})), empty_type>)); + ASSERT_TRUE((std::is_same_v({})), empty_type>)); + ASSERT_TRUE((std::is_same_v({})), int &>)); ASSERT_TRUE((std::is_same_v({})), std::tuple>));