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

registry: sort/sortable no longer requires pool<T>::super

Browse Source
This commit is contained in:
Michele Caini
2020-06-08 00:44:02 +02:00
parent 171463faf5
commit 857a791d68
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1210,8 +1210,8 @@ public:
*/
template<typename Component, typename Compare, typename Sort = std_sort, typename... Args>
void sort(Compare compare, Sort algo = Sort{}, Args &&... args) {
ENTT_ASSERT(sortable<Component>());
auto &cpool = assure<Component>();
ENTT_ASSERT(!cpool.super);
cpool.sort(cpool.begin(), cpool.end(), std::move(compare), std::move(algo), std::forward<Args>(args)...);
}
@@ -1252,9 +1252,8 @@ public:
*/
template<typename To, typename From>
void sort() {
auto &cpool = assure<To>();
ENTT_ASSERT(!cpool.super);
cpool.respect(assure<From>());
ENTT_ASSERT(sortable<To>());
assure<To>().respect(assure<From>());
}
/**
@@ -1310,7 +1309,7 @@ public:
*/
template<typename... Component>
[[nodiscard]] bool sortable() const {
return !(assure<Component>().super || ...);
return std::none_of(groups.cbegin(), groups.cend(), [](auto &&gdata) { return (gdata.owned(type_info<std::decay_t<Component>>::id()) || ...); });
}
/**