refactor: add compileShaders in Shader constructor

ahmedhus22 · Jun 3, 2024 · f1fca16 · f1fca16
1 parent 2dedc45
commit f1fca16
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 41 deletions.
diff --git a/pyaccell/pyaccell/shader.cpp b/pyaccell/pyaccell/shader.cpp
@@ -35,52 +35,14 @@ pyaccell::Shader::Shader(const char* vertexPath, const char* fragmentPath)
     }
     const char* vShaderCode = vertexCode.c_str();
     const char * fShaderCode = fragmentCode.c_str();
-    // compile shaders
-    unsigned int vertex, fragment;
-
-    vertex = glCreateShader(GL_VERTEX_SHADER);
-    glShaderSource(vertex, 1, &vShaderCode, NULL);
-    glCompileShader(vertex);
-    checkCompileErrors(vertex, "VERTEX");
-
-    fragment = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderSource(fragment, 1, &fShaderCode, NULL);
-    glCompileShader(fragment);
-    checkCompileErrors(fragment, "FRAGMENT");
-
-    ID = glCreateProgram();
-    glAttachShader(ID, vertex);
-    glAttachShader(ID, fragment);
-    glLinkProgram(ID);
-    checkCompileErrors(ID, "PROGRAM");
-    glDeleteShader(vertex);
-    glDeleteShader(fragment);
+    compileShaders(vShaderCode, fShaderCode);
 }
 
 pyaccell::Shader::Shader(const std::string &vs, const std::string &fs)
 {
-    const char* vShaderCode   = vs.c_str();
+    const char* vShaderCode = vs.c_str();
     const char* fShaderCode = fs.c_str();
-    // compile shaders
-    unsigned int vertex, fragment;
-
-    vertex = glCreateShader(GL_VERTEX_SHADER);
-    glShaderSource(vertex, 1, &vShaderCode, NULL);
-    glCompileShader(vertex);
-    checkCompileErrors(vertex, "VERTEX");
-
-    fragment = glCreateShader(GL_FRAGMENT_SHADER);
-    glShaderSource(fragment, 1, &fShaderCode, NULL);
-    glCompileShader(fragment);
-    checkCompileErrors(fragment, "FRAGMENT");
-
-    ID = glCreateProgram();
-    glAttachShader(ID, vertex);
-    glAttachShader(ID, fragment);
-    glLinkProgram(ID);
-    checkCompileErrors(ID, "PROGRAM");
-    glDeleteShader(vertex);
-    glDeleteShader(fragment);
+    compileShaders(vShaderCode, fShaderCode);
 }
 // activate the shader
 void pyaccell::Shader::use() 
@@ -137,6 +99,29 @@ void pyaccell::Shader::setMat4(const std::string &name, const glm::mat4 &mat) co
     glUniformMatrix4fv(glGetUniformLocation(ID, name.c_str()), 1, GL_FALSE, &mat[0][0]);
 }
 
+void pyaccell::Shader::compileShaders(const char *vShaderCode, const char *fShaderCode) 
+{
+    unsigned int vertex, fragment;
+
+    vertex = glCreateShader(GL_VERTEX_SHADER);
+    glShaderSource(vertex, 1, &vShaderCode, NULL);
+    glCompileShader(vertex);
+    checkCompileErrors(vertex, "VERTEX");
+
+    fragment = glCreateShader(GL_FRAGMENT_SHADER);
+    glShaderSource(fragment, 1, &fShaderCode, NULL);
+    glCompileShader(fragment);
+    checkCompileErrors(fragment, "FRAGMENT");
+
+    ID = glCreateProgram();
+    glAttachShader(ID, vertex);
+    glAttachShader(ID, fragment);
+    glLinkProgram(ID);
+    checkCompileErrors(ID, "PROGRAM");
+    glDeleteShader(vertex);
+    glDeleteShader(fragment);
+}
+
 // utility function for checking shader compilation/linking errors.
 void pyaccell::Shader::checkCompileErrors(unsigned int shader, std::string type)
 {

diff --git a/pyaccell/pyaccell/shader.hpp b/pyaccell/pyaccell/shader.hpp
@@ -26,6 +26,7 @@ namespace pyaccell {
             void setMat3(const std::string &name, const glm::mat3 &mat) const;
             void setMat4(const std::string &name, const glm::mat4 &mat) const;
         private:
+            void compileShaders(const char *vShaderCode, const char *fShaderCode);
             void checkCompileErrors(unsigned int shader, std::string type);
     };
 }