three-gpu-pathtracer 0.0.12 → 0.0.13

package/src/shader/shaderIridescenceFunctions.js

@@ -1,130 +1,135 @@
-export const shaderIridescenceFunctions = /* glsl */`
-
-// XYZ to sRGB color space
-const mat3 XYZ_TO_REC709 = mat3(
-	 3.2404542, -0.9692660,  0.0556434,
-	-1.5371385,  1.8760108, -0.2040259,
-	-0.4985314,  0.0415560,  1.0572252
-);
-
-vec3 fresnel0ToIor( vec3 fresnel0 ) {
-
-	vec3 sqrtF0 = sqrt( fresnel0 );
-	return ( vec3( 1.0 ) + sqrtF0 ) / ( vec3( 1.0 ) - sqrtF0 );
-
-}
-
-// Conversion FO/IOR
-vec3 iorToFresnel0( vec3 transmittedIor, float incidentIor ) {
-
-	return square( ( transmittedIor - vec3( incidentIor ) ) / ( transmittedIor + vec3( incidentIor ) ) );
-
-}
-
-// ior is a value between 1.0 and 3.0. 1.0 is air interface
-float iorToFresnel0( float transmittedIor, float incidentIor ) {
-
-	return square( ( transmittedIor - incidentIor ) / ( transmittedIor + incidentIor ) );
-
-}
-
-// Fresnel equations for dielectric/dielectric interfaces. See https://belcour.github.io/blog/research/2017/05/01/brdf-thin-film.html
-vec3 evalSensitivity( float OPD, vec3 shift ) {
-
-	float phase = 2.0 * PI * OPD * 1.0e-9;
-
-	vec3 val = vec3( 5.4856e-13, 4.4201e-13, 5.2481e-13 );
-	vec3 pos = vec3( 1.6810e+06, 1.7953e+06, 2.2084e+06 );
-	vec3 var = vec3( 4.3278e+09, 9.3046e+09, 6.6121e+09 );
-
-	vec3 xyz = val * sqrt( 2.0 * PI * var ) * cos( pos * phase + shift ) * exp( - square( phase ) * var );
-	xyz.x += 9.7470e-14 * sqrt( 2.0 * PI * 4.5282e+09 ) * cos( 2.2399e+06 * phase + shift[ 0 ] ) * exp( - 4.5282e+09 * square( phase ) );
-	xyz /= 1.0685e-7;
-
-	vec3 srgb = XYZ_TO_REC709 * xyz;
-	return srgb;
-
-}
-
-// See Section 4. Analytic Spectral Integration, A Practical Extension to Microfacet Theory for the Modeling of Varying Iridescence, https://hal.archives-ouvertes.fr/hal-01518344/document
-vec3 evalIridescence( float outsideIOR, float eta2, float cosTheta1, float thinFilmThickness, vec3 baseF0 ) {
-
-	vec3 I;
-
-	// Force iridescenceIor -> outsideIOR when thinFilmThickness -> 0.0
-	float iridescenceIor = mix( outsideIOR, eta2, smoothstep( 0.0, 0.03, thinFilmThickness ) );
-
-	// Evaluate the cosTheta on the base layer (Snell law)
-	float sinTheta2Sq = square( outsideIOR / iridescenceIor ) * ( 1.0 - square( cosTheta1 ) );
-
-	// Handle TIR:
-	float cosTheta2Sq = 1.0 - sinTheta2Sq;
-	if ( cosTheta2Sq < 0.0 ) {
-
-		return vec3( 1.0 );
-
-	}
-
-	float cosTheta2 = sqrt( cosTheta2Sq );
-
-	// First interface
-	float R0 = iorToFresnel0( iridescenceIor, outsideIOR );
-	float R12 = schlickFresnel( cosTheta1, R0 );
-	float R21 = R12;
-	float T121 = 1.0 - R12;
-	float phi12 = 0.0;
-	if ( iridescenceIor < outsideIOR ) {
-
-		phi12 = PI;
-
-	}
-	float phi21 = PI - phi12;
-
-	// Second interface
-	vec3 baseIOR = fresnel0ToIor( clamp( baseF0, 0.0, 0.9999 ) ); // guard against 1.0
-	vec3 R1 = iorToFresnel0( baseIOR, iridescenceIor );
-	vec3 R23 = schlickFresnel( cosTheta2, R1 );
-	vec3 phi23 = vec3( 0.0 );
-	if ( baseIOR[0] < iridescenceIor ) {
-
-		phi23[ 0 ] = PI;
-
-	}
-	if ( baseIOR[1] < iridescenceIor ) {
-
-		phi23[ 1 ] = PI;
-
-	}
-	if ( baseIOR[2] < iridescenceIor ) {
-
-		phi23[ 2 ] = PI;
-
-	}
-
-	// Phase shift
-	float OPD = 2.0 * iridescenceIor * thinFilmThickness * cosTheta2;
-	vec3 phi = vec3( phi21 ) + phi23;
-
-	// Compound terms
-	vec3 R123 = clamp( R12 * R23, 1e-5, 0.9999 );
-	vec3 r123 = sqrt( R123 );
-	vec3 Rs = square( T121 ) * R23 / ( vec3( 1.0 ) - R123 );
-
-	// Reflectance term for m = 0 (DC term amplitude)
-	vec3 C0 = R12 + Rs;
-	I = C0;
-
-	// Reflectance term for m > 0 (pairs of diracs)
-	vec3 Cm = Rs - T121;
-	for ( int m = 1; m <= 2; ++ m )
-	{
-		Cm *= r123;
-		vec3 Sm = 2.0 * evalSensitivity( float( m ) * OPD, float( m ) * phi );
-		I += Cm * Sm;
-	}
-
-	// Since out of gamut colors might be produced, negative color values are clamped to 0.
-	return max( I, vec3( 0.0 ) );
-}
-
-`;
+export const shaderIridescenceFunctions = /* glsl */`
+
+// XYZ to sRGB color space
+const mat3 XYZ_TO_REC709 = mat3(
+	 3.2404542, -0.9692660,  0.0556434,
+	-1.5371385,  1.8760108, -0.2040259,
+	-0.4985314,  0.0415560,  1.0572252
+);
+
+vec3 fresnel0ToIor( vec3 fresnel0 ) {
+
+	vec3 sqrtF0 = sqrt( fresnel0 );
+	return ( vec3( 1.0 ) + sqrtF0 ) / ( vec3( 1.0 ) - sqrtF0 );
+
+}
+
+// Conversion FO/IOR
+vec3 iorToFresnel0( vec3 transmittedIor, float incidentIor ) {
+
+	return square( ( transmittedIor - vec3( incidentIor ) ) / ( transmittedIor + vec3( incidentIor ) ) );
+
+}
+
+// ior is a value between 1.0 and 3.0. 1.0 is air interface
+float iorToFresnel0( float transmittedIor, float incidentIor ) {
+
+	return square( ( transmittedIor - incidentIor ) / ( transmittedIor + incidentIor ) );
+
+}
+
+// Fresnel equations for dielectric/dielectric interfaces. See https://belcour.github.io/blog/research/2017/05/01/brdf-thin-film.html
+vec3 evalSensitivity( float OPD, vec3 shift ) {
+
+	float phase = 2.0 * PI * OPD * 1.0e-9;
+
+	vec3 val = vec3( 5.4856e-13, 4.4201e-13, 5.2481e-13 );
+	vec3 pos = vec3( 1.6810e+06, 1.7953e+06, 2.2084e+06 );
+	vec3 var = vec3( 4.3278e+09, 9.3046e+09, 6.6121e+09 );
+
+	vec3 xyz = val * sqrt( 2.0 * PI * var ) * cos( pos * phase + shift ) * exp( - square( phase ) * var );
+	xyz.x += 9.7470e-14 * sqrt( 2.0 * PI * 4.5282e+09 ) * cos( 2.2399e+06 * phase + shift[ 0 ] ) * exp( - 4.5282e+09 * square( phase ) );
+	xyz /= 1.0685e-7;
+
+	vec3 srgb = XYZ_TO_REC709 * xyz;
+	return srgb;
+
+}
+
+// See Section 4. Analytic Spectral Integration, A Practical Extension to Microfacet Theory for the Modeling of Varying Iridescence, https://hal.archives-ouvertes.fr/hal-01518344/document
+vec3 evalIridescence( float outsideIOR, float eta2, float cosTheta1, float thinFilmThickness, vec3 baseF0 ) {
+
+	vec3 I;
+
+	// Force iridescenceIor -> outsideIOR when thinFilmThickness -> 0.0
+	float iridescenceIor = mix( outsideIOR, eta2, smoothstep( 0.0, 0.03, thinFilmThickness ) );
+
+	// Evaluate the cosTheta on the base layer (Snell law)
+	float sinTheta2Sq = square( outsideIOR / iridescenceIor ) * ( 1.0 - square( cosTheta1 ) );
+
+	// Handle TIR:
+	float cosTheta2Sq = 1.0 - sinTheta2Sq;
+	if ( cosTheta2Sq < 0.0 ) {
+
+		return vec3( 1.0 );
+
+	}
+
+	float cosTheta2 = sqrt( cosTheta2Sq );
+
+	// First interface
+	float R0 = iorToFresnel0( iridescenceIor, outsideIOR );
+	float R12 = schlickFresnel( cosTheta1, R0 );
+	float R21 = R12;
+	float T121 = 1.0 - R12;
+	float phi12 = 0.0;
+	if ( iridescenceIor < outsideIOR ) {
+
+		phi12 = PI;
+
+	}
+
+	float phi21 = PI - phi12;
+
+	// Second interface
+	vec3 baseIOR = fresnel0ToIor( clamp( baseF0, 0.0, 0.9999 ) ); // guard against 1.0
+	vec3 R1 = iorToFresnel0( baseIOR, iridescenceIor );
+	vec3 R23 = schlickFresnel( cosTheta2, R1 );
+	vec3 phi23 = vec3( 0.0 );
+	if ( baseIOR[0] < iridescenceIor ) {
+
+		phi23[ 0 ] = PI;
+
+	}
+
+	if ( baseIOR[1] < iridescenceIor ) {
+
+		phi23[ 1 ] = PI;
+
+	}
+
+	if ( baseIOR[2] < iridescenceIor ) {
+
+		phi23[ 2 ] = PI;
+
+	}
+
+	// Phase shift
+	float OPD = 2.0 * iridescenceIor * thinFilmThickness * cosTheta2;
+	vec3 phi = vec3( phi21 ) + phi23;
+
+	// Compound terms
+	vec3 R123 = clamp( R12 * R23, 1e-5, 0.9999 );
+	vec3 r123 = sqrt( R123 );
+	vec3 Rs = square( T121 ) * R23 / ( vec3( 1.0 ) - R123 );
+
+	// Reflectance term for m = 0 (DC term amplitude)
+	vec3 C0 = R12 + Rs;
+	I = C0;
+
+	// Reflectance term for m > 0 (pairs of diracs)
+	vec3 Cm = Rs - T121;
+	for ( int m = 1; m <= 2; ++ m ) {
+
+		Cm *= r123;
+		vec3 Sm = 2.0 * evalSensitivity( float( m ) * OPD, float( m ) * phi );
+		I += Cm * Sm;
+
+	}
+
+	// Since out of gamut colors might be produced, negative color values are clamped to 0.
+	return max( I, vec3( 0.0 ) );
+
+}
+
+`;

