Physics3D: Ensure RigidBody are destroyed on world destruction

2021-11-30 18:17:53 +01:00
parent 2d236afe0f
commit f289d13101
5 changed files with 24 additions and 1 deletions
--- a/src/Nazara/Physics3D/Systems/Physics3DSystem.cpp
+++ b/src/Nazara/Physics3D/Systems/Physics3DSystem.cpp
@@ -8,13 +8,19 @@

 namespace Nz
 {
-	Physics3DSystem::Physics3DSystem(entt::registry& registry)
+	Physics3DSystem::Physics3DSystem(entt::registry& registry) :
+	m_registry(registry)
 	{
 		m_constructConnection = registry.on_construct<RigidBody3DComponent>().connect<OnConstruct>();
 	}

 	Physics3DSystem::~Physics3DSystem()
 	{
+		// Ensure every NewtonBody is destroyed before world is
+		auto rigidBodyView = m_registry.view<RigidBody3DComponent>();
+		for (auto [entity, rigidBodyComponent] : rigidBodyView.each())
+			rigidBodyComponent.Destroy();
+
 		m_constructConnection.release();
 	}