Rearrange postprocessor creation code in SequenceBuilder

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

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 4d6112d9f2b37a58127f6a5330837b5b55973217..b83ff3804200fef4acfa270d378cc681c64d280d 100644 (file)
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -51,12 +51,6 @@ void standard_transform()
        out vec3 world_look_dir = normalize(world_vertex.xyz-eye_pos);
 
        out float fog_coord = eye_vertex.z;
-
-       if(use_clipping)
-       {
-               for(int i=0; i<max_clip_planes; ++i)
-                       gl_ClipDistance[i] = dot(world_vertex, clip_planes[i].equation);
-       }
 }
 
 virtual void custom_transform()
@@ -77,6 +71,8 @@ struct IncomingLight
        vec3 color;
 };
 
+layout(location=0) out vec4 frag_color;
+
 virtual vec3 get_fragment_normal()
 {
        if(use_normal_map)
@@ -90,7 +86,8 @@ virtual IncomingLight get_incoming_light(int index, vec3 world_pos)
        vec4 light_pos = light_sources[index].position;
        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);
+       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)