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

registry: cleanup

Browse Source
This commit is contained in:
Michele Caini
2020-02-17 13:36:57 +01:00
parent c55372459f
commit 652e569afc
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1407,16 +1407,11 @@ public:
handler->current.construct(entity);
}
} else {
const auto &cpool = std::min({
static_cast<sparse_set<Entity> &>(std::get<pool_handler<std::decay_t<Owned>> &>(cpools))...,
static_cast<sparse_set<Entity> &>(std::get<pool_handler<std::decay_t<Get>> &>(cpools))...
}, [](const auto &lhs, const auto &rhs) {
return lhs.size() < rhs.size();
});
const auto curr = view<Owned..., Get...>(exclude<Exclude...>);
// we cannot iterate backwards because we want to leave behind valid entities in case of owned types
std::for_each(std::make_reverse_iterator(cpool.end()), std::make_reverse_iterator(cpool.begin()), [cpools, handler, curr = view<Owned..., Get...>(entt::exclude<Exclude...>)](const auto entity) {
if(const auto pos = handler->current; curr.contains(entity) && !(std::get<0>(cpools).index(entity) < ++handler->current)) {
std::for_each(std::make_reverse_iterator(curr.end()), std::make_reverse_iterator(curr.begin()), [cpools, handler](const auto entity) {
if(const auto pos = handler->current; !(std::get<0>(cpools).index(entity) < ++handler->current)) {
(std::get<pool_handler<std::decay_t<Owned>> &>(cpools).swap(std::get<pool_handler<std::decay_t<Owned>> &>(cpools).data()[pos], entity), ...);
}
});