X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=79f88f6475db747479996e81c73079de8d1106bd;hp=f441a6d392088fe05f8152dc3430d2de1b701c3a;hb=4d276c9b986b111611b8396f94dae56dbe736387;hpb=fc00b25ad328d5cbb6c05c44f81284afe5451f81

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index f441a6d3..79f88f64 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -118,7 +118,7 @@ vec3 fresnel_schlick(vec3 halfway, vec3 look, vec3 base_color, float metalness)
 }
 
 /* Computes the full contribution of a single light */
-vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 light_color, vec3 base_color, float metalness, float roughness)
+vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 base_color, float metalness, float roughness)
 {
 	vec3 halfway = normalize(light-look);
 	float ndist = normal_distribution_ggxtr(normal, halfway, roughness);
@@ -128,7 +128,7 @@ vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 ligh
 	vec3 k_diff = (1.0-k_spec)*(1.0-metalness);
 
 	float spec_denom = max(4.0*max(dot(normal, -look), 0.0)*max(dot(normal, light), 0.0), 0.001);
-	return max(dot(normal, light), 0.0)*light_color*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/spec_denom);
+	return max(dot(normal, light), 0.0)*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/spec_denom);
 }
 
 vec3 cooktorrance_environment(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness)
@@ -155,9 +155,9 @@ vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metaln
 	for(int i=0; i<max_lights; ++i)
 		if(light_sources[i].type!=0)
 		{
-			vec3 light = get_light_direction(i);
+			IncomingLight incoming = get_incoming_light(i, world_vertex.xyz);
 			float shadow = get_shadow_factor(i);
-			color += cooktorrance_one_light_direct(normal, look, light, light_sources[i].color, base_color, metalness, roughness)*shadow;
+			color += cooktorrance_one_light_direct(normal, look, incoming.direction, base_color, metalness, roughness)*incoming.color*shadow;
 		}
 
 	color += cooktorrance_environment(normal, look, base_color, metalness, roughness);