From 7129d65df7b02d7412ee5d56debd5a9c094db5ad Mon Sep 17 00:00:00 2001
From: rtk0c <mail.tianyig@gmail.com>
Date: Sat, 7 May 2022 15:36:35 -0700
Subject: Changeset: 23 Fix camera view matrix, [WIP] guizmo

---
 source/GameObject.hpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'source/GameObject.hpp')

diff --git a/source/GameObject.hpp b/source/GameObject.hpp
index c30b91b..8961d2a 100644
--- a/source/GameObject.hpp
+++ b/source/GameObject.hpp
@@ -24,12 +24,13 @@ public:
 	};
 
 private:
-	std::unique_ptr<EditorAttachment> mEditorAttachment = nullptr;
-	GameWorld* mWorld = nullptr;
-	GameObject* mParent = nullptr;
+	std::unique_ptr<EditorAttachment> mEditorAttachment;
+	GameWorld* mWorld;
+	GameObject* mParent;
 	PodVector<GameObject*> mChildren;
-	glm::quat mRot{};
-	glm::vec3 mPos{};
+	glm::quat mRot;
+	glm::vec3 mPos;
+	glm::vec3 mScale;
 	Kind mKind;
 
 protected:
@@ -64,12 +65,15 @@ public:
 	EditorAttachment* GetEditorAttachment() const { return mEditorAttachment.get(); }
 	void SetEditorAttachment(EditorAttachment* attachment) { mEditorAttachment.reset(attachment); }
 
-	const glm::vec3& GetPos();
+	const glm::vec3& GetPos() const;
 	void SetPos(const glm::vec3& pos);
 
 	const glm::quat& GetRotation() const;
 	void SetRotation(const glm::quat& rotation);
 
+	const glm::vec3& GetScale() const;
+	void SetScale(const glm::vec3& scale);
+
 	// Visuals
 	virtual std::span<const RenderObject> GetRenderObjects() const;
 
-- 
cgit v1.2.3-70-g09d2