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

group: use group_id rather than handler type to mark groups

Browse Source
This commit is contained in:
Michele Caini
2024-04-09 10:03:56 +02:00
parent 48c122fb28
commit fb87ae392f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,6 +309,9 @@ public:
/*! @brief Group handler type. */
using handler = internal::group_handler<common_type, owned_t<>, get_t<std::remove_const_t<Get>...>, exclude_t<std::remove_const_t<Exclude>...>>;
/*! @brief Group opaque marker. */
static constexpr id_type group_id = type_hash<basic_group<owned_t<>, get_t<std::remove_const_t<Get>...>, exclude_t<std::remove_const_t<Exclude>...>>>::value();
/*! @brief Default constructor to use to create empty, invalid groups. */
basic_group() noexcept
: descriptor{} {}
@@ -716,6 +719,9 @@ public:
/*! @brief Group handler type. */
using handler = internal::group_handler<common_type, owned_t<std::remove_const_t<Owned>...>, get_t<std::remove_const_t<Get>...>, exclude_t<std::remove_const_t<Exclude>...>>;
/*! @brief Group opaque marker. */
static constexpr id_type group_id = type_hash<basic_group<owned_t<std::remove_const_t<Owned>...>, get_t<std::remove_const_t<Get>...>, exclude_t<std::remove_const_t<Exclude>...>>>::value();
/*! @brief Default constructor to use to create empty, invalid groups. */
basic_group() noexcept
: descriptor{} {}

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

@@ -1067,9 +1067,10 @@ public:
template<typename... Owned, typename... Get, typename... Exclude>
basic_group<owned_t<storage_for_type<Owned>...>, get_t<storage_for_type<Get>...>, exclude_t<storage_for_type<Exclude>...>>
group(get_t<Get...> = get_t{}, exclude_t<Exclude...> = exclude_t{}) {
using handler_type = typename basic_group<owned_t<storage_for_type<Owned>...>, get_t<storage_for_type<Get>...>, exclude_t<storage_for_type<Exclude>...>>::handler;
using group_type = basic_group<owned_t<storage_for_type<Owned>...>, get_t<storage_for_type<Get>...>, exclude_t<storage_for_type<Exclude>...>>;
using handler_type = typename group_type::handler;
if(auto it = groups.find(type_hash<handler_type>::value()); it != groups.cend()) {
if(auto it = groups.find(group_type::group_id); it != groups.cend()) {
return {*std::static_pointer_cast<handler_type>(it->second)};
}
@@ -1083,7 +1084,7 @@ public:
ENTT_ASSERT(std::all_of(groups.cbegin(), groups.cend(), [&elem](const auto &data) { return data.second->owned(elem, sizeof...(Owned)) == 0u; }), "Conflicting groups");
}
groups.emplace(type_hash<handler_type>::value(), handler);
groups.emplace(group_type::group_id, handler);
return {*handler};
}
@@ -1091,9 +1092,10 @@ public:
template<typename... Owned, typename... Get, typename... Exclude>
basic_group<owned_t<storage_for_type<const Owned>...>, get_t<storage_for_type<const Get>...>, exclude_t<storage_for_type<const Exclude>...>>
group_if_exists(get_t<Get...> = get_t{}, exclude_t<Exclude...> = exclude_t{}) const {
using handler_type = typename basic_group<owned_t<storage_for_type<const Owned>...>, get_t<storage_for_type<const Get>...>, exclude_t<storage_for_type<const Exclude>...>>::handler;
using group_type = basic_group<owned_t<storage_for_type<const Owned>...>, get_t<storage_for_type<const Get>...>, exclude_t<storage_for_type<const Exclude>...>>;
using handler_type = typename group_type::handler;
if(auto it = groups.find(type_hash<handler_type>::value()); it != groups.cend()) {
if(auto it = groups.find(group_type::group_id); it != groups.cend()) {
return {*std::static_pointer_cast<handler_type>(it->second)};
}