Prepared better shaders.

src/Shader.hpp

@@ -21,6 +21,7 @@
 #include <string>
 #include <GL/glew.h>
 #include <GL/gl.h>
+#include <glm/glm.hpp>
 
 class Shader {
 public:
@@ -48,6 +49,18 @@ public:
 		glUniform1f(glGetUniformLocation(id, name.c_str()),
 				value);
 	}
+	inline void setVec3(const std::string &name,
+			const glm::vec3 &v)
+	{
+		glUniform3f(glGetUniformLocation(id, name.c_str()),
+				v.x, v.y, v.z);
+	}
+	inline void setMat4(const std::string &name,
+			const glm::mat4 &m)
+	{
+		glUniformMatrix4fv(glGetUniformLocation(id, name.c_str()),
+				1, GL_FALSE, &m[0][0]);
+	}
 	inline unsigned int getId() const {
 		return id;
 	}

src/System.cpp

@@ -65,15 +65,9 @@ System::System() : running(true) {
 
 	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 
-	/*shader = std::make_unique<Shader>(
-			"../assets/shaders/vertex_shader.glsl",
-			"../assets/shaders/fragment_shader.glsl");*/
 	shaders.insert({"default", Shader(
 				"../assets/shaders/vertex_shader.glsl",
 				"../assets/shaders/fragment_shader.glsl")});
-	matrix_id = glGetUniformLocation(
-			shaders.at("default").getId(),
-			"mvp");
 	asset_mngr.loadModel(
 			"../assets/models/board.obj",
 			"board");
@@ -101,7 +95,10 @@ void System::run() {
 
 		glClear(GL_COLOR_BUFFER_BIT bitor GL_DEPTH_BUFFER_BIT);
 		shaders.at("default").use();
-		glm::mat4 mvp;
+		shaders.at("default").setVec3("light_col",
+				glm::vec3(1.0f, 1.0f, 0.8f));
+		shaders.at("default").setVec3("light_dir",
+				glm::vec3(-0.3f, -1, 0));
 		{
 			glm::mat4 proj = glm::perspective(glm::radians(45.0f),
 					static_cast<float>(WINDOW_WIDTH) / static_cast<float>(WINDOW_HEIGHT),
@@ -113,11 +110,10 @@ void System::run() {
 					glm::vec3(0,1,0) // which way is vertically up
 					);
 			glm::mat4 mod = glm::mat4(1.0f); // identity matrix, object is at origin
-			mvp = proj * view * mod;
-
+			shaders.at("default").setMat4("model", mod);
+			shaders.at("default").setMat4("proj", proj);
+			shaders.at("default").setMat4("view", view);
 		}
-		glUniformMatrix4fv(matrix_id, 1, GL_FALSE, &mvp[0][0]);
-
 
 		asset_mngr.getModel("board")->setColor(1,0,0);
 		asset_mngr.getModel("board")->draw(shaders.at("default"));

src/System.hpp

@@ -43,5 +43,4 @@ private:
 	std::map<std::string, Shader> shaders;
 	Camera cam;
 	bool running;
-	GLuint matrix_id;
 };