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

registry: make ::destroy work without ::release (the latter to be deprecated)

Browse Source
This commit is contained in:
Michele Caini
2023-02-16 10:00:45 +01:00
parent d288ecd70d
commit c68fa6a654
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -724,12 +724,14 @@ public:
*/
version_type destroy(const entity_type entt, const version_type version) {
ENTT_ASSERT(!pools.empty() && (pools.begin()->second.get() == shortcut), "Misplaced entity pool");
ENTT_ASSERT(shortcut->contains(entt), "Invalid entity");
for(size_type pos = pools.size() - 1u; pos; --pos) {
pools.begin()[pos].second->remove(entt);
for(size_type pos = pools.size(); pos; --pos) {
pools.begin()[pos - 1u].second->remove(entt);
}
return release(entt, version);
const auto elem = traits_type::construct(traits_type::to_entity(entt), version);
return shortcut->bump((elem == tombstone) ? traits_type::next(elem) : elem);
}
/**
@@ -744,16 +746,12 @@ public:
template<typename It>
void destroy(It first, It last) {
ENTT_ASSERT(!pools.empty() && (pools.begin()->second.get() == shortcut), "Misplaced entity pool");
const auto from = shortcut->each().cbegin().base();
const auto to = from + shortcut->pack(first, last);
const auto len = shortcut->pack(first, last);
auto from = shortcut->each().cbegin().base();
const auto to = from + len;
for(size_type pos = pools.size() - 1u; pos; --pos) {
pools.begin()[pos].second->remove(from, to);
for(size_type pos = pools.size(); pos; --pos) {
pools.begin()[pos - 1u].second->remove(from, to);
}
release(from, to);
}
/**