Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

group: split group handler functions

Browse Source
This commit is contained in:
Michele Caini
2023-03-15 09:39:50 +01:00
parent 7ef0085115
commit 945dc40937
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/entt/entity/group.hpp
View File

@@ -126,16 +126,23 @@ public:
+[]([[maybe_unused]] const id_type ctype) noexcept { return ((ctype == entt::type_hash<typename Exclude::value_type>::value()) || ...); }},
pools{&opool..., &gpool...}, filter{&epool...}, len{} {}
template<bool Expected>
void push_if(const entity_type entt) {
void push_on_construct(const entity_type entt) {
if(std::apply([entt](auto *...cpool) { return (cpool->contains(entt) && ...); }, pools)
&& std::apply([entt](auto *...cpool) { return (Expected == (0u + ... + cpool->contains(entt))); }, filter)
&& std::apply([entt](auto *...cpool) { return (!cpool->contains(entt) && ...); }, filter)
&& !(std::get<0>(pools)->index(entt) < len)) {
swap_elements(std::index_sequence_for<Owned...>{}, len++, entt);
}
}
void remove_if(const entity_type entt) {
void push_on_destroy(const entity_type entt) {
if(std::apply([entt](auto *...cpool) { return (cpool->contains(entt) && ...); }, pools)
&& std::apply([entt](auto *...cpool) { return (0u + ... + cpool->contains(entt)) == 1u; }, filter)
&& !(std::get<0>(pools)->index(entt) < len)) {
swap_elements(std::index_sequence_for<Owned...>{}, len++, entt);
}
}
void remove(const entity_type entt) {
if(std::get<0>(pools)->contains(entt) && (std::get<0>(pools)->index(entt) < len)) {
swap_elements(std::index_sequence_for<Owned...>{}, --len, entt);
}
@@ -169,16 +176,23 @@ public:
+[]([[maybe_unused]] const id_type ctype) noexcept { return ((ctype == entt::type_hash<typename Exclude::value_type>::value()) || ...); }},
pools{&gpool...}, filter{&epool...}, elem{alloc} {}
template<bool Expected>
void push_if(const entity_type entt) {
void push_on_construct(const entity_type entt) {
if(std::apply([entt](auto *...cpool) { return (cpool->contains(entt) && ...); }, pools)
&& std::apply([entt](auto *...cpool) { return (Expected == (0u + ... + cpool->contains(entt))); }, filter)
&& std::apply([entt](auto *...cpool) { return (!cpool->contains(entt) && ...); }, filter)
&& !elem.contains(entt)) {
elem.push(entt);
}
}
void remove_if(const entity_type entt) {
void push_on_destroy(const entity_type entt) {
if(std::apply([entt](auto *...cpool) { return (cpool->contains(entt) && ...); }, pools)
&& std::apply([entt](auto *...cpool) { return (0u + ... + cpool->contains(entt)) == 1u; }, filter)
&& !elem.contains(entt)) {
elem.push(entt);
}
}
void remove(const entity_type entt) {
elem.remove(entt);
}

30
src/entt/entity/registry.hpp
View File

@@ -1240,21 +1240,21 @@ public:
}
}
on_construct<std::remove_const_t<Owned>>().before(next).template connect<&handler_type::template push_if<0u>>(*handler);
(on_construct<std::remove_const_t<Other>>().before(next).template connect<&handler_type::template push_if<0u>>(*handler), ...);
(on_construct<std::remove_const_t<Get>>().before(next).template connect<&handler_type::template push_if<0u>>(*handler), ...);
(on_destroy<std::remove_const_t<Exclude>>().before(next).template connect<&handler_type::template push_if<1u>>(*handler), ...);
on_construct<std::remove_const_t<Owned>>().before(next).template connect<&handler_type::push_on_construct>(*handler);
(on_construct<std::remove_const_t<Other>>().before(next).template connect<&handler_type::push_on_construct>(*handler), ...);
(on_construct<std::remove_const_t<Get>>().before(next).template connect<&handler_type::push_on_construct>(*handler), ...);
(on_destroy<std::remove_const_t<Exclude>>().before(next).template connect<&handler_type::push_on_destroy>(*handler), ...);
on_destroy<std::remove_const_t<Owned>>().before(prev).template connect<&handler_type::remove_if>(*handler);
(on_destroy<std::remove_const_t<Other>>().before(prev).template connect<&handler_type::remove_if>(*handler), ...);
(on_destroy<std::remove_const_t<Get>>().before(prev).template connect<&handler_type::remove_if>(*handler), ...);
(on_construct<std::remove_const_t<Exclude>>().before(prev).template connect<&handler_type::remove_if>(*handler), ...);
on_destroy<std::remove_const_t<Owned>>().before(prev).template connect<&handler_type::remove>(*handler);
(on_destroy<std::remove_const_t<Other>>().before(prev).template connect<&handler_type::remove>(*handler), ...);
(on_destroy<std::remove_const_t<Get>>().before(prev).template connect<&handler_type::remove>(*handler), ...);
(on_construct<std::remove_const_t<Exclude>>().before(prev).template connect<&handler_type::remove>(*handler), ...);
auto &cpool = assure<std::remove_const_t<Owned>>();
// we cannot iterate backwards because we want to leave behind valid entities in case of owned types
for(auto *first = cpool.data(), *last = first + cpool.size(); first != last; ++first) {
handler->template push_if<0u>(*first);
handler->push_on_construct(*first);
}
}
@@ -1281,13 +1281,13 @@ public:
groups.emplace(type_hash<handler_type>::value(), elem);
handler = static_cast<handler_type *>(elem.get());
on_construct<std::remove_const_t<Get>>().template connect<&handler_type::template push_if<0u>>(*handler);
(on_construct<std::remove_const_t<Other>>().template connect<&handler_type::template push_if<0u>>(*handler), ...);
(on_destroy<std::remove_const_t<Exclude>>().template connect<&handler_type::template push_if<1u>>(*handler), ...);
on_construct<std::remove_const_t<Get>>().template connect<&handler_type::push_on_construct>(*handler);
(on_construct<std::remove_const_t<Other>>().template connect<&handler_type::push_on_construct>(*handler), ...);
(on_destroy<std::remove_const_t<Exclude>>().template connect<&handler_type::push_on_destroy>(*handler), ...);
on_destroy<std::remove_const_t<Get>>().template connect<&handler_type::remove_if>(*handler);
(on_destroy<std::remove_const_t<Other>>().template connect<&handler_type::remove_if>(*handler), ...);
(on_construct<std::remove_const_t<Exclude>>().template connect<&handler_type::remove_if>(*handler), ...);
on_destroy<std::remove_const_t<Get>>().template connect<&handler_type::remove>(*handler);
(on_destroy<std::remove_const_t<Other>>().template connect<&handler_type::remove>(*handler), ...);
(on_construct<std::remove_const_t<Exclude>>().template connect<&handler_type::remove>(*handler), ...);
for(const auto entity: view<Get, Other...>(exclude<Exclude...>)) {
handler->group().push(entity);