Jelajahi Sumber

view: further reduce instantiations

Michele Caini 2 tahun lalu
induk
melakukan
5ef07da451
1 mengubah file dengan 8 tambahan dan 3 penghapusan
  1. 8 3
      src/entt/entity/view.hpp

+ 8 - 3
src/entt/entity/view.hpp

@@ -26,6 +26,13 @@ template<typename... Args, typename Type, std::size_t N, std::size_t... Index>
     return std::make_tuple(static_cast<Args *>(const_cast<constness_as_t<Type, Args> *>(std::get<Index>(filter)))...);
     return std::make_tuple(static_cast<Args *>(const_cast<constness_as_t<Type, Args> *>(std::get<Index>(filter)))...);
 }
 }
 
 
+template<typename Type, std::size_t N>
+[[nodiscard]] auto all_of(const std::array<const Type *, N> &filter, const typename Type::entity_type entt) noexcept {
+    std::size_t pos{};
+    for(; pos < N && filter[pos]->contains(entt); ++pos) {}
+    return pos == N;
+}
+
 template<typename Type, std::size_t N>
 template<typename Type, std::size_t N>
 [[nodiscard]] auto none_of(const std::array<const Type *, N> &filter, const typename Type::entity_type entt) noexcept {
 [[nodiscard]] auto none_of(const std::array<const Type *, N> &filter, const typename Type::entity_type entt) noexcept {
     std::size_t pos{};
     std::size_t pos{};
@@ -53,9 +60,7 @@ class view_iterator final {
     using iterator_type = typename Type::const_iterator;
     using iterator_type = typename Type::const_iterator;
 
 
     [[nodiscard]] bool valid(const typename iterator_type::value_type entt) const noexcept {
     [[nodiscard]] bool valid(const typename iterator_type::value_type entt) const noexcept {
-        return ((Get != 0u) || (entt != tombstone))
-               && std::apply([entt](const auto *...curr) { return (curr->contains(entt) && ...); }, pools)
-               && none_of(filter, entt);
+        return ((Get != 0u) || (entt != tombstone)) && (all_of(pools, entt)) && none_of(filter, entt);
     }
     }
 
 
 public:
 public: