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

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 35d5a87e..44ef150a 100644
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -1,14 +1,14 @@
 import msp_interface;
 import shadow;
 
-uniform EnvMap
+layout(set=0) uniform EnvMap
 {
 	mat3 env_world_matrix;
 };
 
-uniform sampler2D normal_map;
-uniform samplerCube environment_map;
-uniform samplerCube irradiance_map;
+layout(set=1) uniform sampler2D normal_map;
+layout(set=0) uniform samplerCube environment_map;
+layout(set=0) uniform samplerCube irradiance_map;
 
 layout(constant_id=auto) const bool use_normal_map = false;
 
@@ -42,11 +42,11 @@ void standard_transform()
 	vec4 eye_vertex = eye_world_matrix*world_vertex;
 	gl_Position = clip_eye_matrix*eye_vertex;
 
-	out vec3 world_normal = normal_tf*get_vertex_normal();
+	out vec3 world_normal = normalize(normal_tf*get_vertex_normal());
 	if(use_normal_map)
 	{
-		vec3 world_tangent = normal_tf*tangent;
-		vec3 world_binormal = cross(world_normal, world_tangent);
+		vec3 world_tangent = normalize(normal_tf*tangent);
+		vec3 world_binormal = normalize(cross(world_normal, world_tangent));
 		out mat3 world_tbn_matrix = mat3(world_tangent, world_binormal, world_normal);
 	}
 
@@ -78,10 +78,12 @@ layout(location=0) out vec4 frag_color;
 
 virtual vec3 get_fragment_normal()
 {
+	vec3 normal;
+	float sgn = (gl_FrontFacing ? 1.0 : -1.0);
 	if(use_normal_map)
-		return normalize(world_tbn_matrix*(texture(normal_map, texcoord.xy).xyz*2.0-1.0));
+		return sgn*normalize(world_tbn_matrix*(texture(normal_map, texcoord.xy).xyz*2.0-1.0));
 	else
-		return normalize(world_normal);
+		return sgn*normalize(world_normal);
 }
 
 virtual IncomingLight get_incoming_light(int index, vec3 world_pos)