revamped resource system

src/ShaderProgram.cpp

@@ -5,68 +5,8 @@
 #include "ShaderProgram.h"
 
 #include <fstream>
-#include <string>
-#include <sstream>
 
-#include "glad/gl.h"
-#include "spdlog/spdlog.h"
-
-void log_shader_compile_errors(GLuint shader, std::string_view shaderType);
-void log_program_compile_errors(GLuint program);
-
-std::shared_ptr<ShaderProgram> ShaderProgram::load(std::string_view vertexPath, std::string_view fragmentPath)
-{
-    std::string vertexSource;
-    std::string fragmentSource;
-
-    std::ifstream vertexFile {};
-    std::ifstream fragmentFile {};
-
-    try
-    {
-        std::stringstream ss;
-        vertexFile.open(vertexPath.data());
-        fragmentFile.open(fragmentPath.data());
-
-        ss << vertexFile.rdbuf();
-        vertexSource = ss.str();
-        ss.clear();
-        ss << fragmentFile.rdbuf();
-        fragmentSource = ss.str();
-
-        vertexFile.close();
-        fragmentFile.close();
-    } catch (std::ifstream::failure& e) {
-        spdlog::error("Failed to load shader program {}, {}: {}", vertexPath, fragmentPath, std::string(e.what()).c_str());
-        return nullptr;
-    }
-
-    unsigned int vertex;
-    unsigned int fragment;
-
-    vertex = glCreateShader(GL_VERTEX_SHADER);
-    glShaderSource(vertex, 1, reinterpret_cast<const GLchar* const*>(vertexSource.data()), NULL);
-    glCompileShader(vertex);
-    log_shader_compile_errors(vertex, "vertex");
-
-    fragment = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderSource(fragment, 1, reinterpret_cast<const GLchar* const*>(fragmentSource.data()), NULL);
-    glCompileShader(fragment);
-    log_shader_compile_errors(fragment, "fragment");
-
-    ShaderProgram program;
-    program.id = glCreateProgram();
-
-    glAttachShader(program.id, vertex);
-    glAttachShader(program.id, fragment);
-    glLinkProgram(program.id);
-    log_program_compile_errors(program.id);
-
-    glDeleteShader(vertex);
-    glDeleteShader(fragment);
-
-    return std::make_shared<ShaderProgram>(program);
-}
+#include <glad/gl.h>
 
 void ShaderProgram::bind()
 {
@@ -80,49 +20,26 @@ void ShaderProgram::unbind()
 
 void ShaderProgram::setFloat(std::string_view name, float value) const
 {
-
+    glUniform1f(glGetUniformLocation(id, name.data()), value);
 }
 
-void ShaderProgram::setVec2(std::string_view name, const glm::vec2& value) const
+void ShaderProgram::setInt(std::string_view name, int value) const
 {
-
+    glUniform1i(glGetUniformLocation(id, name.data()), value);
 }
 
 void ShaderProgram::setVec3(std::string_view name, const glm::vec3& value) const
 {
-
+    glUniform3fv(glGetUniformLocation(id, name.data()), 1, &value[0]);
 }
 
 void ShaderProgram::setVec4(std::string_view name, const glm::vec4& value) const
 {
-
+    glUniform4fv(glGetUniformLocation(id, name.data()), 1, &value[0]);
 }
 
 void ShaderProgram::setMat4(std::string_view name, const glm::mat4& value) const
 {
-
+    glUniformMatrix4fv(glGetUniformLocation(id, name.data()), 1, GL_FALSE, &value[0][0]);
 }
 
-void log_shader_compile_errors(GLuint shader, std::string_view shaderType)
-{
-    GLint success;
-    GLchar infoLog[1024];
-    glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
-    if (!success)
-    {
-        glGetShaderInfoLog(shader, 1024, NULL, infoLog);
-        spdlog::error("Failed to compile {} shader: {}", shaderType, infoLog);
-    }
-}
-
-void log_program_compile_errors(GLuint program)
-{
-    GLint success;
-    GLchar infoLog[1024];
-    glGetProgramiv(program, GL_COMPILE_STATUS, &success);
-    if (!success)
-    {
-        glGetShaderInfoLog(program, 1024, NULL, infoLog);
-        spdlog::error("Failed to compile program: {}", infoLog);
-    }
-}