X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcommon.glsl;h=35d5a87eafb8bf8c83e8fe877cdf5e90b0a3d724;hb=0f256116c84a5b926bc923f5bbad95622933517a;hp=b393b2a0daf2d7e0398a348b60eb4d9753ad2f47;hpb=d4b030f46c3a643e813cf31e3faa2b4f3662a160;p=libs%2Fgl.git

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index b393b2a0..35d5a87e 100644
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -43,22 +43,17 @@ void standard_transform()
 	gl_Position = clip_eye_matrix*eye_vertex;
 
 	out vec3 world_normal = normal_tf*get_vertex_normal();
-	vec3 world_tangent = normal_tf*tangent;
-	vec3 world_binormal = cross(world_normal, world_tangent);
-	out mat3 world_tbn_matrix = mat3(world_tangent, world_binormal, world_normal);
+	if(use_normal_map)
+	{
+		vec3 world_tangent = normal_tf*tangent;
+		vec3 world_binormal = cross(world_normal, world_tangent);
+		out mat3 world_tbn_matrix = mat3(world_tangent, world_binormal, world_normal);
+	}
 
-	vec3 eye_pos = (inverse(eye_world_matrix)*vec4(0.0, 0.0, 0.0, 1.0)).xyz;
+	vec3 eye_pos = world_eye_matrix[3].xyz;
 	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);
-	}
-
-	shadow_transform(world_vertex);
 }
 
 virtual void custom_transform()
@@ -73,6 +68,14 @@ void main()
 }
 
 #pragma MSP stage(fragment)
+struct IncomingLight
+{
+	vec3 direction;
+	vec3 color;
+};
+
+layout(location=0) out vec4 frag_color;
+
 virtual vec3 get_fragment_normal()
 {
 	if(use_normal_map)
@@ -81,10 +84,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)