Merge remote-tracking branch 'refs/remotes/origin/master' into physics-refactor

SDK/include/NDK/Systems/PhysicsSystem3D.hpp

@@ -27,6 +27,7 @@ namespace Ndk
 			static SystemIndex systemIndex;
 
 		private:
+			void CreatePhysWorld() const;
 			void OnEntityValidation(Entity* entity, bool justAdded) override;
 			void OnUpdate(float elapsedTime) override;
 

SDK/include/NDK/Systems/PhysicsSystem3D.inl

@@ -11,6 +11,9 @@ namespace Ndk
 
 	inline Nz::PhysWorld3D& PhysicsSystem3D::GetWorld()
 	{
+		if (!m_world)
+			CreatePhysWorld();
+
 		return *m_world;
 	}
 
@@ -21,6 +24,9 @@ namespace Ndk
 
 	inline const Nz::PhysWorld3D& PhysicsSystem3D::GetWorld() const
 	{
+		if (!m_world)
+			CreatePhysWorld();
+
 		return *m_world;
 	}
 }

SDK/src/NDK/Systems/PhysicsSystem3D.cpp

@@ -41,6 +41,13 @@ namespace Ndk
 	{
 	}
 
+	void PhysicsSystem::CreatePhysWorld() const
+	{
+		NazaraAssert(!m_world, "Physics world should not be created twice");
+
+		m_world = std::make_unique<Nz::PhysWorld>();
+	}
+
 	/*!
 	* \brief Operation to perform when entity is validated for the system
 	*
@@ -62,7 +69,7 @@ namespace Ndk
 		entities.Insert(entity);
 
 		if (!m_world)
-			m_world = std::make_unique<Nz::PhysWorld3D>();
+			CreatePhysWorld();
 	}
 
 	/*!