Merge pull request #28 from Pilzschaf/tutorial32-directionallight

Directional light

Author: Pilzschaf

main.cpp

@@ -82,6 +82,13 @@ int main(int argc, char** argv) {
 
 	Shader shader("shaders/basic.vs", "shaders/basic.fs");
 	shader.bind();
+	int directionLocation = GLCALL(glGetUniformLocation(shader.getShaderId(), "u_directional_light.direction"));
+	glm::vec3 sunColor = glm::vec3(0.8f);
+	glm::vec3 sunDirection = glm::vec3(-1.0f);
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_directional_light.diffuse"), 1, (float*)&sunColor.data));
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_directional_light.specular"), 1, (float*)&sunColor.data));
+	sunColor *= 0.4f;
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_directional_light.ambient"), 1, (float*)&sunColor.data));
 
 	Model monkey;
 	monkey.init("models/tree.bmf", &shader);
@@ -204,6 +211,9 @@ int main(int argc, char** argv) {
 		modelViewProj = camera.getViewProj() * model;
 		glm::mat4 modelView = camera.getView() * model;
 		glm::mat4 invModelView = glm::transpose(glm::inverse(modelView));
+		
+		glm::vec4 transformedSunDirection = glm::transpose(glm::inverse(camera.getView())) * glm::vec4(sunDirection, 1.0f);
+		glUniform3fv(directionLocation, 1, (float*)&transformedSunDirection.data);
 
 		GLCALL(glUniformMatrix4fv(modelViewProjMatrixLocation, 1, GL_FALSE, &modelViewProj[0][0]));
 		GLCALL(glUniformMatrix4fv(modelViewLocation, 1, GL_FALSE, &modelView[0][0]));

mesh.h

@@ -24,10 +24,10 @@ class Mesh {
         vertexBuffer = new VertexBuffer(vertices.data(), numVertices);
         indexBuffer = new IndexBuffer(indices.data(), numIndices, sizeof(indices[0]));
 
-        diffuseLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_diffuse"));
-        specularLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_specular"));
-        emissiveLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_emissive"));
-        shininessLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_shininess"));
+        diffuseLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_material.diffuse"));
+        specularLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_material.specular"));
+        emissiveLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_material.emissive"));
+        shininessLocation = GLCALL(glGetUniformLocation(shader->getShaderId(), "u_material.shininess"));
     }
     ~Mesh() {
         delete vertexBuffer;

shaders/basic.fs

@@ -5,22 +5,35 @@ layout(location = 0) out vec4 f_color;
 in vec3 v_normal;
 in vec3 v_position;
 
-uniform vec3 u_diffuse;
-uniform vec3 u_specular;
-uniform vec3 u_emissive;
-uniform float u_shininess;
+struct Material {
+    vec3 diffuse;
+    vec3 specular;
+    vec3 emissive;
+    float shininess;
+};
+
+struct DirectionalLight {
+    vec3 direction;
+
+    vec3 diffuse;
+    vec3 specular;
+    vec3 ambient;
+};
+
+uniform Material u_material;
+uniform DirectionalLight u_directional_light;
 
 void main()
 {
     // Vector from fragment to camera (camera always at 0,0,0)
     vec3 view = normalize(-v_position);
-    vec3 light = normalize(vec3(1.0f, 1.0f, 1.0f));
     vec3 normal = normalize(v_normal);
-    vec3 reflection = reflect(-light, normal);
 
-    vec3 ambient = u_diffuse * 0.2;
-    vec3 diffuse = max(dot(normal, light), 0.0) * u_diffuse;
-    vec3 specular = pow(max(dot(reflection, view), 0.000001), u_shininess) * u_specular;
+    vec3 light = normalize(-u_directional_light.direction);
+    vec3 reflection = reflect(u_directional_light.direction, normal);
+    vec3 ambient = u_directional_light.ambient * u_material.diffuse;
+    vec3 diffuse = u_directional_light.diffuse * max(dot(normal, light), 0.0) * u_material.diffuse;
+    vec3 specular = u_directional_light.specular * pow(max(dot(reflection, view), 0.000001), u_material.shininess) * u_material.specular;
 
-    f_color = vec4(ambient + diffuse + specular + u_emissive, 1.0f);
+    f_color = vec4(ambient + diffuse + specular + u_material.emissive, 1.0f);
 }

shaders_old/basic.fs

@@ -3,21 +3,35 @@
 varying vec3 v_normal;
 varying vec3 v_position;
 
-uniform vec3 u_diffuse;
-uniform vec3 u_specular;
-uniform vec3 u_emissive;
-uniform float u_shininess;
+struct Material {
+    vec3 diffuse;
+    vec3 specular;
+    vec3 emissive;
+    float shininess;
+};
+
+struct DirectionalLight {
+    vec3 direction;
+
+    vec3 diffuse;
+    vec3 specular;
+    vec3 ambient;
+};
+
+uniform Material u_material;
+uniform DirectionalLight u_directional_light;
 
 void main()
 {
     vec3 view = normalize(-v_position);
-    vec3 light = normalize(vec3(1.0f, 1.0f, 1.0f));
     vec3 normal = normalize(v_normal);
-    vec3 reflection = reflect(-light, normal);
-
-    vec3 ambient = u_diffuse * 0.2;
-    vec3 diffuse = max(dot(normal, light), 0.0) * u_diffuse;
-    vec3 specular = pow(max(dot(reflection, view), 0.000001), u_shininess) * u_specular;
+    
+    
+    vec3 light = normalize(-u_directional_light.direction);
+    vec3 reflection = reflect(u_directional_light.direction, normal);
+    vec3 ambient = u_directional_light.ambient * u_material.diffuse;
+    vec3 diffuse = u_directional_light.diffuse * max(dot(normal, light), 0.0) * u_material.diffuse;
+    vec3 specular = u_directional_light.specular * pow(max(dot(reflection, view), 0.000001), u_material.shininess) * u_material.specular;
 
-    gl_FragColor = vec4(ambient + diffuse + specular + u_emissive, 1.0f);
+    gl_FragColor = vec4(ambient + diffuse + specular + u_material.emissive, 1.0f);
 }