Merge pull request #62

fix uniform buffer data not apply issue

Author: Dragonfly911117

include/Core/UniformBuffer.hpp

@@ -30,6 +30,7 @@ class UniformBuffer {
     void SetData(int offset, const T &data);
 
 private:
+    GLuint m_Binding;
     GLuint m_BufferId;
 };
 } // namespace Core

include/Core/UniformBuffer.inl

@@ -3,7 +3,8 @@
 namespace Core {
 template <typename T>
 UniformBuffer<T>::UniformBuffer(const Program &program, const std::string &name,
-                                int binding) {
+                                int binding)
+    : m_Binding(binding) {
     GLint uniformBlockIndex =
         glGetUniformBlockIndex(program.GetId(), name.c_str());
     glUniformBlockBinding(program.GetId(), uniformBlockIndex, binding);
@@ -12,9 +13,9 @@ UniformBuffer<T>::UniformBuffer(const Program &program, const std::string &name,
     glBindBuffer(GL_UNIFORM_BUFFER, m_BufferId);
     glBufferData(GL_UNIFORM_BUFFER, static_cast<GLsizeiptr>(sizeof(T)), nullptr,
                  GL_DYNAMIC_DRAW);
+    glBindBufferBase(GL_UNIFORM_BUFFER, m_Binding, m_BufferId);
 
     glBindBuffer(GL_UNIFORM_BUFFER, 0);
-    glBindBufferBase(GL_UNIFORM_BUFFER, binding, m_BufferId);
 }
 
 template <typename T>
@@ -41,5 +42,6 @@ void UniformBuffer<T>::SetData(int offset, const T &data) {
     glBindBuffer(GL_UNIFORM_BUFFER, m_BufferId);
     glBufferSubData(GL_UNIFORM_BUFFER, offset,
                     static_cast<GLsizeiptr>(sizeof(T)), &data);
+    glBindBufferBase(GL_UNIFORM_BUFFER, m_Binding, m_BufferId);
 }
 } // namespace Core

include/Util/TransformUtils.hpp

@@ -1,13 +1,18 @@
 #ifndef UTIL_TRANSFORM_UTILS_HPP
 #define UTIL_TRANSFORM_UTILS_HPP
 
+#include "Core/Drawable.hpp"
+
 #include "Util/Transform.hpp"
 #include "pch.hpp"
 
 namespace Util {
 
-glm::mat4 TransformToMat4(const Transform &transform, const float zIndex);
+glm::mat4 TransformToMat4(const Transform &transform, float zIndex);
+
+Core::Matrices ConvertToUniformBufferData(const Util::Transform &transform,
+                                          float zIndex);
 
-}
+} // namespace Util
 
 #endif // UTIL_TRANSFORM_UTILS_HPP

src/Util/Image.cpp

@@ -32,8 +32,8 @@ Image::Image(const std::string &filepath) {
 }
 
 void Image::Draw(const Util::Transform &transform, const float zIndex) {
-    // FIXME: temporary fix
-    InitUniformBuffer(transform, zIndex);
+    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
+    s_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);
     s_Program->Bind();
@@ -97,21 +97,7 @@ void Image::InitUniformBuffer(const Util::Transform &transform,
     s_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
         *s_Program, "Matrices", 0);
 
-    constexpr glm::mat4 eye(1.F);
-
-    constexpr float nearClip = -100;
-    constexpr float farClip = 100;
-
-    auto projection =
-        glm::ortho<float>(0.0F, 1.0F, 0.0F, 1.0F, nearClip, farClip);
-    auto view = glm::scale(eye, {1.F / WINDOW_WIDTH, 1.F / WINDOW_HEIGHT, 1.F}) *
-                glm::translate(eye, {WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2, 0});
-
-    Core::Matrices data = {
-        Util::TransformToMat4(transform, zIndex),
-        projection * view,
-    };
-
+    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
     s_UniformBuffer->SetData(0, data);
 }
 

src/Util/Text.cpp

@@ -43,7 +43,8 @@ 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
-    InitUniformBuffer(transform, zIndex);
+    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
+    s_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);
     s_Program->Bind();
@@ -107,21 +108,7 @@ void Text::InitUniformBuffer(const Util::Transform &transform,
     s_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
         *s_Program, "Matrices", 0);
 
-    constexpr glm::mat4 eye(1.F);
-
-    constexpr float nearClip = -100;
-    constexpr float farClip = 100;
-
-    auto projection =
-        glm::ortho<float>(0.0F, 1.0F, 0.0F, 1.0F, nearClip, farClip);
-    auto view = glm::scale(eye, {1.F / WINDOW_WIDTH, 1.F / WINDOW_HEIGHT, 1.F}) *
-        glm::translate(eye, {WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2, 0});
-
-    Core::Matrices data = {
-        Util::TransformToMat4(transform, zIndex),
-        projection * view,
-    };
-
+    auto data = Util::ConvertToUniformBufferData(transform, zIndex);
     s_UniformBuffer->SetData(0, data);
 }
 

src/Util/TransformUtils.cpp

@@ -1,5 +1,7 @@
 #include "Util/TransformUtils.hpp"
 
+#include "config.hpp"
+
 namespace Util {
 
 glm::mat4 TransformToMat4(const Transform &transform, const float zIndex) {
@@ -11,4 +13,25 @@ glm::mat4 TransformToMat4(const Transform &transform, const float zIndex) {
            glm::scale(eye, {transform.scale, 1});
 }
 
+Core::Matrices ConvertToUniformBufferData(const Util::Transform &transform,
+                                          const float zIndex) {
+    constexpr glm::mat4 eye(1.F);
+
+    constexpr float nearClip = -100;
+    constexpr float farClip = 100;
+
+    auto projection =
+        glm::ortho<float>(0.0F, 1.0F, 0.0F, 1.0F, nearClip, farClip);
+    auto view =
+        glm::scale(eye, {1.F / WINDOW_WIDTH, 1.F / WINDOW_HEIGHT, 1.F}) *
+        glm::translate(eye, {WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2, 0});
+
+    Core::Matrices data = {
+        Util::TransformToMat4(transform, zIndex),
+        projection * view,
+    };
+
+    return data;
+}
+
 } // namespace Util