X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcommon.glsl;h=249cae7c67e9c65c64d6dd4ab8a9829dd0ed8ef8;hb=HEAD;hp=b83ff3804200fef4acfa270d378cc681c64d280d;hpb=f82ef715f0d7e1e7d0b93be4b7b89c8ce6bba40b;p=libs%2Fgl.git

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index b83ff380..249cae7c 100644
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -1,16 +1,17 @@
 import msp_interface;
 import shadow;
 
-uniform EnvMap
+struct AlphaCutoffParams
 {
-	mat3 env_world_matrix;
+	float cutoff;
+	float feather;
 };
 
-uniform sampler2D normal_map;
-uniform samplerCube environment_map;
-uniform samplerCube irradiance_map;
+layout(set=1) uniform sampler2D normal_map;
 
+layout(constant_id=auto) const bool use_instancing = false;
 layout(constant_id=auto) const bool use_normal_map = false;
+layout(constant_id=auto) const bool use_alpha_cutoff = false;
 
 #pragma MSP stage(vertex)
 virtual vec4 get_vertex_position()
@@ -25,12 +26,18 @@ virtual vec3 get_vertex_normal()
 
 virtual mat4 get_vertex_transform()
 {
-	return world_obj_matrix;
+	if(use_instancing)
+		return transpose(mat4(instance_transform[0], instance_transform[1], instance_transform[2], vec4(0.0, 0.0, 0.0, 1.0)));
+	else
+		return world_obj_matrix;
 }
 
 virtual mat3 get_normal_transform()
 {
-	return world_obj_normal_matrix;
+	if(use_instancing)
+		return transpose(mat3(instance_transform[0].xyz, instance_transform[1].xyz, instance_transform[2].xyz));
+	else
+		return world_obj_normal_matrix;
 }
 
 void standard_transform()
@@ -42,12 +49,15 @@ 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();
-	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);
+	out vec3 world_normal = normalize(normal_tf*get_vertex_normal());
+	if(use_normal_map)
+	{
+		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);
+	}
 
-	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;
@@ -65,46 +75,29 @@ void main()
 }
 
 #pragma MSP stage(fragment)
-struct IncomingLight
-{
-	vec3 direction;
-	vec3 color;
-};
-
 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);
-}
-
-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);
-	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)
-{
-	float lod = (2-roughness)*roughness*(textureQueryLevels(environment_map)-1);
-	return textureLod(environment_map, env_world_matrix*direction, lod).rgb;
+		return sgn*normalize(world_normal);
 }
 
-virtual vec3 get_reflection(vec3 normal, vec3 look)
+float apply_alpha_cutoff(float alpha, AlphaCutoffParams params)
 {
-	vec3 reflect_dir = reflect(look, normal);
-	return get_environment_sample(reflect_dir, 0.0);
-}
-
-virtual vec3 get_irradiance_sample(vec3 normal)
-{
-	return texture(irradiance_map, env_world_matrix*normal).rgb;
+	if(use_alpha_cutoff)
+	{
+		if(alpha<params.cutoff)
+			discard;
+		float limit = min(params.cutoff+params.feather*fwidth(alpha), 1.0);
+		return smoothstep(params.cutoff, limit, alpha);
+	}
+	else
+		return alpha;
 }
 
 vec3 apply_fog(vec3 color)