Merge remote-tracking branch 'origin/dev-ndy' into dev

VTX-Molecular-Visualization · Mar 6, 2024 · 4d90f67 · 4d90f67
2 parents 1df2e48 + c5f34ec
commit 4d90f67
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/dev/conanfile.py b/dev/conanfile.py
@@ -24,7 +24,7 @@ def requirements(self):
         self.requires("sdl/2.28.3")
         self.requires("imgui/1.90.1")
         self.requires("stb/cci.20220909")
-        self.requires("entt/3.11.1")
+        self.requires("entt/3.13.0")
         self.requires("pybind11/2.11.1")
         self.requires("qt/6.6.1")
         self.requires("eigen/3.4.0") 

diff --git a/lib/app/conanfile.py b/lib/app/conanfile.py
@@ -19,7 +19,7 @@ def requirements(self):
         self.requires("vtx_renderer/1.0")
         self.requires("vtx_io/1.0")
         self.requires("vtx_core/1.0")
-        self.requires("entt/3.11.1", transitive_headers=True)
+        self.requires("entt/3.13.0", transitive_headers=True)
 
     def config_options(self):
         if self.settings.os == "Windows":

diff --git a/lib/app/include/app/application/ecs/registry_manager.hpp b/lib/app/include/app/application/ecs/registry_manager.hpp
@@ -104,8 +104,7 @@ namespace VTX::App::Application::ECS
 			return _registry.hasComponent<C1>( p_component );
 		}
 
-		bool   isEmpty() const { return _registry.isEmpty(); }
-		size_t size() const { return _registry.size(); }
+		bool isEmpty() const { return _registry.isEmpty(); }
 
 		template<Core::ECS::ECS_Component C>
 		void deleteAll()

diff --git a/lib/app/include/app/core/ecs/registry.hpp b/lib/app/include/app/core/ecs/registry.hpp
@@ -28,7 +28,7 @@ namespace VTX::App::Core::ECS
 		template<ECS_Component C>
 		inline BaseEntity getEntity( const C & p_component ) const
 		{
-			return entt::to_entity( _enttRegistry, p_component );
+			return entt::to_entity( *_enttRegistry.storage<C>(), p_component );
 		}
 
 		bool isValid( const BaseEntity p_entity ) { return p_entity != INVALID_ENTITY; }
@@ -96,8 +96,7 @@ namespace VTX::App::Core::ECS
 			return hasComponent<C1>( entity );
 		}
 
-		bool   isEmpty() const { return _enttRegistry.size() == 0; }
-		size_t size() const { return _enttRegistry.size(); }
+		bool isEmpty() const { return _enttRegistry.storage().begin() == _enttRegistry.storage().end(); }
 
 		// template<ECS_Component C>
 		// entt::observer & getObservers()

diff --git a/lib/app/include/app/core/ecs/view.hpp b/lib/app/include/app/core/ecs/view.hpp
@@ -1,8 +1,11 @@
 #ifndef __VTX_APP_CORE_ECS_VIEW__
 #define __VTX_APP_CORE_ECS_VIEW__
 
+#include "app/core/ecs/base_entity.hpp"
 #include "app/core/ecs/concepts.hpp"
+#include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
+#include <entt/entity/storage.hpp>
 #include <entt/entity/view.hpp>
 #include <limits>
 #include <memory>
@@ -17,11 +20,10 @@ namespace VTX::App::Core::ECS
 	{
 	  private:
 		template<ECS_Component T>
-		using single_storage = const entt::sigh_storage_mixin<
-			entt::basic_storage<T, entt::registry::entity_type, std::allocator<T>, void>>;
+		using single_storage = const entt::basic_sigh_mixin<entt::basic_storage<T>, entt::registry>;
 
 		template<ECS_Component... Types>
-		using internal_view = entt::basic_view<entt::type_list<single_storage<Types>...>, entt::type_list<>, void>;
+		using internal_view = entt::basic_view<entt::get_t<single_storage<Types>...>, entt::exclude_t<>>;
 
 		using view_type = internal_view<Type, Other...>;
 
@@ -33,11 +35,7 @@ namespace VTX::App::Core::ECS
 
 		const view_type & getView() const { return _view; };
 
-		size_t size() const
-		{
-			// Template disambiguator necessary in this case because calling a template function
-			return _view.template storage<0>().size();
-		}
+		size_t size() const { return _view.handle()->size(); }
 		size_t size_hint() const { return _view.size_hint(); }
 
 		template<ECS_Component T>