X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcommon.glsl;h=8bc652fcd0a509cf9076cfe761c498c75d99e86a;hb=3c2241d9eec23d75e9be08922420736d151278a3;hp=f952c8bd6c1cb34c647d869011ea51fd61d1ff29;hpb=a3c33df71e507380100069ad7ef802b61de351bb;p=libs%2Fgl.git

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index f952c8bd..8bc652fc 100644
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -22,24 +22,27 @@ virtual vec3 get_vertex_normal()
 	return normal;
 }
 
-virtual vec4 transform_position(vec4 pos)
+virtual mat4 get_vertex_transform()
 {
-	return eye_obj_matrix*pos;
+	return eye_obj_matrix;
 }
 
-virtual vec3 transform_normal(vec3 nor)
+virtual mat3 get_normal_transform()
 {
-	return eye_obj_normal_matrix*nor;
+	return eye_obj_normal_matrix;
 }
 
 void standard_transform()
 {
-	out vec4 eye_vertex = transform_position(get_vertex_position());
+	mat4 vertex_tf = get_vertex_transform();
+	mat3 normal_tf = get_normal_transform();
+
+	out vec4 eye_vertex = vertex_tf*get_vertex_position();
 	gl_Position = projection_matrix*eye_vertex;
 
-	out vec3 eye_normal = transform_normal(get_vertex_normal());
-	vec3 eye_tangent = transform_normal(tangent);
-	vec3 eye_binormal = transform_normal(binormal);
+	out vec3 eye_normal = normal_tf*get_vertex_normal();
+	vec3 eye_tangent = normal_tf*tangent;
+	vec3 eye_binormal = cross(eye_normal, eye_tangent);
 	out mat3 eye_tbn_matrix = mat3(eye_tangent, eye_binormal, eye_normal);
 
 	out vec3 eye_look_dir = normalize(eye_vertex.xyz);
@@ -54,8 +57,11 @@ void standard_transform()
 	out vec3 tbn_zenith_dir = eye_zenith_dir*eye_tbn_matrix;
 	out float fog_coord = eye_vertex.z;
 
-	for(int i=0; i<max_clip_planes; ++i)
-		gl_ClipDistance[i] = dot(eye_vertex, clip_planes[i].equation);
+	if(use_clipping)
+	{
+		for(int i=0; i<max_clip_planes; ++i)
+			gl_ClipDistance[i] = dot(eye_vertex, clip_planes[i].equation);
+	}
 
 	shadow_transform(eye_vertex);
 }