Some refactoring of light calculations in shaders

[libs/gl.git] / shaderlib / common.glsl

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index dde09c12cff45bca1a4a60fe95d6a37305404ef8..4d6112d9f2b37a58127f6a5330837b5b55973217 100644 (file)
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -71,6 +71,12 @@ void main()
 }
 
 #pragma MSP stage(fragment)
+struct IncomingLight
+{
+       vec3 direction;
+       vec3 color;
+};
+
 virtual vec3 get_fragment_normal()
 {
        if(use_normal_map)
@@ -79,10 +85,12 @@ 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);
+       return IncomingLight(rel_pos/d, light_sources[index].color);
 }
 
 virtual vec3 get_environment_sample(vec3 direction, float roughness)