X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fphong.glsl;h=32fa43cc61ef6143343fd893c2d304ee72107229;hb=190a7e11237351f6b730c28f7b16f183e8adc69c;hp=87eba5eadf38bce9ba1c6873a4dd18b2dcb2f841;hpb=d4b030f46c3a643e813cf31e3faa2b4f3662a160;p=libs%2Fgl.git

diff --git a/shaderlib/phong.glsl b/shaderlib/phong.glsl
index 87eba5ea..32fa43cc 100644
--- a/shaderlib/phong.glsl
+++ b/shaderlib/phong.glsl
@@ -79,15 +79,15 @@ vec3 phong_ambient(vec3 surface_diffuse)
 	return ambient_color.rgb*surface_diffuse;
 }
 
-vec3 phong_one_light(vec3 light, vec3 normal, vec3 look, vec3 light_color, vec3 surface_diffuse, vec3 surface_specular, float shininess)
+vec3 phong_one_light(vec3 light, vec3 normal, vec3 look, vec3 surface_diffuse, vec3 surface_specular, float shininess)
 {
 	float diffuse_intensity = max(dot(light, normal), 0.0);
-	vec3 color = light_color*surface_diffuse*diffuse_intensity;
+	vec3 color = surface_diffuse*diffuse_intensity;
 	if(use_specular)
 	{
 		vec3 reflected = reflect(look, normal);
 		float specular_intensity = pow(max(dot(reflected, light), 0.0), shininess);
-		color += light_color*surface_specular*specular_intensity;
+		color += surface_specular*specular_intensity;
 	}
 	return color;
 }
@@ -96,11 +96,11 @@ vec3 phong_lighting(vec3 normal, vec3 look, vec3 surface_diffuse, vec3 surface_s
 {
 	vec3 color = phong_ambient(surface_diffuse);
 	for(int i=0; i<max_lights; ++i)
-		if(light_sources[i].enabled!=0)
+		if(light_sources[i].type!=0)
 		{
-			vec3 light = get_light_direction(i);
-			float shadow = get_shadow_factor(i);
-			color += phong_one_light(light, normal, look, light_sources[i].color, surface_diffuse, surface_specular, shininess)*shadow;
+			IncomingLight incoming = get_incoming_light(i, world_vertex.xyz);
+			float shadow = get_shadow_factor(i, world_vertex);
+			color += phong_one_light(incoming.direction, normal, look, surface_diffuse, surface_specular, shininess)*incoming.color*shadow;
 		}
 
 	if(use_emission)