Merge pull request #162 from NOOBDY/macos-lag-fix

macOS lag fix

Author: NOOBDY

include/Util/Image.hpp

@@ -70,7 +70,7 @@ class Image : public Core::Drawable {
 
     static std::unique_ptr<Core::Program> s_Program;
     static std::unique_ptr<Core::VertexArray> s_VertexArray;
-    static std::unique_ptr<Core::UniformBuffer<Core::Matrices>> s_UniformBuffer;
+    std::unique_ptr<Core::UniformBuffer<Core::Matrices>> m_UniformBuffer;
 
     static Util::AssetStore<std::shared_ptr<SDL_Surface>> s_Store;
 

include/Util/Text.hpp

@@ -74,7 +74,7 @@ class Text : public Core::Drawable {
 
     static std::unique_ptr<Core::Program> s_Program;
     static std::unique_ptr<Core::VertexArray> s_VertexArray;
-    static std::unique_ptr<Core::UniformBuffer<Core::Matrices>> s_UniformBuffer;
+    std::unique_ptr<Core::UniformBuffer<Core::Matrices>> m_UniformBuffer;
 
 private:
     std::unique_ptr<Core::Texture> m_Texture = nullptr;

src/Util/Image.cpp

@@ -34,9 +34,9 @@ Image::Image(const std::string &filepath)
     if (s_VertexArray == nullptr) {
         InitVertexArray();
     }
-    if (s_UniformBuffer == nullptr) {
-        InitUniformBuffer();
-    }
+
+    m_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
+        *s_Program, "Matrices", 0);
 
     auto surface = s_Store.Get(filepath);
 
@@ -55,7 +55,7 @@ void Image::SetImage(const std::string &filepath) {
 }
 
 void Image::Draw(const Core::Matrices &data) {
-    s_UniformBuffer->SetData(0, data);
+    m_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);
     s_Program->Bind();
@@ -111,15 +111,8 @@ void Image::InitVertexArray() {
     // NOLINTEND
 }
 
-void Image::InitUniformBuffer() {
-    s_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
-        *s_Program, "Matrices", 0);
-}
-
 std::unique_ptr<Core::Program> Image::s_Program = nullptr;
 std::unique_ptr<Core::VertexArray> Image::s_VertexArray = nullptr;
-std::unique_ptr<Core::UniformBuffer<Core::Matrices>> Image::s_UniformBuffer =
-    nullptr;
 
 Util::AssetStore<std::shared_ptr<SDL_Surface>> Image::s_Store(LoadSurface);
 } // namespace Util

src/Util/Text.cpp

@@ -20,9 +20,9 @@ Text::Text(const std::string &font, int fontSize, const std::string &text,
     if (s_VertexArray == nullptr) {
         InitVertexArray();
     }
-    if (s_UniformBuffer == nullptr) {
-        InitUniformBuffer();
-    }
+
+    m_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
+        *s_Program, "Matrices", 0);
 
     m_Font = {TTF_OpenFont(font.c_str(), fontSize), TTF_CloseFont};
 
@@ -45,7 +45,7 @@ Text::Text(const std::string &font, int fontSize, const std::string &text,
 }
 
 void Text::Draw(const Core::Matrices &data) {
-    s_UniformBuffer->SetData(0, data);
+    m_UniformBuffer->SetData(0, data);
 
     m_Texture->Bind(UNIFORM_SURFACE_LOCATION);
     s_Program->Bind();
@@ -101,11 +101,6 @@ void Text::InitVertexArray() {
     // NOLINTEND
 }
 
-void Text::InitUniformBuffer() {
-    s_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
-        *s_Program, "Matrices", 0);
-}
-
 void Text::ApplyTexture() {
     auto surface =
         std::unique_ptr<SDL_Surface, std::function<void(SDL_Surface *)>>{
@@ -125,7 +120,5 @@ void Text::ApplyTexture() {
 
 std::unique_ptr<Core::Program> Text::s_Program = nullptr;
 std::unique_ptr<Core::VertexArray> Text::s_VertexArray = nullptr;
-std::unique_ptr<Core::UniformBuffer<Core::Matrices>> Text::s_UniformBuffer =
-    nullptr;
 
 } // namespace Util