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

2016-10-13 08:32:36 +02:00
parent be44a89a85 01cd9b220f
commit 1fdda6b07c
3 changed files with 15 additions and 1 deletions
--- a/SDK/src/NDK/Systems/PhysicsSystem3D.cpp
+++ b/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();
 	}

 	/*!