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

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index c866058d..d834cee4 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -2,6 +2,25 @@ import msp_interface;
 import common;
 import shadow;
 
+struct PbrMaterialParameters
+{
+	vec4 base_color;
+	vec4 emission;
+	float metalness;
+	float roughness;
+};
+
+uniform PbrMaterial
+{
+	PbrMaterialParameters pbr_material;
+};
+
+uniform sampler2D base_color_map;
+uniform sampler2D metalness_map;
+uniform sampler2D roughness_map;
+uniform sampler2D occlusion_map;
+uniform sampler2D emission_map;
+
 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;
@@ -67,7 +86,8 @@ float normal_distribution_ggxtr(vec3 normal, vec3 halfway, float roughness)
 	float rough_q = roughness * roughness;
 	rough_q *= rough_q;
 	float denom = n_dot_h*n_dot_h*(rough_q-1)+1;
-	// Scale by pi to get a result per steradian, suitable for integration
+	/* Scale by pi to normalize the total area of the microfacets as projected
+	to the macrosurface */
 	return rough_q/(PI*denom*denom);
 }