From 830c5fddf4c340ec588af60726e8b5184430f4c1 Mon Sep 17 00:00:00 2001
From: Antoine Pilote <antoinepilote1@hotmail.com>
Date: Mon, 17 Jul 2023 02:46:19 -0400
Subject: [PATCH] Can now add rigidbodies at runtime

---
 Nuake/src/Scene/Components/RigidbodyComponent.cpp |  6 +++---
 Nuake/src/Scene/Components/RigidbodyComponent.h   |  2 +-
 Nuake/src/Scene/Systems/PhysicsSystem.cpp         | 10 ++++++++++
 Nuake/src/Scene/Systems/PhysicsSystem.h           |  1 -
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Nuake/src/Scene/Components/RigidbodyComponent.cpp b/Nuake/src/Scene/Components/RigidbodyComponent.cpp
index 4dd4c3e7..39862b53 100644
--- a/Nuake/src/Scene/Components/RigidbodyComponent.cpp
+++ b/Nuake/src/Scene/Components/RigidbodyComponent.cpp
@@ -13,18 +13,18 @@ namespace Nuake {
 
 	Ref<Physics::RigidBody> RigidBodyComponent::GetRigidBody() const
 	{
-		return m_Rigidbody;
+		return Rigidbody;
 	}
 
 	void RigidBodyComponent::SyncTransformComponent(TransformComponent* tc)
 	{
-		if (!m_Rigidbody)
+		if (!GetRigidBody())
 			return;
 	}
 
 	void RigidBodyComponent::SyncWithTransform(TransformComponent* tc)
 	{
-		if (!m_Rigidbody)
+		if (!GetRigidBody())
 			return;
 	}
 
diff --git a/Nuake/src/Scene/Components/RigidbodyComponent.h b/Nuake/src/Scene/Components/RigidbodyComponent.h
index 7fae80fb..85a54a89 100644
--- a/Nuake/src/Scene/Components/RigidbodyComponent.h
+++ b/Nuake/src/Scene/Components/RigidbodyComponent.h
@@ -13,7 +13,7 @@ namespace Nuake {
 	{
 	public:
 		float Mass;
-		Ref<Physics::RigidBody> m_Rigidbody;
+		Ref<Physics::RigidBody> Rigidbody;
 
 		RigidBodyComponent();
 		Ref<Physics::RigidBody> GetRigidBody() const;
diff --git a/Nuake/src/Scene/Systems/PhysicsSystem.cpp b/Nuake/src/Scene/Systems/PhysicsSystem.cpp
index 2f5e0ff7..6a5839bc 100644
--- a/Nuake/src/Scene/Systems/PhysicsSystem.cpp
+++ b/Nuake/src/Scene/Systems/PhysicsSystem.cpp
@@ -120,6 +120,8 @@ namespace Nuake
 		if (!Engine::IsPlayMode())
 			return;
 
+		InitializeRigidbodies();
+
 		PhysicsManager::Get().Step(ts);
 	}
 
@@ -227,6 +229,11 @@ namespace Nuake
 			Entity ent = Entity({ e, m_Scene });
 			Ref<Physics::RigidBody> rigidBody;
 
+			if (rigidBodyComponent.GetRigidBody())
+			{
+				continue;
+			}
+
 			if (ent.HasComponent<BoxColliderComponent>())
 			{
 				float mass = rigidBodyComponent.Mass;
@@ -276,6 +283,7 @@ namespace Nuake
 				{
 					Logger::Log("Cannot use mesh collider without model component", WARNING);
 				}
+
 				const auto& modelComponent = ent.GetComponent<ModelComponent>();
 				const auto& component = ent.GetComponent<MeshColliderComponent>();
 
@@ -293,6 +301,8 @@ namespace Nuake
 					PhysicsManager::Get().RegisterBody(rigidBody);
 				}
 			}
+
+			rigidBodyComponent.Rigidbody = rigidBody;
 		}
 	}
 
diff --git a/Nuake/src/Scene/Systems/PhysicsSystem.h b/Nuake/src/Scene/Systems/PhysicsSystem.h
index 5c14c303..7b639e65 100644
--- a/Nuake/src/Scene/Systems/PhysicsSystem.h
+++ b/Nuake/src/Scene/Systems/PhysicsSystem.h
@@ -14,7 +14,6 @@ namespace Nuake
 		void Exit() override;
 
 	private:
-
 		void InitializeShapes();
 		void InitializeQuakeMap();
 		void InitializeRigidbodies();