From bfdc713b68dd6f8d61e7b26fc2cff15caf24b44d Mon Sep 17 00:00:00 2001 From: majortom6 Date: Sun, 19 Feb 2017 11:31:57 -0600 Subject: -finished formatting all of the includes, at least for now --- inc/opengl/transform.hpp | 78 ++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'inc/opengl/transform.hpp') diff --git a/inc/opengl/transform.hpp b/inc/opengl/transform.hpp index 9d0988c..c2adb03 100644 --- a/inc/opengl/transform.hpp +++ b/inc/opengl/transform.hpp @@ -8,45 +8,45 @@ struct Transform { -public: - Transform(const glm::vec3& pos = glm::vec3(), const glm::vec3& rot = glm::vec3(), const glm::vec3& scale = glm::vec3(1.0f, 1.0f, 1.0f)) - { - this->pos = pos; - this->rot = rot; - this->scale = scale; - } - - inline glm::mat4 GetModel() const - { - glm::mat4 posMat = glm::translate(pos); - glm::mat4 scaleMat = glm::scale(scale); - glm::mat4 rotX = glm::rotate(rot.x, glm::vec3(1.0, 0.0, 0.0)); - glm::mat4 rotY = glm::rotate(rot.y, glm::vec3(0.0, 1.0, 0.0)); - glm::mat4 rotZ = glm::rotate(rot.z, glm::vec3(0.0, 0.0, 1.0)); - glm::mat4 rotMat = rotX * rotY * rotZ; - - return posMat * rotMat * scaleMat; - } - - inline glm::mat4 GetMVP(const Camera& camera) const - { - glm::mat4 VP = camera.GetViewProjection(); - glm::mat4 M = GetModel(); - - return VP * M; - } - - inline glm::vec3* GetPos() { return &pos; } - inline glm::vec3* GetRot() { return &rot; } - inline glm::vec3* GetScale() { return &scale; } - - inline void SetPos(glm::vec3& pos) { this->pos = pos; } - inline void SetRot(glm::vec3& rot) { this->rot = rot; } - inline void SetScale(glm::vec3& scale) { this->scale = scale; } -private: - glm::vec3 pos; - glm::vec3 rot; - glm::vec3 scale; + public: + Transform(const glm::vec3& pos = glm::vec3(), const glm::vec3& rot = glm::vec3(), const glm::vec3& scale = glm::vec3(1.0f, 1.0f, 1.0f)) + { + this->pos = pos; + this->rot = rot; + this->scale = scale; + } + + inline glm::mat4 GetModel() const { + glm::mat4 posMat = glm::translate(pos); + glm::mat4 scaleMat = glm::scale(scale); + glm::mat4 rotX = glm::rotate(rot.x, glm::vec3(1.0, 0.0, 0.0)); + glm::mat4 rotY = glm::rotate(rot.y, glm::vec3(0.0, 1.0, 0.0)); + glm::mat4 rotZ = glm::rotate(rot.z, glm::vec3(0.0, 0.0, 1.0)); + glm::mat4 rotMat = rotX * rotY * rotZ; + + return posMat * rotMat * scaleMat; + } + + inline glm::mat4 GetMVP(const Camera& camera) const + { + glm::mat4 VP = camera.GetViewProjection(); + glm::mat4 M = GetModel(); + + return VP * M; + } + + inline glm::vec3* GetPos() { return &pos; } + inline glm::vec3* GetRot() { return &rot; } + inline glm::vec3* GetScale() { return &scale; } + + inline void SetPos(glm::vec3& pos) { this->pos = pos; } + inline void SetRot(glm::vec3& rot) { this->rot = rot; } + inline void SetScale(glm::vec3& scale) { this->scale = scale; } + + private: + glm::vec3 pos; + glm::vec3 rot; + glm::vec3 scale; }; #endif -- cgit v1.2.3