X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcommon.glsl;h=33fefe8806deb4ddfa7240c5394f1778f082d1c1;hb=34d956d6890ce7070741667d4864fa798883da72;hp=b393b2a0daf2d7e0398a348b60eb4d9753ad2f47;hpb=d4b030f46c3a643e813cf31e3faa2b4f3662a160;p=libs%2Fgl.git

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index b393b2a0..33fefe88 100644
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -57,8 +57,6 @@ void standard_transform()
 		for(int i=0; i<max_clip_planes; ++i)
 			gl_ClipDistance[i] = dot(world_vertex, clip_planes[i].equation);
 	}
-
-	shadow_transform(world_vertex);
 }
 
 virtual void custom_transform()
@@ -73,6 +71,12 @@ void main()
 }
 
 #pragma MSP stage(fragment)
+struct IncomingLight
+{
+	vec3 direction;
+	vec3 color;
+};
+
 virtual vec3 get_fragment_normal()
 {
 	if(use_normal_map)
@@ -81,10 +85,13 @@ virtual vec3 get_fragment_normal()
 		return normalize(world_normal);
 }
 
-virtual vec3 get_light_direction(int index)
+virtual IncomingLight get_incoming_light(int index, vec3 world_pos)
 {
 	vec4 light_pos = light_sources[index].position;
-	return normalize(light_pos.xyz-world_vertex.xyz*light_pos.w);
+	vec3 rel_pos = light_pos.xyz-world_pos*light_pos.w;
+	float d = length(rel_pos);
+	float attenuation = 1.0/dot(vec3(1.0, d, d*d), light_sources[index].attenuation);
+	return IncomingLight(rel_pos/d, light_sources[index].color*attenuation);
 }
 
 virtual vec3 get_environment_sample(vec3 direction, float roughness)