X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcommon.glsl;h=6bac9c3720e478fe3beb5a186da3b53800e902f2;hb=f1e296bb2442dfbea12e7b38a97cc152aa34569c;hp=849d97c9cef6d418024aff4604708ba2aa3141c9;hpb=594f5277e988a5a7b3b4ae381993da68ed733733;p=libs%2Fgl.git

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 849d97c9..6bac9c37 100644
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -1,14 +1,16 @@
 import msp_interface;
 import shadow;
 
-uniform EnvMap
+layout(set=0) uniform EnvMap
 {
-	mat3 env_eye_matrix;
+	mat3 env_world_matrix;
 };
 
-uniform sampler2D normal_map;
-uniform samplerCube environment_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_instancing = false;
 layout(constant_id=auto) const bool use_normal_map = false;
 
 #pragma MSP stage(vertex)
@@ -22,45 +24,43 @@ virtual vec3 get_vertex_normal()
 	return normal;
 }
 
-virtual vec4 transform_position(vec4 pos)
+virtual mat4 get_vertex_transform()
 {
-	return eye_obj_matrix*pos;
+	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 vec3 transform_normal(vec3 nor)
+virtual mat3 get_normal_transform()
 {
-	return eye_obj_normal_matrix*nor;
+	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()
 {
-	out vec4 eye_vertex = transform_position(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 mat3 eye_tbn_matrix = mat3(eye_tangent, eye_binormal, eye_normal);
-
-	out vec3 eye_look_dir = normalize(eye_vertex.xyz);
-	out vec3 tbn_look_dir = eye_look_dir*eye_tbn_matrix;
-
-	out vec3 eye_light_dir = normalize(light_sources[0].position.xyz-eye_vertex.xyz*light_sources[0].position.w);
-	out vec3 tbn_light_dir = eye_light_dir*eye_tbn_matrix;
+	mat4 vertex_tf = get_vertex_transform();
+	mat3 normal_tf = get_normal_transform();
 
-	out vec3 eye_halfway_dir = normalize(eye_light_dir-eye_look_dir);
-	out vec3 tbn_halfway_dir = eye_halfway_dir*eye_tbn_matrix;
+	out vec4 world_vertex = vertex_tf*get_vertex_position();
+	vec4 eye_vertex = eye_world_matrix*world_vertex;
+	gl_Position = clip_eye_matrix*eye_vertex;
 
-	out vec3 tbn_zenith_dir = eye_zenith_dir*eye_tbn_matrix;
-	out float fog_coord = eye_vertex.z;
-
-	if(use_clipping)
+	out vec3 world_normal = normalize(normal_tf*get_vertex_normal());
+	if(use_normal_map)
 	{
-		for(int i=0; i<max_clip_planes; ++i)
-			gl_ClipDistance[i] = dot(eye_vertex, clip_planes[i].equation);
+		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);
 	}
 
-	shadow_transform(eye_vertex);
+	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;
 }
 
 virtual void custom_transform()
@@ -75,26 +75,48 @@ 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(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 vec3(0.0, 0.0, 1.0);
+		return sgn*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 vec4 get_environment_sample(vec3 direction)
+virtual vec3 get_environment_sample(vec3 direction, float roughness)
 {
-	return texture(environment_map, direction);
+	float lod = (2-roughness)*roughness*(textureQueryLevels(environment_map)-1);
+	return textureLod(environment_map, env_world_matrix*direction, lod).rgb;
 }
 
 virtual vec3 get_reflection(vec3 normal, vec3 look)
 {
 	vec3 reflect_dir = reflect(look, normal);
-	if(use_normal_map)
-		reflect_dir = eye_tbn_matrix*reflect_dir;
+	return get_environment_sample(reflect_dir, 0.0);
+}
 
-	return get_environment_sample(env_eye_matrix*reflect_dir).rgb;
+virtual vec3 get_irradiance_sample(vec3 normal)
+{
+	return texture(irradiance_map, env_world_matrix*normal).rgb;
 }
 
 vec3 apply_fog(vec3 color)