X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=c866058de4dbd0c6dd06fd7b28ad72c25f5b7c44;hb=6dcf74922f46b086ad394c19fd6ce083a635b290;hp=1e00e1f5f6c426ef9fce488e3c92d9c80fed00ac;hpb=f7d6481be3511153ded018e119bcac852faa0766;p=libs%2Fgl.git

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index 1e00e1f5..c866058d 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -2,17 +2,17 @@ import msp_interface;
 import common;
 import shadow;
 
-const bool use_base_color_map = false;
-const bool use_metalness_map = false;
-const bool use_roughness_map = false;
-const bool use_occlusion_map = false;
-const bool use_emission = false;
-const bool use_emission_map = false;
+layout(constant_id=auto) const bool use_base_color_map = false;
+layout(constant_id=auto) const bool use_metalness_map = false;
+layout(constant_id=auto) const bool use_roughness_map = false;
+layout(constant_id=auto) const bool use_occlusion_map = false;
+layout(constant_id=auto) const bool use_emission = false;
+layout(constant_id=auto) const bool use_emission_map = false;
 
 const float PI = 3.1415926535;
 
 #pragma MSP stage(fragment)
-vec4 get_base_color()
+virtual vec4 get_base_color()
 {
 	if(use_base_color_map)
 		return texture(base_color_map, texcoord.xy);
@@ -20,7 +20,7 @@ vec4 get_base_color()
 		return pbr_material.base_color;
 }
 
-float get_metalness_value()
+virtual float get_metalness_value()
 {
 	if(use_metalness_map)
 		return texture(metalness_map, texcoord.xy).r;
@@ -28,7 +28,7 @@ float get_metalness_value()
 		return pbr_material.metalness;
 }
 
-float get_roughness_value()
+virtual float get_roughness_value()
 {
 	if(use_roughness_map)
 		return texture(roughness_map, texcoord.xy).r;
@@ -36,7 +36,7 @@ float get_roughness_value()
 		return pbr_material.roughness;
 }
 
-float get_occlusion_value()
+virtual float get_occlusion_value()
 {
 	if(use_occlusion_map)
 		return texture(occlusion_map, texcoord.xy).r;
@@ -44,12 +44,12 @@ float get_occlusion_value()
 		return 1.0;
 }
 
-vec3 get_emission_color()
+virtual vec3 get_emission_color()
 {
 	if(use_emission_map)
 		return texture(emission_map, texcoord.xy).rgb;
 	else
-		return basic_material.emission.rgb;
+		return pbr_material.emission.rgb;
 }
 
 /* Computes the diffuse reflection of the macrosurface */
@@ -64,12 +64,9 @@ vec3 lambert_diffuse(vec3 base_color)
 float normal_distribution_ggxtr(vec3 normal, vec3 halfway, float roughness)
 {
 	float n_dot_h = max(dot(normal, halfway), 0.0);
-	//return n_dot_h;
 	float rough_q = roughness * roughness;
 	rough_q *= rough_q;
 	float denom = n_dot_h*n_dot_h*(rough_q-1)+1;
-	//return (n_dot_h*n_dot_h-0.8)*5.0;
-	//return rough_q*10;
 	// Scale by pi to get a result per steradian, suitable for integration
 	return rough_q/(PI*denom*denom);
 }
@@ -104,16 +101,14 @@ vec3 fresnel_schlick(vec3 halfway, vec3 look, vec3 base_color, float metalness)
 vec3 cooktorrance_one_light_direct(vec3 normal, vec3 look, vec3 light, vec3 light_color, vec3 base_color, float metalness, float roughness)
 {
 	vec3 halfway = normalize(light-look);
-	//return normal;
 	float ndist = normal_distribution_ggxtr(normal, halfway, roughness);
 	float geom = geometry_smith(normal, -look, light, roughness);
-	//return vec3(ndist);
 
 	vec3 k_spec = fresnel_schlick(halfway, light, base_color, metalness);
 	vec3 k_diff = (1.0-k_spec)*(1.0-metalness);
 
 	float denom = max(4.0*max(dot(normal, -look), 0.0)*max(dot(normal, light), 0.0), 0.001);
-	return max(dot(normal, light), 0.0)*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/denom);
+	return max(dot(normal, light), 0.0)*light_color*(k_diff*lambert_diffuse(base_color)+k_spec*ndist*geom/denom);
 }
 
 vec3 cooktorrance_lighting(vec3 normal, vec3 look, vec3 base_color, float metalness, float roughness)