Sdk/PhysicsComponent2D: Fix copy

2019-10-15 09:33:35 +02:00
parent f6bbe396fa
commit 8004c84663
4 changed files with 79 additions and 3 deletions
--- a/SDK/src/NDK/Components/PhysicsComponent2D.cpp
+++ b/SDK/src/NDK/Components/PhysicsComponent2D.cpp
@@ -53,6 +53,9 @@ namespace Ndk
 		m_object->SetPositionOffset(positionOffset);
 		m_object->SetPosition(Nz::Vector2f(matrix.GetTranslation()));
 		m_object->SetUserdata(reinterpret_cast<void*>(static_cast<std::ptrdiff_t>(m_entity->GetId())));
+
+		if (m_pendingStates.valid)
+			ApplyPhysicsState(*m_object);
 	}

 	/*!
@@ -95,7 +98,11 @@ namespace Ndk

 	void PhysicsComponent2D::OnDetached()
 	{
-		m_object.reset();
+		if (m_object)
+		{
+			CopyPhysicsState(*m_object);
+			m_object.reset();
+		}
 	}

 	void PhysicsComponent2D::OnEntityDestruction()