three-gpu-pathtracer 0.0.20 → 0.0.21

package/src/uniforms/RenderTarget2DArray.js

@@ -9,37 +9,63 @@ import {
 	ShaderMaterial,
 } from 'three';
 import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
-import { reduceTexturesToUniqueSources } from './utils.js';
 
 const prevColor = new Color();
+function getTextureHash( texture ) {
+
+	return texture ? `${ texture.uuid }:${ texture.version }` : null;
+
+}
+
+function assignOptions( target, options ) {
+
+	for ( const key in options ) {
+
+		if ( key in target ) {
+
+			target[ key ] = options[ key ];
+
+		}
+
+	}
+
+}
+
 export class RenderTarget2DArray extends WebGLArrayRenderTarget {
 
-	constructor( ...args ) {
+	constructor( width, height, options ) {
+
+		const textureOptions = {
+			format: RGBAFormat,
+			type: UnsignedByteType,
+			minFilter: LinearFilter,
+			magFilter: LinearFilter,
+			wrapS: RepeatWrapping,
+			wrapT: RepeatWrapping,
+			generateMipmaps: false,
+			...options,
+		};
+
+		super( width, height, 1, textureOptions );
 
-		super( ...args );
+		// manually assign the options because passing options into the
+		// constructor does not work
+		assignOptions( this.texture, textureOptions );
 
-		const tex = this.texture;
-		tex.format = RGBAFormat;
-		tex.type = UnsignedByteType;
-		tex.minFilter = LinearFilter;
-		tex.magFilter = LinearFilter;
-		tex.wrapS = RepeatWrapping;
-		tex.wrapT = RepeatWrapping;
-		tex.setTextures = ( ...args ) => {
+		this.texture.setTextures = ( ...args ) => {
 
 			this.setTextures( ...args );
 
 		};
 
+		this.hashes = [ null ];
+
 		const fsQuad = new FullScreenQuad( new CopyMaterial() );
 		this.fsQuad = fsQuad;
 
 	}
 
-	setTextures( renderer, width, height, textures ) {
-
-		// get the list of textures with unique sources
-		const uniqueTextures = reduceTexturesToUniqueSources( textures );
+	setTextures( renderer, textures, width = this.width, height = this.height ) {
 
 		// save previous renderer state
 		const prevRenderTarget = renderer.getRenderTarget();
@@ -49,17 +75,26 @@ export class RenderTarget2DArray extends WebGLArrayRenderTarget {
 
 		// resize the render target and ensure we don't have an empty texture
 		// render target depth must be >= 1 to avoid unbound texture error on android devices
-		const depth = uniqueTextures.length || 1;
-		this.setSize( width, height, depth );
+		const depth = textures.length || 1;
+		if ( width !== this.width || height !== this.height || this.depth !== depth ) {
+
+			this.setSize( width, height, depth );
+			this.hashes = new Array( depth ).fill( null );
+
+		}
+
 		renderer.setClearColor( 0, 0 );
 		renderer.toneMapping = NoToneMapping;
 
 		// render each texture into each layer of the target
 		const fsQuad = this.fsQuad;
+		const hashes = this.hashes;
+		let updated = false;
 		for ( let i = 0, l = depth; i < l; i ++ ) {
 
-			const texture = uniqueTextures[ i ];
-			if ( texture ) {
+			const texture = textures[ i ];
+			const hash = getTextureHash( texture );
+			if ( texture && ( hashes[ i ] !== hash || texture.isWebGLRenderTarget ) ) {
 
 				// revert to default texture transform before rendering
 				texture.matrixAutoUpdate = false;
@@ -74,6 +109,10 @@ export class RenderTarget2DArray extends WebGLArrayRenderTarget {
 				texture.updateMatrix();
 				texture.matrixAutoUpdate = true;
 
+				// ensure textures are not updated unnecessarily
+				hashes[ i ] = hash;
+				updated = true;
+
 			}
 
 		}
@@ -84,6 +123,8 @@ export class RenderTarget2DArray extends WebGLArrayRenderTarget {
 		renderer.setRenderTarget( prevRenderTarget );
 		renderer.toneMapping = prevToneMapping;
 
+		return updated;
+
 	}
 
 	dispose() {
@@ -140,5 +181,4 @@ class CopyMaterial extends ShaderMaterial {
 
 	}
 
-
 }

package/src/utils/BlurredEnvMapGenerator.js

@@ -1,7 +1,7 @@
-import { WebGLRenderTarget, RGBAFormat, HalfFloatType, PMREMGenerator, DataTexture, EquirectangularReflectionMapping } from 'three';
+import { WebGLRenderTarget, RGBAFormat, HalfFloatType, PMREMGenerator, DataTexture, EquirectangularReflectionMapping, FloatType, DataUtils } from 'three';
 import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
 import { MaterialBase } from '../materials/MaterialBase.js';
-import { utilsGLSL } from '../shader/common/utils.glsl.js';
+import * as CommonGLSL from '../shader/common/index.js';
 
 class PMREMCopyMaterial extends MaterialBase {
 
@@ -31,7 +31,7 @@ class PMREMCopyMaterial extends MaterialBase {
 				#include <common>
 				#include <cube_uv_reflection_fragment>
 
-				${ utilsGLSL }
+				${ CommonGLSL.util_functions }
 
 				uniform sampler2D envMap;
 				uniform float blur;
@@ -58,7 +58,7 @@ export class BlurredEnvMapGenerator {
 		this.renderer = renderer;
 		this.pmremGenerator = new PMREMGenerator( renderer );
 		this.copyQuad = new FullScreenQuad( new PMREMCopyMaterial() );
-		this.renderTarget = new WebGLRenderTarget( 1, 1, { type: HalfFloatType, format: RGBAFormat } );
+		this.renderTarget = new WebGLRenderTarget( 1, 1, { type: FloatType, format: RGBAFormat } );
 
 	}
 
@@ -96,7 +96,14 @@ export class BlurredEnvMapGenerator {
 
 		// read the data back
 		const buffer = new Uint16Array( width * height * 4 );
-		renderer.readRenderTargetPixels( renderTarget, 0, 0, width, height, buffer );
+		const readBuffer = new Float32Array( width * height * 4 );
+		renderer.readRenderTargetPixels( renderTarget, 0, 0, width, height, readBuffer );
+
+		for ( let i = 0, l = readBuffer.length; i < l; i ++ ) {
+
+			buffer[ i ] = DataUtils.toHalfFloat( readBuffer[ i ] );
+
+		}
 
 		const result = new DataTexture( buffer, width, height, RGBAFormat, HalfFloatType );
 		result.minFilter = texture.minFilter;

package/src/utils/SobolNumberMapGenerator.js

@@ -1,7 +1,7 @@
 import { FloatType, NearestFilter, NoBlending, RGBAFormat, Vector2, WebGLRenderTarget } from 'three';
 import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
 import { MaterialBase } from '../materials/MaterialBase.js';
-import { sobolCommonGLSL, sobolGenerationGLSL } from '../shader/rand/sobol.glsl.js';
+import { sobol_common, sobol_point_generation } from '../shader/rand/sobol.glsl.js';
 
 class SobolNumbersMaterial extends MaterialBase {
 
@@ -30,8 +30,8 @@ class SobolNumbersMaterial extends MaterialBase {
 
 			fragmentShader: /* glsl */`
 
-				${ sobolCommonGLSL }
-				${ sobolGenerationGLSL }
+				${ sobol_common }
+				${ sobol_point_generation }
 
 				varying vec2 vUv;
 				uniform vec2 resolution;

package/src/utils/bufferToHash.js

@@ -0,0 +1,22 @@
+// https://www.geeksforgeeks.org/how-to-create-hash-from-string-in-javascript/
+// https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
+export function bufferToHash( buffer ) {
+
+	let hash = 0;
+
+	if ( buffer.byteLength !== 0 ) {
+
+		const uintArray = new Uint8Array( buffer );
+		for ( let i = 0; i < buffer.byteLength; i ++ ) {
+
+			const byte = uintArray[ i ];
+			hash = ( ( hash << 5 ) - hash ) + byte;
+			hash |= 0;
+
+		}
+
+	}
+
+	return hash;
+
+}

package/src/core/DynamicPathTracingSceneGenerator.js

@@ -1,164 +0,0 @@
-import { BufferGeometry, MeshBasicMaterial, BufferAttribute, Mesh } from 'three';
-import { StaticGeometryGenerator, MeshBVH, SAH } from 'three-mesh-bvh';
-import { setCommonAttributes, getGroupMaterialIndicesAttribute } from '../utils/GeometryPreparationUtils.js';
-
-const dummyMaterial = new MeshBasicMaterial();
-export function getDummyMesh() {
-
-	const emptyGeometry = new BufferGeometry();
-	emptyGeometry.setAttribute( 'position', new BufferAttribute( new Float32Array( 9 ), 3 ) );
-	return new Mesh( emptyGeometry, dummyMaterial );
-
-}
-
-export class DynamicPathTracingSceneGenerator {
-
-	get initialized() {
-
-		return Boolean( this.bvh );
-
-	}
-
-	constructor( objects ) {
-
-		// ensure the objects is an array
-		if ( ! Array.isArray( objects ) ) {
-
-			objects = [ objects ];
-
-		}
-
-		// use a dummy object for a fallback
-		const finalObjects = [ ...objects ];
-		if ( finalObjects.length === 0 ) {
-
-			finalObjects.push( getDummyMesh() );
-
-		}
-
-		// options
-		this.bvhOptions = {};
-		this.attributes = [ 'position', 'normal', 'tangent', 'color', 'uv', 'uv2' ];
-
-		// state
-		this.objects = finalObjects;
-		this.bvh = null;
-		this.geometry = new BufferGeometry();
-		this.materials = null;
-		this.textures = null;
-		this.lights = [];
-		this.staticGeometryGenerator = new StaticGeometryGenerator( this.objects );
-
-	}
-
-	reset() {
-
-		this.bvh = null;
-		this.geometry.dispose();
-		this.geometry = new BufferGeometry();
-		this.materials = null;
-		this.textures = null;
-		this.lights = [];
-		this.staticGeometryGenerator = new StaticGeometryGenerator( this.objects );
-
-	}
-
-	dispose() {}
-
-	prepScene() {
-
-		if ( this.bvh !== null ) {
-
-			return;
-
-		}
-
-		const { objects, staticGeometryGenerator, geometry, lights, attributes } = this;
-		for ( let i = 0, l = objects.length; i < l; i ++ ) {
-
-			objects[ i ].traverse( c => {
-
-				if ( c.isMesh ) {
-
-					const normalMapRequired = ! ! c.material.normalMap;
-					setCommonAttributes( c.geometry, { attributes, normalMapRequired } );
-
-				} else if (
-					c.isRectAreaLight ||
-					c.isSpotLight ||
-					c.isPointLight ||
-					c.isDirectionalLight
-				) {
-
-					lights.push( c );
-
-				}
-
-			} );
-
-		}
-
-		const textureSet = new Set();
-		const materials = staticGeometryGenerator.getMaterials();
-		materials.forEach( material => {
-
-			for ( const key in material ) {
-
-				const value = material[ key ];
-				if ( value && value.isTexture ) {
-
-					textureSet.add( value );
-
-				}
-
-			}
-
-		} );
-
-		staticGeometryGenerator.attributes = attributes;
-		staticGeometryGenerator.generate( geometry );
-
-		const materialIndexAttribute = getGroupMaterialIndicesAttribute( geometry, materials, materials );
-		geometry.setAttribute( 'materialIndex', materialIndexAttribute );
-		geometry.clearGroups();
-
-		this.materials = materials;
-		this.textures = Array.from( textureSet );
-
-	}
-
-	generate() {
-
-		const { objects, staticGeometryGenerator, geometry, bvhOptions } = this;
-		if ( this.bvh === null ) {
-
-			this.prepScene();
-			this.bvh = new MeshBVH( geometry, { strategy: SAH, maxLeafTris: 1, ...bvhOptions } );
-
-			return {
-				lights: this.lights,
-				bvh: this.bvh,
-				materials: this.materials,
-				textures: this.textures,
-				objects,
-			};
-
-		} else {
-
-			const { bvh } = this;
-			staticGeometryGenerator.generate( geometry );
-			bvh.refit();
-			return {
-				lights: this.lights,
-				bvh: this.bvh,
-				materials: this.materials,
-				textures: this.textures,
-				objects,
-			};
-
-		}
-
-	}
-
-
-}

package/src/core/MaterialReducer.js

@@ -1,256 +0,0 @@
-// https://github.com/gkjohnson/webxr-sandbox/blob/main/skinned-mesh-batching/src/MaterialReducer.js
-
-function isTypedArray( arr ) {
-
-	return arr.buffer instanceof ArrayBuffer && 'BYTES_PER_ELEMENT' in arr;
-
-}
-
-export class MaterialReducer {
-
-	constructor() {
-
-		const ignoreKeys = new Set();
-		ignoreKeys.add( 'uuid' );
-
-		this.ignoreKeys = ignoreKeys;
-		this.shareTextures = true;
-		this.textures = [];
-		this.materials = [];
-
-	}
-
-	areEqual( objectA, objectB ) {
-
-		const keySet = new Set();
-		const traverseSet = new Set();
-		const ignoreKeys = this.ignoreKeys;
-
-		const traverse = ( a, b ) => {
-
-			if ( a === b ) {
-
-				return true;
-
-			}
-
-			if ( a && b && a instanceof Object && b instanceof Object ) {
-
-				if ( traverseSet.has( a ) || traverseSet.has( b ) ) {
-
-					throw new Error( 'MaterialReducer: Material is recursive.' );
-
-				}
-
-				const aIsElement = a instanceof Element;
-				const bIsElement = b instanceof Element;
-				if ( aIsElement || bIsElement ) {
-
-					if ( aIsElement !== bIsElement || ! ( a instanceof Image ) || ! ( b instanceof Image ) ) {
-
-						return false;
-
-					}
-
-					return a.src === b.src;
-
-				}
-
-				const aIsImageBitmap = a instanceof ImageBitmap;
-				const bIsImageBitmap = b instanceof ImageBitmap;
-				if ( aIsImageBitmap || bIsImageBitmap ) {
-
-					return false;
-
-				}
-
-				if ( a.equals ) {
-
-					return a.equals( b );
-
-				}
-
-				const aIsTypedArray = isTypedArray( a );
-				const bIsTypedArray = isTypedArray( b );
-				if ( aIsTypedArray || bIsTypedArray ) {
-
-					if ( aIsTypedArray !== bIsTypedArray || a.constructor !== b.constructor || a.length !== b.length ) {
-
-						return false;
-
-					}
-
-					for ( let i = 0, l = a.length; i < l; i ++ ) {
-
-						if ( a[ i ] !== b[ i ] ) return false;
-
-					}
-
-					return true;
-
-				}
-
-				traverseSet.add( a );
-				traverseSet.add( b );
-
-				keySet.clear();
-				for ( const key in a ) {
-
-					if ( ! a.hasOwnProperty( key ) || a[ key ] instanceof Function || ignoreKeys.has( key ) ) {
-
-						continue;
-
-					}
-
-					keySet.add( key );
-
-				}
-
-				for ( const key in b ) {
-
-					if ( ! b.hasOwnProperty( key ) || b[ key ] instanceof Function || ignoreKeys.has( key ) ) {
-
-						continue;
-
-					}
-
-					keySet.add( key );
-
-				}
-
-				const keys = Array.from( keySet.values() );
-				let result = true;
-				for ( const i in keys ) {
-
-					const key = keys[ i ];
-					if ( ignoreKeys.has( key ) ) {
-
-						continue;
-
-					}
-
-					result = traverse( a[ key ], b[ key ] );
-					if ( ! result ) {
-
-						break;
-
-					}
-
-				}
-
-				traverseSet.delete( a );
-				traverseSet.delete( b );
-				return result;
-
-			}
-
-			return false;
-
-		};
-
-		return traverse( objectA, objectB );
-
-	}
-
-	process( object ) {
-
-		const { textures, materials } = this;
-		let replaced = 0;
-
-		const processMaterial = material => {
-
-			// Check if another material matches this one
-			let foundMaterial = null;
-			for ( const i in materials ) {
-
-				const otherMaterial = materials[ i ];
-				if ( this.areEqual( material, otherMaterial ) ) {
-
-					foundMaterial = otherMaterial;
-
-				}
-
-			}
-
-			if ( foundMaterial ) {
-
-				replaced ++;
-				return foundMaterial;
-
-			} else {
-
-				materials.push( material );
-
-				if ( this.shareTextures ) {
-
-					// See if there's another texture that matches the ones on this material
-					for ( const key in material ) {
-
-						if ( ! material.hasOwnProperty( key ) ) continue;
-
-						const value = material[ key ];
-						if ( value && value.isTexture && value.image instanceof Image ) {
-
-							let foundTexture = null;
-							for ( const i in textures ) {
-
-								const texture = textures[ i ];
-								if ( this.areEqual( texture, value ) ) {
-
-									foundTexture = texture;
-									break;
-
-								}
-
-							}
-
-							if ( foundTexture ) {
-
-								material[ key ] = foundTexture;
-
-							} else {
-
-								textures.push( value );
-
-							}
-
-						}
-
-					}
-
-				}
-
-				return material;
-
-			}
-
-		};
-
-		object.traverse( c => {
-
-			if ( c.isMesh && c.material ) {
-
-				const material = c.material;
-				if ( Array.isArray( material ) ) {
-
-					for ( let i = 0; i < material.length; i ++ ) {
-
-						material[ i ] = processMaterial( material[ i ] );
-
-					}
-
-				} else {
-
-					c.material = processMaterial( material );
-
-				}
-
-			}
-
-		} );
-
-		return { replaced, retained: materials.length };
-
-	}
-
-}