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/include/NDK/Systems/PhysicsSystem3D.hpp
+++ b/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;

--- a/SDK/include/NDK/Systems/PhysicsSystem3D.inl
+++ b/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;
 	}
 }