Merge pull request #1 from NOOBDY/size

calculate size in Text::Draw and Image::Draw

Author: nonorze-VOXX

include/Util/Image.hpp

@@ -18,13 +18,13 @@ class Image : public Core::Drawable {
     Image(const std::string &filepath);
 
     glm::vec2 GetSize() override;
+
     void Draw(const Util::Transform &transform, const float zIndex) override;
 
 private:
     void InitProgram();
     void InitVertexArray();
-    void InitUniformBuffer(const Util::Transform &transform = Util::Transform(),
-                           const float zIndex = -1);
+    void InitUniformBuffer();
 
     static constexpr int UNIFORM_SURFACE_LOCATION = 0;
 

include/Util/Text.hpp

@@ -16,14 +16,14 @@ class Text : public Core::Drawable {
 public:
     Text(const std::string &font, int size, const std::string &text);
 
-    void Draw(const Transform &transform, const float zIndex) override;
     glm::vec2 GetSize() override { return m_Size; };
 
+    void Draw(const Transform &transform, const float zIndex) override;
+
 private:
     void InitProgram();
     void InitVertexArray();
-    void InitUniformBuffer(const Util::Transform &transform = Util::Transform(),
-                           const float zIndex = -1);
+    void InitUniformBuffer();
 
     static constexpr int UNIFORM_SURFACE_LOCATION = 0;
 

include/Util/TransformUtils.hpp

@@ -7,12 +7,8 @@
 #include "pch.hpp"
 
 namespace Util {
-
-glm::mat4 TransformToMat4(const Transform &transform, float zIndex);
-
 Core::Matrices ConvertToUniformBufferData(const Util::Transform &transform,
-                                          float zIndex);
-
+                                          const glm::vec2 &size, float zIndex);
 } // namespace Util
 
 #endif // UTIL_TRANSFORM_UTILS_HPP

src/Util/Image.cpp

@@ -33,7 +33,7 @@ Image::Image(const std::string &filepath) {
 }
 
 void Image::Draw(const Util::Transform &transform, const float zIndex) {
-    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
+    auto data = Util::ConvertToUniformBufferData(transform, m_Size, zIndex);
     s_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);
@@ -57,20 +57,17 @@ void Image::InitProgram() {
 void Image::InitVertexArray() {
     s_VertexArray = std::make_unique<Core::VertexArray>();
 
-    // hard coded value
-    constexpr float scale = 100.0F;
-
     // NOLINTBEGIN
     // These are vertex data for the rectangle but clang-tidy has magic
     // number warnings
 
     // Vertex
     s_VertexArray->AddVertexBuffer(std::make_unique<Core::VertexBuffer>(
         std::vector<float>{
-            -1.0F * scale, 1.0F * scale,  //
-            -1.0F * scale, -1.0F * scale, //
-            1.0F * scale, -1.0F * scale,  //
-            1.0F * scale, 1.0F * scale,   //
+            -0.5F, 0.5F,  //
+            -0.5F, -0.5F, //
+            0.5F, -0.5F,  //
+            0.5F, 0.5F,   //
         },
         2));
 
@@ -93,14 +90,11 @@ void Image::InitVertexArray() {
     // NOLINTEND
 }
 
-void Image::InitUniformBuffer(const Util::Transform &transform,
-                              const float zIndex) { // YESLINT
+void Image::InitUniformBuffer() {
     s_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
         *s_Program, "Matrices", 0);
-
-    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
-    s_UniformBuffer->SetData(0, data);
 }
+
 glm::vec2 Image::GetSize() {
     return m_Size;
 }

src/Util/Text.cpp

@@ -44,8 +44,7 @@ Text::Text(const std::string &font, int size, const std::string &text) {
 }
 
 void Text::Draw(const Util::Transform &transform, const float zIndex) {
-    // FIXME: temporary fix
-    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
+    auto data = Util::ConvertToUniformBufferData(transform, m_Size, zIndex);
     s_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);
@@ -69,20 +68,17 @@ void Text::InitProgram() {
 void Text::InitVertexArray() {
     s_VertexArray = std::make_unique<Core::VertexArray>();
 
-    // hard coded value
-    constexpr float scale = 100.0F;
-
     // NOLINTBEGIN
     // These are vertex data for the rectangle but clang-tidy has magic
     // number warnings
 
     // Vertex
     s_VertexArray->AddVertexBuffer(std::make_unique<Core::VertexBuffer>(
         std::vector<float>{
-            -1.0F * scale, 1.0F * scale,  //
-            -1.0F * scale, -1.0F * scale, //
-            1.0F * scale, -1.0F * scale,  //
-            1.0F * scale, 1.0F * scale,   //
+            -0.5F, 0.5F,  //
+            -0.5F, -0.5F, //
+            0.5F, -0.5F,  //
+            0.5F, 0.5F,   //
         },
         2));
 
@@ -105,13 +101,9 @@ void Text::InitVertexArray() {
     // NOLINTEND
 }
 
-void Text::InitUniformBuffer(const Util::Transform &transform,
-                             const float zIndex) {
+void Text::InitUniformBuffer() {
     s_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
         *s_Program, "Matrices", 0);
-
-    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
-    s_UniformBuffer->SetData(0, data);
 }
 
 std::unique_ptr<Core::Program> Text::s_Program = nullptr;

src/Util/TransformUtils.cpp

@@ -3,17 +3,8 @@
 #include "config.hpp"
 
 namespace Util {
-
-glm::mat4 TransformToMat4(const Transform &transform, const float zIndex) {
-    constexpr glm::mat4 eye(1.F);
-
-    // TODO: TRS comment
-    return glm::translate(eye, {transform.translation, zIndex}) *
-           glm::rotate(eye, transform.rotation, glm::vec3(0, 0, 1)) *
-           glm::scale(eye, {transform.scale, 1});
-}
-
 Core::Matrices ConvertToUniformBufferData(const Util::Transform &transform,
+                                          const glm::vec2 &size,
                                           const float zIndex) {
     constexpr glm::mat4 eye(1.F);
 
@@ -26,8 +17,13 @@ Core::Matrices ConvertToUniformBufferData(const Util::Transform &transform,
         glm::scale(eye, {1.F / WINDOW_WIDTH, 1.F / WINDOW_HEIGHT, 1.F}) *
         glm::translate(eye, {WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2, 0});
 
+    // TODO: TRS comment
+    auto model = glm::translate(eye, {transform.translation, zIndex}) *
+                 glm::rotate(eye, transform.rotation, glm::vec3(0, 0, 1)) *
+                 glm::scale(eye, {transform.scale * size, 1});
+
     Core::Matrices data = {
-        Util::TransformToMat4(transform, zIndex),
+        model,
         projection * view,
     };