add shader loader

CMakeLists.txt

@@ -13,6 +13,10 @@ set(SOURCE
     src/main.cpp
 )
 
+set(SHADERS
+    src/shader/main.frag
+)
+
 #########################################################
 # FIND OpenGL
 #########################################################
@@ -48,6 +52,15 @@ if(NOT GLFW_FOUND)
     message(ERROR " GLFW not found!")
 endif(NOT GLFW_FOUND)
 
+########################################################
+# COPY SHADER
+########################################################
+
+foreach(SHADER ${SHADERS})
+    message(STATUS "copy shader " ${SHADER})
+    file(COPY ${SHADER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/shader/)
+endforeach(SHADER)
+
 add_executable(medievalSomething ${SOURCE})
 
 target_link_libraries(medievalSomething ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ${GLFW_LIBRARIES})

src/engine/shader/Shader.h

@@ -1,3 +1,6 @@
+#ifndef SHADER_H
+#define SHADER_H
+
 #include <GL/glew.h>
 
 #include <string>
@@ -24,3 +27,5 @@ namespace Engine {
             GLuint getShaderId() { return this->shaderId; }
     };
 }
+
+#endif

src/engine/shader/ShaderLoader.cpp

@@ -5,7 +5,7 @@
 
 using namespace Engine;
 
-ShaderLoader::ShaderLoader(GLenum shaderType, std::string& path) : shaderType(shaderType) {
+ShaderLoader::ShaderLoader(GLenum shaderType, std::string&& path) : shaderType(shaderType) {
 
     std::ifstream fileStream(path.c_str(), std::ios::in);
 

src/engine/shader/ShaderLoader.h

@@ -1,5 +1,9 @@
+#ifndef SHADERLOADER_H
+#define SHADERLOADER_H
+
 #include <GL/glew.h>
 #include <string>
+#include <memory>
 
 namespace Engine {
 
@@ -9,7 +13,8 @@ namespace Engine {
             const GLenum shaderType;
             std::string source;
 
-            ShaderLoader(GLenum shaderType, std::string& path);
-            ~ShaderLoader();
+            ShaderLoader(GLenum shaderType, std::string&& path);
     };
 }
+
+#endif

src/engine/shader/ShaderProgram.h

@@ -10,9 +10,10 @@ namespace Engine {
     class ShaderProgram {
         private:
             GLuint programId = 0;
-
-            std::vector<std::shared_ptr<Shader>> shaders;
+
         public:
+            std::vector<std::shared_ptr<Shader>> shaders;
+
             ShaderProgram();
             virtual ~ShaderProgram();
 

src/main.cpp

@@ -3,21 +3,30 @@
 
 #include "engine/Window.h"
 #include "engine/Object.h"
+#include "engine/shader/ShaderProgram.h"
+#include "engine/shader/ShaderLoader.h"
 
-void render() {
-    static const GLfloat color[] = {.0f, .0f, .5f, 1.0f};
-    glClearBufferfv(GL_COLOR, 0, color);
-}
+using namespace Engine;
 
 int main(int argc, char** argv) {
 
-    Engine::Window* win = new Engine::Window();
+    Window* win = new Window();
 
     win->create();
+
+    ShaderProgram p1;
+    ShaderLoader sl(GL_FRAGMENT_SHADER, "shader/main.frag");
+    Shader s(sl);
+    p1.shaders.push_back(std::make_shared<Shader>(s));
+    p1.link();
 
-    Engine::Object* o = new Engine::Object();
-
-    while(win->loop());
+    while (win->loop()) {
+        glClear(GL_COLOR_BUFFER_BIT || GL_DEPTH_BUFFER_BIT);
+
+        p1.use();
+
+        p1.end();
+    }
     win->close();
 
     return 0;

src/shader/main.frag

@@ -0,0 +1,4 @@
+#version 450
+
+void main {
+}