Small refactor

RiverHillbug · Mar 2, 2024 · 1b18d0f · 1b18d0f
1 parent 8125b06
commit 1b18d0f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/Minigin/GameObject.cpp b/Minigin/GameObject.cpp
@@ -32,7 +32,7 @@ void GameObject::Update(const float deltaTime)
 	{
 		for (auto& component : components.second)
 		{
-			component.get()->Update(deltaTime);
+			component->Update(deltaTime);
 		}
 	}
 }
@@ -58,7 +58,7 @@ void GameObject::SetWorldPosition(const glm::vec2& position)
 
 	if (m_pParent)
 	{
-		m_LocalTransform.SetPosition(- m_pParent->GetTransform().GetPosition() + m_LocalTransform.GetPosition());
+		m_LocalTransform.Translate(- m_pParent->GetTransform().GetPosition());
 	}
 }
 
@@ -74,7 +74,7 @@ void GameObject::SetLocalPosition(const float x, const float y)
 	//m_LocalPositionIsDirty = true;
 }
 
-void GameObject::SetParent(GameObject* pParent, bool keepWorldPosition)
+void GameObject::SetParent(GameObject* pParent, const bool keepWorldPosition)
 {
 	// Parent should not be one of the children, the GameObject itself, or the current parent
 	if (IsChild(pParent) || (!pParent && pParent == this) || m_pParent == pParent)
@@ -84,14 +84,14 @@ void GameObject::SetParent(GameObject* pParent, bool keepWorldPosition)
 	{
 		if (m_pParent != nullptr)
 		{
-			// Set new localPosition as current worldPosition
-			m_LocalTransform.SetPosition(m_LocalTransform.GetPosition() + m_pParent->GetWorldPosition());
+			// Set old worldPosition as new localPosition
+			m_LocalTransform.Translate(m_pParent->GetWorldPosition());
 		}
 
 		if (pParent != nullptr)
 		{
-			// Set localPosition as (worldPosition - parent.WorldPositon)
-			m_LocalTransform.SetPosition(m_LocalTransform.GetPosition() - pParent->GetWorldPosition());
+			// Remove new parent's position from the localPosition
+			m_LocalTransform.Translate(- pParent->GetWorldPosition());
 
 		}
 	}
@@ -136,6 +136,5 @@ void GameObject::RemoveChild(GameObject* pChild)
 
 bool GameObject::IsChild(const GameObject* pChild)
 {
-	//std::ranges::find does not work here, some issue with move constructor, which weak_ptr doesn't have
-	return std::find(m_Children.begin(), m_Children.end(), pChild) != m_Children.end();
+	return std::ranges::find(m_Children, pChild) != m_Children.end();
 }
diff --git a/Minigin/GameObject.h b/Minigin/GameObject.h
@@ -30,7 +30,7 @@ class GameObject final
 	}
 	void Update(const float deltaTime);
 
-	void SetParent(GameObject* pParent, bool keepWorldPosition);
+	void SetParent(GameObject* pParent, const bool keepWorldPosition);
 
 	inline Transform GetTransform() const { return m_LocalTransform; }
 	glm::vec2 GetWorldPosition() const;
@@ -50,7 +50,7 @@ class GameObject final
 	GameObject& operator=(GameObject&& other) = delete;
 
 private:
-	Transform m_LocalTransform{};	//WorldPosition
+	Transform m_LocalTransform{};
 	//bool m_LocalPositionIsDirty{ false };
 	bool m_IsDestroyed{ false };
 

diff --git a/Minigin/Rotator.cpp b/Minigin/Rotator.cpp
@@ -1,8 +1,6 @@
 #include "Rotator.h"
 #include "GameObject.h"
 
-constexpr float PI{ 3.14159f };
-
 Rotator::Rotator(const std::weak_ptr<GameObject> pOwner, const float angleDegrees, const glm::vec2& center)
 	: Component(pOwner)
 	, m_RotationAngleDegrees{ angleDegrees }
@@ -23,7 +21,7 @@ void Rotator::Update(const float deltaTime)
 {
 	if (auto owner{ GetOwner() })
 	{
-		glm::vec2 position{ GetOwner()->GetTransform().GetPosition() };
+		glm::vec2 position{ owner->GetTransform().GetPosition() };
 
 		const float anglesRad{ m_RotationAngleDegrees * (PI / 180.0f) * deltaTime };
 
@@ -39,6 +37,6 @@ void Rotator::Update(const float deltaTime)
 		x += m_RotationCenter.x;
 		y += m_RotationCenter.y;
 
-		GetOwner()->SetLocalPosition(x, y);
-	}	
+		owner->SetLocalPosition(x, y);
+	}
 }
diff --git a/Minigin/Rotator.h b/Minigin/Rotator.h
@@ -2,6 +2,8 @@
 #include "Component.h"
 #include <glm/glm.hpp>
 
+constexpr float PI{ 3.14159f };
+
 class Rotator final : public Component
 {
 public:

diff --git a/Minigin/Transform.cpp b/Minigin/Transform.cpp
@@ -12,7 +12,18 @@ void Transform::SetPosition(const float x, const float y)
 	m_Position.y = y;
 }
 
-void Transform::SetPosition(const glm::vec2 position)
+void Transform::SetPosition(const glm::vec2& position)
 {
 	m_Position = position;
 }
+
+void Transform::Translate(const glm::vec2& translation)
+{
+	m_Position += translation;
+}
+
+void Transform::Translate(const float x, const float y)
+{
+	m_Position.x += x;
+	m_Position.y += y;
+}
diff --git a/Minigin/Transform.h b/Minigin/Transform.h
@@ -8,7 +8,9 @@ class Transform final
 	Transform(const glm::vec2& position);
 	inline const glm::vec2& GetPosition() const { return m_Position; }
 	void SetPosition(const float x, const float y);
-	void SetPosition(const glm::vec2 position);
+	void SetPosition(const glm::vec2& position);
+	void Translate(const glm::vec2& translation);
+	void Translate(const float x, const float y);
 
 private:
 	glm::vec2 m_Position;