Browse Source

file texture is no template any more

Kajetan Johannes Hammerle 3 years ago
parent
commit
6283b4ee0e
3 changed files with 7 additions and 6 deletions
  1. 1 1
      gaming-core
  2. 5 4
      meson.build
  3. 1 1
      rendering/FontRenderer.h

+ 1 - 1
gaming-core

@@ -1 +1 @@
-Subproject commit c6dd6c59b7c6f5b5da78c05b8e7f58c0c256db40
+Subproject commit 1afdb909090ce8398de997bde094f1fcda3a2e4b

+ 5 - 4
meson.build

@@ -8,6 +8,11 @@ sources = [
     'gaming-core/wrapper/Shader.cpp', 
     'gaming-core/wrapper/Texture.cpp',
     'gaming-core/wrapper/TextureFormat.cpp',
+    'gaming-core/wrapper/VertexBuffer.cpp',
+    'gaming-core/wrapper/Attributes.cpp',
+    'gaming-core/wrapper/Window.cpp', 
+    'gaming-core/wrapper/WindowOptions.cpp',
+    'gaming-core/rendering/FileTexture.cpp',
     'gaming-core/math/Matrix.cpp',
     'gaming-core/math/Quaternion.cpp',
     'gaming-core/math/Vector.cpp',
@@ -16,10 +21,6 @@ sources = [
     'gaming-core/utils/Buffer.cpp', 
     'gaming-core/memory/StackAllocator.cpp', 
     'gaming-core/images/PNGReader.cpp',
-    'gaming-core/wrapper/VertexBuffer.cpp',
-    'gaming-core/wrapper/Attributes.cpp',
-    'gaming-core/wrapper/Window.cpp', 
-    'gaming-core/wrapper/WindowOptions.cpp',
     'gaming-core/input/Buttons.cpp',
     'gaming-core/input/Button.cpp',
     'Game.cpp',

+ 1 - 1
rendering/FontRenderer.h

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