package/src/shader/shaderLayerTexelFetchFunctions.js

@@ -1,25 +1,25 @@
-
-export const shaderLayerTexelFetchFunctions = /*glsl */`
-
-	// add texel fetch functions for texture arrays
-	vec4 texelFetch1D( sampler2DArray tex, int layer, uint index ) {
-
-		uint width = uint( textureSize( tex, 0 ).x );
-		uvec2 uv;
-		uv.x = index % width;
-		uv.y = index / width;
-
-		return texelFetch( tex, ivec3( uv, layer ), 0 );
-
-	}
-
-	vec4 textureSampleBarycoord( sampler2DArray tex, int layer, vec3 barycoord, uvec3 faceIndices ) {
-
-		return
-			barycoord.x * texelFetch1D( tex, layer, faceIndices.x ) +
-			barycoord.y * texelFetch1D( tex, layer, faceIndices.y ) +
-			barycoord.z * texelFetch1D( tex, layer, faceIndices.z );
-
-	}
-
-`;
+
+export const shaderLayerTexelFetchFunctions = /*glsl */`
+
+	// add texel fetch functions for texture arrays
+	vec4 texelFetch1D( sampler2DArray tex, int layer, uint index ) {
+
+		uint width = uint( textureSize( tex, 0 ).x );
+		uvec2 uv;
+		uv.x = index % width;
+		uv.y = index / width;
+
+		return texelFetch( tex, ivec3( uv, layer ), 0 );
+
+	}
+
+	vec4 textureSampleBarycoord( sampler2DArray tex, int layer, vec3 barycoord, uvec3 faceIndices ) {
+
+		return
+			barycoord.x * texelFetch1D( tex, layer, faceIndices.x ) +
+			barycoord.y * texelFetch1D( tex, layer, faceIndices.y ) +
+			barycoord.z * texelFetch1D( tex, layer, faceIndices.z );
+
+	}
+
+`;