shader moved to gaming core

client/rendering/Renderer.h

@@ -1,7 +1,7 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
-#include "client/rendering/wrapper/Shader.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"

client/rendering/Shaders.h

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

client/rendering/wrapper/Shader.cpp

@@ -1,89 +0,0 @@
-#include <fstream>
-#include <iostream>
-
-#include "client/rendering/wrapper/Shader.h"
-#include "gaming-core/wrapper/GL.h"
-
-Shader::Shader(const GLchar* vPath, const GLchar* fPath) : vShader(0), fShader(0), program(0) {
-    if(readFileAndCompile(vPath, vShader, GL_VERTEX_SHADER) || readFileAndCompile(fPath, fShader, GL_FRAGMENT_SHADER)) {
-        return;
-    }
-    program = glCreateProgram();
-    glAttachShader(program, vShader);
-    glAttachShader(program, fShader);
-    glLinkProgram(program);
-    if(GL::checkAndPrintError("shader linking error")) {
-        return;
-    }
-    GLint linked;
-    glGetProgramiv(program, GL_LINK_STATUS, &linked);
-    if(linked == GL_FALSE) {
-        GLchar buffer[512];
-        glGetProgramInfoLog(program, 512, nullptr, buffer);
-        std::cout << "programm linking info log: " << buffer << "\n";
-        return;
-    }
-}
-
-Shader::~Shader() {
-    glDeleteProgram(program);
-    glDeleteShader(vShader);
-    glDeleteShader(fShader);
-}
-
-bool Shader::hasError() const {
-    return vShader == 0 || fShader == 0 || program == 0;
-}
-
-bool Shader::readFileAndCompile(const GLchar* path, GLuint& shader, GLenum shaderType) {
-    GLchar buffer[8192];
-    if(readFile(buffer, 8192, path)) {
-        return true;
-    }
-    return compile(shader, buffer, shaderType);
-}
-
-bool Shader::readFile(GLchar* buffer, size_t bufferSize, const GLchar* path) const {
-    std::ifstream in;
-    in.open(path);
-    if(in.fail()) {
-        std::cout << "cannot read shader file: '" << path << "'\n";
-        return true;
-    }
-    in.get(buffer, bufferSize, EOF);
-    return false;
-}
-
-bool Shader::compile(GLuint& shader, const GLchar* code, GLenum shaderType) {
-    shader = glCreateShader(shaderType);
-    glShaderSource(shader, 1, &code, nullptr);
-    glCompileShader(shader);
-    if(GL::checkAndPrintError("shader error")) {
-        return true;
-    }
-    GLint compiled;
-    glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
-    if(compiled == GL_FALSE) {
-        GLchar buffer[512];
-        glGetShaderInfoLog(shader, 512, nullptr, buffer);
-        std::cout << "shader info log: " << buffer << "\n";
-        return true;
-    }
-    return false;
-}
-
-void Shader::use() const {
-    glUseProgram(program);
-}
-
-void Shader::setMatrix(const GLchar* name, const GLfloat* data) const {
-    glUniformMatrix4fv(glGetUniformLocation(program, name), 1, GL_TRUE, data);
-}
-
-void Shader::setInt(const GLchar* name, GLint data) const {
-    glUniform1i(glGetUniformLocation(program, name), data);
-}
-
-void Shader::setFloat(const GLchar* name, GLfloat data) const {
-    glUniform1f(glGetUniformLocation(program, name), data);
-}

client/rendering/wrapper/Shader.h

@@ -1,31 +0,0 @@
-#ifndef SHADER_H
-#define SHADER_H
-
-#include <GL/glew.h>
-
-class Shader final {
-public:
-    Shader(const GLchar* vPath, const GLchar* fPath);
-    ~Shader();
-    Shader(const Shader& other) = delete;
-    Shader(Shader&& other) = delete;
-    Shader& operator=(const Shader& other) = delete;
-    Shader& operator=(Shader&& other) = delete;
-
-    bool hasError() const;
-    void use() const;
-    void setMatrix(const GLchar* name, const GLfloat* data) const;
-    void setInt(const GLchar* name, GLint data) const;
-    void setFloat(const GLchar* name, GLfloat data) const;
-
-private:
-    bool readFileAndCompile(const GLchar* path, GLuint& shader, GLenum shaderType);
-    bool readFile(GLchar* buffer, size_t bufferSize, const GLchar* path) const;
-    bool compile(GLuint& shader, const GLchar* code, GLenum shaderType);
-
-    GLuint vShader;
-    GLuint fShader;
-    GLuint program;
-};
-
-#endif

gaming-core

@@ -1 +1 @@
-Subproject commit 144ae380f04a521d93dc63a58d644c84cf944e5b
+Subproject commit 647e4f95de28a6300ed0d50762ff19a22b7be5f5

meson.build

@@ -22,21 +22,23 @@ sourcesClient = ['client/Main.cpp',
     'gaming-core/utils/Size.cpp',
     'gaming-core/math/Frustum.cpp',
     'gaming-core/math/Plane.cpp',
-    'client/rendering/Framebuffers.cpp',
+    'gaming-core/math/Matrix.cpp',
+    'gaming-core/math/Quaternion.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/rendering/FileTexture.cpp',
+    'gaming-core/images/PNGReader.cpp',
+    'client/rendering/Framebuffers.cpp',
     'client/rendering/wrapper/Window.cpp',
     'client/rendering/Engine.cpp',
     'client/input/Keys.cpp',
-    'client/rendering/wrapper/Shader.cpp',
     'client/rendering/Shaders.cpp',
     'client/rendering/Mesh.cpp',
-    'gaming-core/math/Matrix.cpp',
-    'gaming-core/math/Quaternion.cpp',
     'client/Game.cpp',
     'client/input/MouseButtons.cpp',
-    'gaming-core/rendering/FileTexture.cpp',
     'client/rendering/FontRenderer.cpp',
     'client/rendering/wrapper/Framebuffer.cpp',
     'client/rendering/NoiseTexture.cpp',
@@ -44,8 +46,6 @@ sourcesClient = ['client/Main.cpp',
     'client/rendering/RenderSettings.cpp',
     'client/rendering/wrapper/VertexBuffer.cpp',
     'client/rendering/wrapper/StreamBuffer.cpp',
-    'gaming-core/wrapper/Texture.cpp',
-    'gaming-core/images/PNGReader.cpp',
     'client/rendering/Renderer.cpp',
     'client/rendering/renderer/WorldRenderer.cpp',
     'client/rendering/Vertex.cpp',