Added specular component

Author: tanderegg

shaders/mesh_pointlight.frag

@@ -1,48 +1,61 @@
-// Fragment Shader – file "minimal.frag"
+// Fragment Shader – file "mesh_pointlight.frag"
 
 #version 140
 
 precision highp float; // needed only for version 1.30
 
 // Light vars
-uniform vec3 lightPositionW = vec3(0.0f, 1.5f, 0.0f);
-uniform vec4 lightColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
-uniform float lightIntensity = 1.0f;
+uniform vec4 ambLightColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
+uniform float ambLightIntensity = 0.15f;
+
+uniform vec4 diffuseLightColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
+uniform float diffuseLightIntensity = 1.0f;
 uniform float cAttenuation = 1.0f;
 uniform float lAttenuation = 0.08f;
 uniform float qAttenuation = 0.01f;
 
-// Viewer position
-uniform vec3 eyePositionW;
+uniform float specularHardness = 32.0f;
+uniform vec4 specularLightColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
+uniform float specularLightIntensity = 1.0f;
 
 // Texture vars
 uniform sampler2D texDiff;
 uniform sampler2D texAmb;
 uniform int diffuseTexEnabled;
 uniform int ambientTexEnabled;
-uniform vec4 ambLightColor = vec4(1.0f, 1.0f, 1.0f, 1.0f);
-uniform float ambLightIntensity = 0.15f;
 
 in  vec3 ex_Color;
 in  vec3 ex_Normal;
 in  vec2 ex_UV;
-in  vec3 ex_PositionW;
+in  vec3 ex_LightDirW;
+in  vec3 ex_ViewDirW;
 
 out vec4 out_Color;
 
 void main(void)
 {
-	vec4 diffuseLight;
-	vec4 ambientLight;
-	vec3 lightDir = lightPositionW - ex_PositionW;
-	float distance = length(lightDir);
-	lightDir = normalize(lightDir);
+	vec4 ambientLight, diffuseLight, specularLight;
+	
+	specularLight = vec4(0.0f, 0.0f, 0.0f, 0.0f);
 
-	ambientLight = ambLightIntensity*ambLightColor;
+	vec3 viewDirW = normalize(ex_ViewDirW);
+	vec3 normal = normalize(ex_Normal);
+
+	float distance = length(ex_LightDirW);
+	vec3 lightDirW = normalize(ex_LightDirW);
+
+	ambientLight = vec4(ambLightIntensity*ambLightColor.xyz, ambLightColor.w);
 
-	float NdL = clamp(dot(normalize(ex_Normal), lightDir), 0.0f, 1.0f);
 	float attenuation = 1.0f / (cAttenuation + lAttenuation*distance + qAttenuation*distance*distance);
-	diffuseLight = vec4(lightIntensity*lightColor.xyz*NdL*attenuation, lightColor.w);
+
+	float NdL = clamp(dot(normal, lightDirW), 0.0f, 1.0f);
+	diffuseLight = vec4(diffuseLightIntensity*diffuseLightColor.xyz*NdL*attenuation, diffuseLightColor.w);
+
+	if(NdL > 0.0f) {
+		vec3 H = normalize(lightDirW + viewDirW);
+		float NdH = clamp(dot(normal, H), 0.0f, 1.0f);
+		specularLight = vec4(specularLightIntensity*diffuseLightColor.xyz*pow(NdH, specularHardness), diffuseLightColor.w);
+	}
 
 	if (ambientTexEnabled >= 1) {
         vec4 ambTextureColor = texture(texAmb,ex_UV);
@@ -54,5 +67,5 @@ void main(void)
 		diffuseLight *= diffTextureColor;
 	}
 
-	out_Color = vec4(ex_Color, 1.0f)*(clamp(diffuseLight+ambientLight, 0.0f, 1.0f));
+	out_Color = vec4(ex_Color, 1.0f)*(clamp((diffuseLight+specularLight) + ambientLight, 0.0f, 1.0f));
 }

shaders/mesh_pointlight.vert

@@ -1,10 +1,14 @@
-// Vertex Shader – file "icosphere.vert"
+// Vertex Shader – file "mesh_pointlight.vert"
 
 #version 140
 
 uniform  mat4 in_Model;
 uniform  mat4 in_View;
 uniform  mat4 in_Proj;
+
+// Viewer position
+uniform vec3 viewPosW;
+uniform vec3 lightPositionW = vec3(0.0f, 1.5f, 0.0f);
 
 in  vec3 in_Position;
 in  vec3 in_Color;
@@ -14,7 +18,8 @@ in  vec2 in_UV;
 out vec2 ex_UV;
 out vec3 ex_Color;
 out vec3 ex_Normal;
-out vec3 ex_PositionW;
+out vec3 ex_LightDirW;
+out vec3 ex_ViewDirW;
 
 void main(void)
 {
@@ -23,6 +28,7 @@ void main(void)
 	ex_UV = in_UV;
 
 	vec4 position = (in_Model * vec4(in_Position,1)); 
-	ex_PositionW = position.xyz;
+	ex_LightDirW = lightPositionW - position.xyz;
+	ex_ViewDirW = viewPosW - position.xyz;
 	gl_Position = in_Proj * (in_View * position);
 }