diff options
author | rtk0c <[email protected]> | 2022-05-07 15:36:35 -0700 |
---|---|---|
committer | rtk0c <[email protected]> | 2022-05-07 15:36:35 -0700 |
commit | 7129d65df7b02d7412ee5d56debd5a9c094db5ad (patch) | |
tree | 55b551554d6aba9de7fb004c0c250800dfb87611 /source/GameObject.hpp | |
parent | cde94efdd44553f3f6575ce84b44c6799e1a1425 (diff) |
Changeset: 23 Fix camera view matrix, [WIP] guizmo
Diffstat (limited to 'source/GameObject.hpp')
-rw-r--r-- | source/GameObject.hpp | 16 |
1 files changed, 10 insertions, 6 deletions
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; |