Revert "add different implemenataion"

This reverts commit 9e113c0.

Author: NOOBDY

include/Util/Image.hpp

@@ -67,16 +67,7 @@ class Image : public Core::Drawable {
 
     static std::unique_ptr<Core::Program> s_Program;
     static std::unique_ptr<Core::VertexArray> s_VertexArray;
-
-    // See
-    // https://github.com/ntut-open-source-club/practical-tools-for-simple-design/pull/162
-    // Some OpenGL implementations may result in drastically different
-    // performances
-#ifndef __APPLE__
-    static std::unique_ptr<Core::UniformBuffer<Core::Matrices>> m_UniformBuffer;
-#else
     std::unique_ptr<Core::UniformBuffer<Core::Matrices>> m_UniformBuffer;
-#endif
 
     static Util::AssetStore<std::shared_ptr<SDL_Surface>> s_Store;
 

include/Util/Text.hpp

@@ -72,16 +72,7 @@ class Text : public Core::Drawable {
 
     static std::unique_ptr<Core::Program> s_Program;
     static std::unique_ptr<Core::VertexArray> s_VertexArray;
-
-    // See
-    // https://github.com/ntut-open-source-club/practical-tools-for-simple-design/pull/162
-    // Some OpenGL implementations may result in drastically different
-    // performances
-#ifndef __APPLE__
-    static std::unique_ptr<Core::UniformBuffer<Core::Matrices>> m_UniformBuffer;
-#else
     std::unique_ptr<Core::UniformBuffer<Core::Matrices>> m_UniformBuffer;
-#endif
 
     // loads resources using `TTF_OpenFontRW`
     static Util::AssetStore<std::shared_ptr<SDL_RWops>> s_Store;

src/Util/Image.cpp

@@ -32,14 +32,9 @@ Image::Image(const std::string &filepath)
     if (s_VertexArray == nullptr) {
         InitVertexArray();
     }
-#ifndef __APPLE__
-    if (m_UniformBuffer == nullptr) {
-        InitUniformBuffer();
-    }
-#else
+
     m_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
         *s_Program, "Matrices", 0);
-#endif
 
     auto surface = s_Store.Get(filepath);
 
@@ -115,20 +110,8 @@ void Image::InitVertexArray() {
     // NOLINTEND
 }
 
-#ifndef __APPLE__
-void Image::InitUniformBuffer() {
-    m_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
-        *s_Program, "Matrices", 0);
-}
-#endif
-
 std::unique_ptr<Core::Program> Image::s_Program = nullptr;
 std::unique_ptr<Core::VertexArray> Image::s_VertexArray = nullptr;
 
-#ifndef __APPLE__
-std::unique_ptr<Core::UniformBuffer<Core::Matrices>> Image::m_UniformBuffer =
-    nullptr;
-#endif
-
 Util::AssetStore<std::shared_ptr<SDL_Surface>> Image::s_Store(LoadSurface);
 } // namespace Util

src/Util/Text.cpp

@@ -33,14 +33,8 @@ Text::Text(const std::string &font, int fontSize, const std::string &text,
         InitVertexArray();
     }
 
-#ifndef __APPLE__
-    if (m_UniformBuffer == nullptr) {
-        InitUniformBuffer();
-    }
-#else
     m_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
         *s_Program, "Matrices", 0);
-#endif
 
     m_Font = {TTF_OpenFontRW(s_Store.Get(font).get(), 0, fontSize),
               TTF_CloseFont};
@@ -138,20 +132,8 @@ void Text::ApplyTexture() {
     m_Size = {surface->pitch / surface->format->BytesPerPixel, surface->h};
 }
 
-#ifndef __APPLE__
-void Text::InitUniformBuffer() {
-    m_UniformBuffer = std::make_unique<Core::UniformBuffer<Core::Matrices>>(
-        *s_Program, "Matrices", 0);
-}
-#endif
-
 std::unique_ptr<Core::Program> Text::s_Program = nullptr;
 std::unique_ptr<Core::VertexArray> Text::s_VertexArray = nullptr;
 
-#ifndef __APPLE__
-std::unique_ptr<Core::UniformBuffer<Core::Matrices>> Text::m_UniformBuffer =
-    nullptr;
-#endif
-
 Util::AssetStore<std::shared_ptr<SDL_RWops>> Text::s_Store(LoadFontFile);
 } // namespace Util