three-gpu-pathtracer 0.0.20 → 0.0.21

package/src/shader/{common/bvhAnyHit.glsl.js → bvh/ray_any_hit_function.glsl.js}

@@ -1,4 +1,4 @@
-export const bvhAnyHitGLSL = /* glsl */`
+export const ray_any_hit_function = /* glsl */`
 
 	bool bvhIntersectAnyHit(
 		vec3 rayOrigin, vec3 rayDirection,

package/src/shader/common/{fresnel.glsl.js → fresnel_functions.glsl.js}

@@ -1,4 +1,4 @@
-export const fresnelGLSL = /* glsl */`
+export const fresnel_functions = /* glsl */`
 
 	bool totalInternalReflection( float cosTheta, float eta ) {
 

package/src/shader/common/index.js

@@ -0,0 +1,5 @@
+export * from './fresnel_functions.glsl.js';
+export * from './math_functions.glsl.js';
+export * from './shape_intersection_functions.glsl.js';
+export * from './texture_sample_functions.glsl.js';
+export * from './util_functions.glsl.js';

package/src/shader/common/{math.glsl.js → math_functions.glsl.js}

@@ -1,4 +1,4 @@
-export const mathGLSL = /* glsl */`
+export const math_functions = /* glsl */`
 
 	// Fast arccos approximation used to remove banding artifacts caused by numerical errors in acos.
 	// This is a cubic Lagrange interpolating polynomial for x = [-1, -1/2, 0, 1/2, 1].

package/src/shader/common/{intersectShapes.glsl.js → shape_intersection_functions.glsl.js}

@@ -1,4 +1,4 @@
-export const intersectShapesGLSL = /* glsl */`
+export const shape_intersection_functions = /* glsl */`
 
 	// Finds the point where the ray intersects the plane defined by u and v and checks if this point
 	// falls in the bounds of the rectangle on that same plane.

package/src/shader/common/{arraySamplerTexelFetch.glsl.js → texture_sample_functions.glsl.js}

@@ -1,5 +1,5 @@
 
-export const arraySamplerTexelFetchGLSL = /*glsl */`
+export const texture_sample_functions = /*glsl */`
 
 	// add texel fetch functions for texture arrays
 	vec4 texelFetch1D( sampler2DArray tex, int layer, uint index ) {

package/src/shader/common/{utils.glsl.js → util_functions.glsl.js}

@@ -1,4 +1,4 @@
-export const utilsGLSL = /* glsl */`
+export const util_functions = /* glsl */`
 
 	// TODO: possibly this should be renamed something related to material or path tracing logic
 

package/src/shader/rand/index.js

@@ -0,0 +1,3 @@
+export * from './pcg.glsl.js';
+export * from './sobol.glsl.js';
+export * from './stratified.glsl.js';

package/src/shader/rand/pcg.glsl.js

@@ -1,4 +1,4 @@
-export const pcgGLSL = /* glsl */`
+export const pcg_functions = /* glsl */`
 
 	// https://www.shadertoy.com/view/wltcRS
 	uvec4 WHITE_NOISE_SEED;

package/src/shader/rand/sobol.glsl.js

@@ -105,7 +105,7 @@ function generateSobolSampleFunctions( dim = 1 ) {
 
 }
 
-export const sobolCommonGLSL = /* glsl */`
+export const sobol_common = /* glsl */`
 
 	// Utils
 	const float SOBOL_FACTOR = 1.0 / 16777216.0;
@@ -130,7 +130,7 @@ export const sobolCommonGLSL = /* glsl */`
 
 `;
 
-export const sobolGenerationGLSL = /* glsl */`
+export const sobol_point_generation = /* glsl */`
 
 	const uint SOBOL_DIRECTIONS_1[ 32 ] = uint[ 32 ](
 		0x80000000u, 0xc0000000u, 0xa0000000u, 0xf0000000u,
@@ -197,7 +197,7 @@ export const sobolGenerationGLSL = /* glsl */`
 
 		}
 
-		// NOTEL this sobol "direction" is also available but we can't write out 5 components
+		// NOTE: this sobol "direction" is also available but we can't write out 5 components
 		// uint x = index & 0x00ffffffu;
 		uint x = sobolReverseBits( getMaskedSobol( index, SOBOL_DIRECTIONS_1 ) ) & 0x00ffffffu;
 		uint y = sobolReverseBits( getMaskedSobol( index, SOBOL_DIRECTIONS_2 ) ) & 0x00ffffffu;
@@ -210,7 +210,7 @@ export const sobolGenerationGLSL = /* glsl */`
 
 `;
 
-export const sobolSamplingGLSL = /* glsl */`
+export const sobol_functions = /* glsl */`
 
 	// Seeds
 	uniform sampler2D sobolTexture;

package/src/shader/rand/{stratifiedTexture.glsl.js → stratified.glsl.js}

@@ -1,4 +1,4 @@
-export const stratifiedTextureGLSL = /* glsl */`
+export const stratified_functions = /* glsl */`
 
 	uniform sampler2D stratifiedTexture;
 	uniform sampler2D stratifiedOffsetTexture;
@@ -38,7 +38,12 @@ export const stratifiedTextureGLSL = /* glsl */`
 
 		// tile the small noise texture across the entire screen
 		ivec2 noiseSize = ivec2( textureSize( stratifiedOffsetTexture, 0 ) );
-		pixelSeed = texelFetch( stratifiedOffsetTexture, ivec2( screenCoord.xy ) % noiseSize, 0 );
+		ivec2 pixel = ivec2( screenCoord.xy ) % noiseSize;
+		vec2 pixelWidth = 1.0 / vec2( noiseSize );
+		vec2 uv = vec2( pixel ) * pixelWidth + pixelWidth * 0.5;
+
+		// note that using "texelFetch" here seems to break Android for some reason
+		pixelSeed = texture( stratifiedOffsetTexture, uv );
 
 	}
 

package/src/shader/sampling/{equirectSampling.glsl.js → equirect_sampling_functions.glsl.js}

@@ -1,4 +1,4 @@
-export const equirectSamplingGLSL = /* glsl */`
+export const equirect_functions = /* glsl */`
 
 	// samples the the given environment map in the given direction
 	vec3 sampleEquirectColor( sampler2D envMap, vec3 direction ) {
@@ -65,5 +65,4 @@ export const equirectSamplingGLSL = /* glsl */`
 		return float( resolution.x * resolution.y ) * pdf * equirectDirectionPdf( direction );
 
 	}
-
 `;

package/src/shader/sampling/index.js

@@ -0,0 +1,3 @@
+export * from './equirect_sampling_functions.glsl.js';
+export * from './light_sampling_functions.glsl.js';
+export * from './shape_sampling_functions.glsl.js';

package/src/shader/sampling/{lightSampling.glsl.js → light_sampling_functions.glsl.js}

@@ -1,4 +1,4 @@
-export const lightSamplingGLSL = /* glsl */`
+export const light_sampling_functions = /* glsl */`
 
 	float getSpotAttenuation( const in float coneCosine, const in float penumbraCosine, const in float angleCosine ) {
 
@@ -26,9 +26,9 @@ export const lightSamplingGLSL = /* glsl */`
 	float getPhotometricAttenuation( sampler2DArray iesProfiles, int iesProfile, vec3 posToLight, vec3 lightDir, vec3 u, vec3 v ) {
 
 		float cosTheta = dot( posToLight, lightDir );
-		float angle = acos( cosTheta ) * ( 1.0 / PI );
+		float angle = acos( cosTheta ) / PI;
 
-		return texture2D( iesProfiles, vec3( 0.0, angle, iesProfile ) ).r;
+		return texture2D( iesProfiles, vec3( angle, 0.0, iesProfile ) ).r;
 
 	}
 

package/src/shader/sampling/{shapeSampling.glsl.js → shape_sampling_functions.glsl.js}

@@ -1,4 +1,4 @@
-export const shapeSamplingGLSL = /* glsl */`
+export const shape_sampling_functions = /* glsl */`
 
 	vec3 sampleHemisphere( vec3 n, vec2 uv ) {
 

package/src/shader/structs/{cameraStruct.glsl.js → camera_struct.glsl.js}

@@ -1,4 +1,4 @@
-export const cameraStructGLSL = /* glsl */`
+export const camera_struct = /* glsl */`
 
 	struct PhysicalCamera {
 

package/src/shader/structs/{equirectStruct.glsl.js → equirect_struct.glsl.js}

@@ -1,4 +1,4 @@
-export const equirectStructGLSL = /* glsl */`
+export const equirect_struct = /* glsl */`
 
 	struct EquirectHdrInfo {
 

package/src/shader/structs/index.js

@@ -0,0 +1,5 @@
+export * from './camera_struct.glsl.js';
+export * from './equirect_struct.glsl.js';
+export * from './lights_struct.glsl.js';
+export * from './material_struct.glsl.js';
+export * from './surface_record_struct.glsl.js';

package/src/shader/structs/{lightsStruct.glsl.js → lights_struct.glsl.js}

@@ -1,4 +1,4 @@
-export const lightsStructGLSL = /* glsl */`
+export const lights_struct = /* glsl */`
 
 	#define RECT_AREA_LIGHT_TYPE 0
 	#define CIRC_AREA_LIGHT_TYPE 1

package/src/shader/structs/{materialStruct.glsl.js → material_struct.glsl.js}

@@ -1,4 +1,4 @@
-export const materialStructGLSL = /* glsl */ `
+export const material_struct = /* glsl */ `
 
 	struct Material {
 
@@ -176,7 +176,7 @@ export const materialStructGLSL = /* glsl */ `
 		m.side = s13.a;
 
 		m.matte = bool( s14.r );
-		m.castShadow = ! bool( s14.g );
+		m.castShadow = bool( s14.g );
 		m.vertexColors = bool( int( s14.b ) & 1 );
 		m.flatShading = bool( int( s14.b ) & 2 );
 		m.fogVolume = bool( int( s14.b ) & 4 );

package/src/shader/structs/surface_record_struct.glsl.js

@@ -0,0 +1,63 @@
+export const surface_record_struct = /* glsl */`
+
+	struct SurfaceRecord {
+
+		// surface type
+		bool volumeParticle;
+
+		// geometry
+		vec3 faceNormal;
+		bool frontFace;
+		vec3 normal;
+		mat3 normalBasis;
+		mat3 normalInvBasis;
+
+		// cached properties
+		float eta;
+		float f0;
+
+		// material
+		float roughness;
+		float filteredRoughness;
+		float metalness;
+		vec3 color;
+		vec3 emission;
+
+		// transmission
+		float ior;
+		float transmission;
+		bool thinFilm;
+		vec3 attenuationColor;
+		float attenuationDistance;
+
+		// clearcoat
+		vec3 clearcoatNormal;
+		mat3 clearcoatBasis;
+		mat3 clearcoatInvBasis;
+		float clearcoat;
+		float clearcoatRoughness;
+		float filteredClearcoatRoughness;
+
+		// sheen
+		float sheen;
+		vec3 sheenColor;
+		float sheenRoughness;
+
+		// iridescence
+		float iridescence;
+		float iridescenceIor;
+		float iridescenceThickness;
+
+		// specular
+		vec3 specularColor;
+		float specularIntensity;
+	};
+
+	struct ScatterRecord {
+		float specularPdf;
+		float pdf;
+		vec3 direction;
+		vec3 color;
+	};
+
+`;

package/src/uniforms/EquirectHdrInfoUniform.js

@@ -136,15 +136,15 @@ export class EquirectHdrInfoUniform {
 
 		// Default to a white texture and associated weights so we don't
 		// just render black initially.
-		const whiteTex = new DataTexture( toHalfFloatArray( new Float32Array( [ 1, 1, 1, 1 ] ) ), 1, 1 );
-		whiteTex.type = HalfFloatType;
-		whiteTex.format = RGBAFormat;
-		whiteTex.minFilter = LinearFilter;
-		whiteTex.magFilter = LinearFilter;
-		whiteTex.wrapS = RepeatWrapping;
-		whiteTex.wrapT = RepeatWrapping;
-		whiteTex.generateMipmaps = false;
-		whiteTex.needsUpdate = true;
+		const blackTex = new DataTexture( toHalfFloatArray( new Float32Array( [ 0, 0, 0, 0 ] ) ), 1, 1 );
+		blackTex.type = HalfFloatType;
+		blackTex.format = RGBAFormat;
+		blackTex.minFilter = LinearFilter;
+		blackTex.magFilter = LinearFilter;
+		blackTex.wrapS = RepeatWrapping;
+		blackTex.wrapT = RepeatWrapping;
+		blackTex.generateMipmaps = false;
+		blackTex.needsUpdate = true;
 
 		// Stores a map of [0, 1] value -> cumulative importance row & pdf
 		// used to sampling a random value to a relevant row to sample from
@@ -166,10 +166,15 @@ export class EquirectHdrInfoUniform {
 		conditionalWeights.generateMipmaps = false;
 		conditionalWeights.needsUpdate = true;
 
-		this.map = whiteTex;
+		this.map = blackTex;
 		this.marginalWeights = marginalWeights;
 		this.conditionalWeights = conditionalWeights;
-		this.totalSum = 1;
+		this.totalSum = 0;
+
+		// TODO: Add support for float or half float types here. We need to pass this into
+		// the preprocess function and ensure our CDF and MDF textures are appropriately sized
+		// Ideally we wouldn't upscale a bit depth if we didn't need to.
+		// this.type = HalfFloatType;
 
 	}
 

package/src/uniforms/LightsInfoUniformStruct.js

@@ -1,4 +1,5 @@
 import { DataTexture, RGBAFormat, ClampToEdgeWrapping, FloatType, Vector3, Quaternion, Matrix4, NearestFilter } from 'three';
+import { bufferToHash } from '../utils/bufferToHash.js';
 
 const LIGHT_PIXELS = 6;
 const RECT_AREA_LIGHT = 0;
@@ -6,6 +7,14 @@ const CIRC_AREA_LIGHT = 1;
 const SPOT_LIGHT = 2;
 const DIR_LIGHT = 3;
 const POINT_LIGHT = 4;
+
+const u = new Vector3();
+const v = new Vector3();
+const m = new Matrix4();
+const worldQuaternion = new Quaternion();
+const eye = new Vector3();
+const target = new Vector3();
+const up = new Vector3( 0, 1, 0 );
 export class LightsInfoUniformStruct {
 
 	constructor() {
@@ -42,14 +51,6 @@ export class LightsInfoUniformStruct {
 
 		const floatArray = tex.image.data;
 
-		const u = new Vector3();
-		const v = new Vector3();
-		const m = new Matrix4();
-		const worldQuaternion = new Quaternion();
-		const eye = new Vector3();
-		const target = new Vector3();
-		const up = new Vector3( 0, 1, 0 );
-
 		for ( let i = 0, l = lights.length; i < l; i ++ ) {
 
 			const l = lights[ i ];
@@ -172,7 +173,7 @@ export class LightsInfoUniformStruct {
 				floatArray[ baseIndex + ( index ++ ) ] = Math.cos( l.angle * ( 1 - l.penumbra ) );
 
 				// iesProfile
-				floatArray[ baseIndex + ( index ++ ) ] = l.iesTexture ? iesTextures.indexOf( l.iesTexture ) : - 1;
+				floatArray[ baseIndex + ( index ++ ) ] = l.iesMap ? iesTextures.indexOf( l.iesMap ) : - 1;
 
 			} else if ( l.isPointLight ) {
 
@@ -210,9 +211,19 @@ export class LightsInfoUniformStruct {
 
 		}
 
-		tex.needsUpdate = true;
 		this.count = lights.length;
 
+		const hash = bufferToHash( floatArray.buffer );
+		if ( this.hash !== hash ) {
+
+			this.hash = hash;
+			tex.needsUpdate = true;
+			return true;
+
+		}
+
+		return false;
+
 	}
 
 }

package/src/uniforms/MaterialsTexture.js

@@ -1,12 +1,10 @@
 import { DataTexture, RGBAFormat, ClampToEdgeWrapping, FloatType, FrontSide, BackSide, DoubleSide, NearestFilter } from 'three';
-import { reduceTexturesToUniqueSources, getTextureHash } from './utils.js';
+import { getTextureHash } from '../core/utils/sceneUpdateUtils.js';
+import { bufferToHash } from '../utils/bufferToHash.js';
 
 const MATERIAL_PIXELS = 45;
 const MATERIAL_STRIDE = MATERIAL_PIXELS * 4;
 
-const MATTE_OFFSET = 14 * 4 + 0; // s14.r
-const SHADOW_OFFSET = 14 * 4 + 1; // s14.g
-
 class MaterialFeatures {
 
 	constructor() {
@@ -56,44 +54,10 @@ export class MaterialsTexture extends DataTexture {
 		this.minFilter = NearestFilter;
 		this.magFilter = NearestFilter;
 		this.generateMipmaps = false;
-		this.threeCompatibilityTransforms = false;
 		this.features = new MaterialFeatures();
 
 	}
 
-	setCastShadow( materialIndex, cast ) {
-
-		// invert the shadow value so we default to "true" when initializing a material
-		const array = this.image.data;
-		const index = materialIndex * MATERIAL_STRIDE + SHADOW_OFFSET;
-		array[ index ] = ! cast ? 1 : 0;
-
-	}
-
-	getCastShadow( materialIndex ) {
-
-		const array = this.image.data;
-		const index = materialIndex * MATERIAL_STRIDE + SHADOW_OFFSET;
-		return ! Boolean( array[ index ] );
-
-	}
-
-	setMatte( materialIndex, matte ) {
-
-		const array = this.image.data;
-		const index = materialIndex * MATERIAL_STRIDE + MATTE_OFFSET;
-		array[ index ] = matte ? 1 : 0;
-
-	}
-
-	getMatte( materialIndex ) {
-
-		const array = this.image.data;
-		const index = materialIndex * MATERIAL_STRIDE + MATTE_OFFSET;
-		return Boolean( array[ index ] );
-
-	}
-
 	updateFrom( materials, textures ) {
 
 		function getTexture( material, key, def = - 1 ) {
@@ -101,7 +65,7 @@ export class MaterialsTexture extends DataTexture {
 			if ( key in material && material[ key ] ) {
 
 				const hash = getTextureHash( material[ key ] );
-				return uniqueTextureLookup[ hash ];
+				return textureLookUp[ hash ];
 
 			} else {
 
@@ -117,50 +81,18 @@ export class MaterialsTexture extends DataTexture {
 
 		}
 
-		function getUVTransformTexture( material ) {
-
-			// https://github.com/mrdoob/three.js/blob/f3a832e637c98a404c64dae8174625958455e038/src/renderers/webgl/WebGLMaterials.js#L204-L306
-			// https://threejs.org/docs/#api/en/textures/Texture.offset
-			// fallback order of textures to use as a common uv transform
-			return material.map ||
-				material.specularMap ||
-				material.displacementMap ||
-				material.normalMap ||
-				material.bumpMap ||
-				material.roughnessMap ||
-				material.metalnessMap ||
-				material.alphaMap ||
-				material.emissiveMap ||
-				material.clearcoatMap ||
-				material.clearcoatNormalMap ||
-				material.clearcoatRoughnessMap ||
-				material.iridescenceMap ||
-				material.iridescenceThicknessMap ||
-				material.specularIntensityMap ||
-				material.specularColorMap ||
-				material.transmissionMap ||
-				material.thicknessMap ||
-				material.sheenColorMap ||
-				material.sheenRoughnessMap ||
-				null;
-
-		}
-
 		function writeTextureMatrixToArray( material, textureKey, array, offset ) {
 
-			let texture;
-			if ( threeCompatibilityTransforms ) {
+			const texture = material[ textureKey ] && material[ textureKey ].isTexture ? material[ textureKey ] : null;
 
-				texture = getUVTransformTexture( material );
-
-			} else {
+			// check if texture exists
+			if ( texture ) {
 
-				texture = material[ textureKey ] && material[ textureKey ].isTexture ? material[ textureKey ] : null;
+				if ( texture.matrixAutoUpdate ) {
 
-			}
+					texture.updateMatrix();
 
-			// check if texture exists
-			if ( texture ) {
+				}
 
 				const elements = texture.matrix.elements;
 
@@ -187,14 +119,13 @@ export class MaterialsTexture extends DataTexture {
 		let index = 0;
 		const pixelCount = materials.length * MATERIAL_PIXELS;
 		const dimension = Math.ceil( Math.sqrt( pixelCount ) ) || 1;
-		const { threeCompatibilityTransforms, image, features } = this;
+		const { image, features } = this;
 
-		// get the list of textures with unique sources
-		const uniqueTextures = reduceTexturesToUniqueSources( textures );
-		const uniqueTextureLookup = {};
-		for ( let i = 0, l = uniqueTextures.length; i < l; i ++ ) {
+		// index the list of textures based on shareable source
+		const textureLookUp = {};
+		for ( let i = 0, l = textures.length; i < l; i ++ ) {
 
-			uniqueTextureLookup[ getTextureHash( uniqueTextures[ i ] ) ] = i;
+			textureLookUp[ getTextureHash( textures[ i ] ) ] = i;
 
 		}
 
@@ -446,8 +377,8 @@ export class MaterialsTexture extends DataTexture {
 			}
 
 			// sample 14
-			index ++; // matte
-			index ++; // shadow
+			floatArray[ index ++ ] = Number( getField( m, 'matte', false ) ); // matte
+			floatArray[ index ++ ] = Number( getField( m, 'castShadow', true ) ); // shadow
 			floatArray[ index ++ ] = Number( m.vertexColors ) | ( Number( m.flatShading ) << 1 ); // vertexColors & flatShading
 			floatArray[ index ++ ] = Number( m.transparent ); // transparent
 
@@ -498,7 +429,17 @@ export class MaterialsTexture extends DataTexture {
 
 		}
 
-		this.needsUpdate = true;
+		// check if the contents have changed
+		const hash = bufferToHash( floatArray.buffer );
+		if ( this.hash !== hash ) {
+
+			this.hash = hash;
+			this.needsUpdate = true;
+			return true;
+
+		}
+
+		return false;
 
 	}