Added spotlight

Author: Pilzschaf

main.cpp

@@ -83,14 +83,14 @@ 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 sunColor = glm::vec3(0.0f);
 	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));
 
-	glm::vec3 pointLightColor = glm::vec3(0.0f, 0.0f, 1.0f);
+	glm::vec3 pointLightColor = glm::vec3(0.0f, 0.0f, 0.0f);
 	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_point_light.diffuse"), 1, (float*)&pointLightColor.data));
 	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_point_light.specular"), 1, (float*)&pointLightColor.data));
 	pointLightColor *= 0.2f;
@@ -99,6 +99,18 @@ int main(int argc, char** argv) {
 	GLCALL(glUniform1f(glGetUniformLocation(shader.getShaderId(), "u_point_light.quadratic"), 0.0028f));
 	glm::vec4 pointLightPosition = glm::vec4(0.0f, 0.0f, 10.0f, 1.0f);
 	int positionLocation = GLCALL(glGetUniformLocation(shader.getShaderId(), "u_point_light.position"));
+
+	glm::vec3 spotLightColor = glm::vec3(1.0f);
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_spot_light.diffuse"), 1, (float*)&spotLightColor.data));
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_spot_light.specular"), 1, (float*)&spotLightColor.data));
+	spotLightColor *= 0.2f;
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_spot_light.ambient"), 1, (float*)&spotLightColor.data));
+	glm::vec3 spotLightPosition = glm::vec3(0.0f);
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_spot_light.position"), 1, (float*)&spotLightPosition.data));
+	spotLightPosition.z = 1.0f;
+	GLCALL(glUniform3fv(glGetUniformLocation(shader.getShaderId(), "u_spot_light.direction"), 1, (float*)&spotLightPosition.data));
+	GLCALL(glUniform1f(glGetUniformLocation(shader.getShaderId(), "u_spot_light.innerCone"), 0.95f));
+	GLCALL(glUniform1f(glGetUniformLocation(shader.getShaderId(), "u_spot_light.outerCone"), 0.80f));
 
 	Model monkey;
 	monkey.init("models/tree.bmf", &shader);

shaders/basic.fs

@@ -31,9 +31,23 @@ struct PointLight {
     float quadratic;
 };
 
+struct SpotLight {
+    vec3 position;
+    // Must be a normalized vector
+    vec3 direction;
+
+    float innerCone;
+    float outerCone;
+
+    vec3 diffuse;
+    vec3 specular;
+    vec3 ambient;
+};
+
 uniform Material u_material;
 uniform DirectionalLight u_directional_light;
 uniform PointLight u_point_light;
+uniform SpotLight u_spot_light;
 
 void main()
 {
@@ -55,5 +69,18 @@ void main()
     diffuse += attentuation * u_point_light.diffuse * max(dot(normal, light), 0.0) * u_material.diffuse;
     specular += attentuation * u_point_light.specular * pow(max(dot(reflection, view), 0.000001), u_material.shininess) * u_material.specular;
 
+    light = normalize(u_spot_light.position - v_position);
+    reflection = reflect(-light, normal);
+    float theta = dot(light, u_spot_light.direction);
+    float epsilon = u_spot_light.innerCone - u_spot_light.outerCone;
+    float intensity = clamp((theta - u_spot_light.outerCone) / epsilon, 0.0f, 1.0f);
+    if(theta > u_spot_light.outerCone) {
+        ambient += u_spot_light.ambient * u_material.diffuse;
+        diffuse += intensity * u_spot_light.diffuse * max(dot(normal, light), 0.0) * u_material.diffuse;
+        specular += intensity * u_spot_light.specular * pow(max(dot(reflection, view), 0.000001), u_material.shininess) * u_material.specular;
+    } else {
+        ambient += u_spot_light.ambient * u_material.diffuse;
+    }
+
     f_color = vec4(ambient + diffuse + specular + u_material.emissive, 1.0f);
 }

shaders_old/basic.fs

@@ -29,9 +29,23 @@ struct PointLight {
     float quadratic;
 };
 
+struct SpotLight {
+    vec3 position;
+    // Must be a normalized vector
+    vec3 direction;
+
+    float innerCone;
+    float outerCone;
+
+    vec3 diffuse;
+    vec3 specular;
+    vec3 ambient;
+};
+
 uniform Material u_material;
 uniform DirectionalLight u_directional_light;
 uniform PointLight u_point_light;
+uniform SpotLight u_spot_light;
 
 void main()
 {
@@ -53,5 +67,18 @@ void main()
     diffuse += attentuation * u_point_light.diffuse * max(dot(normal, light), 0.0) * u_material.diffuse;
     specular += attentuation * u_point_light.specular * pow(max(dot(reflection, view), 0.000001), u_material.shininess) * u_material.specular;
 
+    light = normalize(u_spot_light.position - v_position);
+    reflection = reflect(-light, normal);
+    float theta = dot(light, u_spot_light.direction);
+    float epsilon = u_spot_light.innerCone - u_spot_light.outerCone;
+    float intensity = clamp((theta - u_spot_light.outerCone) / epsilon, 0.0f, 1.0f);
+    if(theta > u_spot_light.outerCone) {
+        ambient += u_spot_light.ambient * u_material.diffuse;
+        diffuse += intensity * u_spot_light.diffuse * max(dot(normal, light), 0.0) * u_material.diffuse;
+        specular += intensity * u_spot_light.specular * pow(max(dot(reflection, view), 0.000001), u_material.shininess) * u_material.specular;
+    } else {
+        ambient += u_spot_light.ambient * u_material.diffuse;
+    }
+
     gl_FragColor = vec4(ambient + diffuse + specular + u_material.emissive, 1.0f);
 }