core update

client/Main.cpp

@@ -5,12 +5,12 @@
 #include "client/rendering/Framebuffers.h"
 #include "client/rendering/RenderSettings.h"
 #include "client/rendering/Shaders.h"
+#include "gaming-core/rendering/Window.h"
+#include "gaming-core/rendering/WindowOptions.h"
 #include "gaming-core/utils/Clock.h"
 #include "gaming-core/wrapper/GL.h"
 #include "gaming-core/wrapper/GLEW.h"
 #include "gaming-core/wrapper/GLFW.h"
-#include "gaming-core/wrapper/Window.h"
-#include "gaming-core/wrapper/WindowOptions.h"
 
 #include <memory>
 #include <vector>

client/rendering/FontRenderer.cpp

@@ -1,6 +1,6 @@
 #include "client/rendering/FontRenderer.h"
+#include "gaming-core/rendering/Attributes.h"
 #include "gaming-core/utils/Buffer.h"
-#include "gaming-core/wrapper/Attributes.h"
 
 FontRenderer::FontRenderer() : tex("resources/font8x8.png") {
     vertexBuffer.setAttributes(

client/rendering/FontRenderer.h

@@ -1,13 +1,13 @@
 #ifndef FONTRENDERER_H
 #define FONTRENDERER_H
 
-#include "gaming-core/wrapper/VertexBuffer.h"
 #include "gaming-core/rendering/FileTexture.h"
+#include "gaming-core/rendering/VertexBuffer.h"
 #include "gaming-core/utils/Color.h"
 
 class FontRenderer final {
     static constexpr int MAX_CHARS = 256;
-    static constexpr int VERTEX_SIZE = 4 * sizeof (float) + sizeof (Color4);
+    static constexpr int VERTEX_SIZE = 4 * sizeof(float) + sizeof(Color4);
 
     VertexBuffer vertexBuffer;
     FileTexture tex;

client/rendering/Framebuffers.h

@@ -1,8 +1,8 @@
 #ifndef FRAMEBUFFERS_H
 #define FRAMEBUFFERS_H
 
+#include "gaming-core/rendering/Framebuffer.h"
 #include "gaming-core/utils/Size.h"
-#include "gaming-core/wrapper/Framebuffer.h"
 
 struct Framebuffers final {
     Framebuffers();

client/rendering/Mesh.cpp

@@ -1,8 +1,9 @@
 #include "client/rendering/Mesh.h"
-#include "gaming-core/wrapper/Attributes.h"
+#include "gaming-core/rendering/Attributes.h"
 
 Mesh::Mesh() : vertices(0) {
-    vertexBuffer.setAttributes(Attributes().addFloat(3).addFloat(2).addFloat(3));
+    vertexBuffer.setAttributes(
+        Attributes().addFloat(3).addFloat(2).addFloat(3));
 }
 
 void Mesh::build(const TypedBuffer<Triangle>& buffer) {

client/rendering/Mesh.h

@@ -1,9 +1,9 @@
 #ifndef MESH_H
 #define MESH_H
 
-#include "gaming-core/wrapper/VertexBuffer.h"
-#include "gaming-core/utils/TypedBuffer.h"
 #include "client/rendering/Triangle.h"
+#include "gaming-core/rendering/VertexBuffer.h"
+#include "gaming-core/utils/TypedBuffer.h"
 
 class Mesh final {
 public:

client/rendering/NoiseTexture.h

@@ -1,11 +1,11 @@
 #ifndef NOISETEXTURE_H
 #define NOISETEXTURE_H
 
-#include "gaming-core/rendering/FileTexture.h"
+#include "gaming-core/rendering/Texture.h"
 
 class NoiseTexture final {
     Texture texture;
-    
+
 public:
     NoiseTexture();
 

client/rendering/Renderer.h

@@ -1,21 +1,21 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
-#include "gaming-core/wrapper/Shader.h"
 #include "gaming-core/math/MatrixStack.h"
-#include "gaming-core/math/Vector.h"
 #include "gaming-core/math/Quaternion.h"
+#include "gaming-core/math/Vector.h"
+#include "gaming-core/rendering/Shader.h"
 
 class Renderer final {
 public:
     Renderer(Shader& shader, MatrixStack<16>& stack, Matrix& view);
-    
+
     void pop();
     void push();
-    
+
     Renderer& update();
     Renderer& update(const Vector3& pos, const Quaternion& rotation);
-    
+
     Renderer& scale(float sx, float sy, float sz);
     Renderer& scale(float s);
 

client/rendering/Shaders.h

@@ -1,7 +1,7 @@
 #ifndef SHADERS_H
 #define SHADERS_H
 
-#include "gaming-core/wrapper/Shader.h"
+#include "gaming-core/rendering/Shader.h"
 
 struct Shaders final {
     Shaders();

gaming-core

@@ -1 +1 @@
-Subproject commit 6c37eecba810767b8e6ce5644d1bca27c14b8ba7
+Subproject commit 3f19a9343926b7ee3dc8c8fca6c503062adc6a0b

meson.build

@@ -29,17 +29,16 @@ sourcesClient = ['client/Main.cpp',
     'gaming-core/wrapper/GLFW.cpp',
     'gaming-core/wrapper/GL.cpp',
     'gaming-core/wrapper/GLEW.cpp',
-    '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/images/PNGReader.cpp',
+    'gaming-core/rendering/Shader.cpp',
+    'gaming-core/rendering/Texture.cpp',
+    'gaming-core/rendering/TextureFormat.cpp',
+    'gaming-core/rendering/VertexBuffer.cpp',
+    'gaming-core/rendering/Attributes.cpp',
+    'gaming-core/rendering/Window.cpp',
+    'gaming-core/rendering/WindowOptions.cpp',
     'gaming-core/rendering/FileTexture.cpp',
-    'gaming-core/memory/StackAllocator.cpp',
+    'gaming-core/images/PNGReader.cpp',
     'gaming-core/utils/Buffer.cpp',
-    'gaming-core/wrapper/Window.cpp',
-    'gaming-core/wrapper/WindowOptions.cpp',
     'gaming-core/input/Button.cpp',
     'gaming-core/input/Buttons.cpp',
     'client/rendering/Framebuffers.cpp',