X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcommon.glsl;h=eb191e45dc7f6e03ce31473b81eba73449241c40;hb=713ff9619daa858ffbd428f7699cd57598563dbd;hp=05648e4c0c106f469b63ed0346dc4c8b32c0c9be;hpb=146df2d02940a04aeafe854bdd981a1489cc80b3;p=libs%2Fgl.git

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 05648e4c..eb191e45 100644
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -1,7 +1,7 @@
 import msp_interface;
 import shadow;
 
-const bool use_normal_map = false;
+layout(constant_id=auto) const bool use_normal_map = false;
 
 #pragma MSP stage(vertex)
 vec4 get_vertex_position()
@@ -44,7 +44,6 @@ void standard_transform()
 	out vec3 tbn_halfway_dir = eye_halfway_dir*eye_tbn_matrix;
 
 	out vec3 tbn_zenith_dir = eye_zenith_dir*eye_tbn_matrix;
-	out vec3 shadow_coord = (shd_eye_matrix*eye_vertex).xyz;
 	out float fog_coord = eye_vertex.z;
 
 	for(int i=0; i<max_clip_planes; ++i)
@@ -68,7 +67,7 @@ void main()
 vec3 get_fragment_normal()
 {
 	if(use_normal_map)
-		return texture(normal_map, texcoord.xy).xyz*2.0-1.0;
+		return normalize(texture(normal_map, texcoord.xy).xyz*2.0-1.0);
 	else
 		return vec3(0.0, 0.0, 1.0);
 }
@@ -90,5 +89,5 @@ vec3 get_reflection(vec3 normal, vec3 look)
 vec3 apply_fog(vec3 color)
 {
 	float fog_value = exp(fog_coord*fog_density);
-	return mix(fog_color, color, fog_value);
+	return mix(fog_color.rgb, color, fog_value);
 }