Browse Source

gaming core update

Kajetan Johannes Hammerle 3 years ago
parent
commit
f7400db117
4 changed files with 4 additions and 4 deletions
  1. 1 1
      gaming-core
  2. 1 1
      meson.build
  3. 1 1
      rendering/FontRenderer.cpp
  4. 1 1
      rendering/FontRenderer.h

+ 1 - 1
gaming-core

@@ -1 +1 @@
-Subproject commit b071869bd3f254d2c1d619ff0dc2b47d7bd9899c
+Subproject commit 33d0fc4551fd47d5d1b607df6f2a807b6107c7a1

+ 1 - 1
meson.build

@@ -7,12 +7,12 @@ sources = [
     'gaming-core/wrapper/GLEW.cpp', 
     'gaming-core/wrapper/Shader.cpp', 
     'gaming-core/wrapper/Texture.cpp',
+    'gaming-core/wrapper/TextureFormat.cpp',
     'gaming-core/math/Matrix.cpp',
     'gaming-core/math/Quaternion.cpp',
     'gaming-core/math/Vector.cpp',
     'gaming-core/utils/Size.cpp', 
     'gaming-core/utils/Clock.cpp', 
-    'gaming-core/rendering/FileTexture.cpp',
     'gaming-core/images/PNGReader.cpp',
     'gaming-core/wrapper/VertexBuffer.cpp',
     'gaming-core/wrapper/Attributes.cpp',

+ 1 - 1
rendering/FontRenderer.cpp

@@ -53,7 +53,7 @@ float FontRenderer::drawString(float x, float y, const char* text) {
         index++;
     }
 
-    tex[activeTex].bind();
+    tex[activeTex].bindTo(0);
     vertexBuffer.updateData(0, buffer.getLength(), buffer);
     vertexBuffer.drawStrip(buffer.getLength() / (4 * sizeof(float) + sizeof(Color4)));
     return y + addY;

+ 1 - 1
rendering/FontRenderer.h

@@ -8,7 +8,7 @@
 
 class FontRenderer final {
     VertexBuffer vertexBuffer;
-    List<FileTexture, 3> tex;
+    List<FileTexture<4>, 3> tex;
     int activeTex;
     int scale;