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

group: cleanup

Browse Source
This commit is contained in:
Michele Caini
2023-03-22 16:42:31 +01:00
parent ada19432f6
commit 35a78b65ea
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,9 +110,8 @@ class group_handler<owned_t<Owned...>, get_t<Get...>, exclude_t<Exclude...>> fin
using underlying_type = std::common_type_t<typename Owned::entity_type..., typename Get::entity_type..., typename Exclude::entity_type...>;
template<std::size_t... Index>
void swap_elements(std::index_sequence<Index...>, const std::size_t pos, const underlying_type entt) {
(std::get<Index>(pools)->swap_elements(std::get<Index>(pools)->data()[pos], entt), ...);
void swap_elements(const std::size_t pos, const underlying_type entt) {
std::apply([pos, entt](auto *...cpool) { (cpool->swap_elements(cpool->data()[pos], entt), ...); }, pools);
}
public:
@@ -130,7 +129,7 @@ public:
if(std::apply([entt](auto *...cpool) { return (cpool->contains(entt) && ...); }, pools)
&& 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);
swap_elements(len++, entt);
}
}
@@ -138,13 +137,13 @@ public:
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);
swap_elements(len++, entt);
}
}
void remove_if(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);
swap_elements(--len, entt);
}
}