three-gpu-pathtracer 0.0.1 → 0.0.4

package/src/utils/UVUnwrapper.js

@@ -1,101 +1,101 @@
-// https://github.com/mozilla/Spoke/commit/9701d647020e09d584885bd457eb225e9995c12f
-import XAtlas from 'xatlas-web';
-import { BufferGeometry, Float32BufferAttribute, Uint32BufferAttribute } from 'three';
-
-export class UVUnwrapper {
-
-	constructor() {
-
-		this._module = null;
-
-	}
-
-	async load() {
-
-		const wasmurl = new URL( '../../node_modules/xatlas-web/dist/xatlas-web.wasm', import.meta.url );
-		this._module = XAtlas( {
-
-			locateFile( path ) {
-
-				if ( path.endsWith( '.wasm' ) ) {
-
-					return wasmurl.toString();
-
-				}
-
-				return path;
-
-			}
-
-		} );
-		return this._module.ready;
-
-	}
-
-	generate( geometry ) {
-
-		const xatlas = this._module;
-		const originalVertexCount = geometry.attributes.position.count;
-		const originalIndexCount = geometry.index.count;
-
-		xatlas.createAtlas();
-
-		const meshInfo = xatlas.createMesh( originalVertexCount, originalIndexCount, true, true );
-		xatlas.HEAPU16.set( geometry.index.array, meshInfo.indexOffset / Uint16Array.BYTES_PER_ELEMENT );
-		xatlas.HEAPF32.set( geometry.attributes.position.array, meshInfo.positionOffset / Float32Array.BYTES_PER_ELEMENT );
-		xatlas.HEAPF32.set( geometry.attributes.normal.array, meshInfo.normalOffset / Float32Array.BYTES_PER_ELEMENT );
-		xatlas.HEAPF32.set( geometry.attributes.uv.array, meshInfo.uvOffset / Float32Array.BYTES_PER_ELEMENT );
-
-		const statusCode = xatlas.addMesh();
-		if ( statusCode !== AddMeshStatus.Success ) {
-
-			throw new Error( `UVUnwrapper: Error adding mesh. Status code ${ statusCode }` );
-
-		}
-
-		xatlas.generateAtlas();
-
-		const meshData = xatlas.getMeshData( meshInfo.meshId );
-		const oldPositionArray = geometry.attributes.position.array;
-		const oldNormalArray = geometry.attributes.normal.array;
-		const oldUvArray = geometry.attributes.uv.array;
-
-		const newPositionArray = new Float32Array( meshData.newVertexCount * 3 );
-		const newNormalArray = new Float32Array( meshData.newVertexCount * 3 );
-		const newUvArray = new Float32Array( meshData.newVertexCount * 2 );
-		const newUv2Array = new Float32Array( xatlas.HEAPF32.buffer, meshData.uvOffset, meshData.newVertexCount * 2 );
-		const newIndexArray = new Uint32Array( xatlas.HEAPU32.buffer, meshData.indexOffset, meshData.newIndexCount );
-		const originalIndexArray = new Uint32Array(
-			xatlas.HEAPU32.buffer,
-			meshData.originalIndexOffset,
-			meshData.newVertexCount
-		);
-
-		for ( let i = 0; i < meshData.newVertexCount; i ++ ) {
-
-			const originalIndex = originalIndexArray[ i ];
-			newPositionArray[ i * 3 ] = oldPositionArray[ originalIndex * 3 ];
-			newPositionArray[ i * 3 + 1 ] = oldPositionArray[ originalIndex * 3 + 1 ];
-			newPositionArray[ i * 3 + 2 ] = oldPositionArray[ originalIndex * 3 + 2 ];
-			newNormalArray[ i * 3 ] = oldNormalArray[ originalIndex * 3 ];
-			newNormalArray[ i * 3 + 1 ] = oldNormalArray[ originalIndex * 3 + 1 ];
-			newNormalArray[ i * 3 + 2 ] = oldNormalArray[ originalIndex * 3 + 2 ];
-			newUvArray[ i * 2 ] = oldUvArray[ originalIndex * 2 ];
-			newUvArray[ i * 2 + 1 ] = oldUvArray[ originalIndex * 2 + 1 ];
-
-		}
-
-		const newGeometry = new BufferGeometry();
-		newGeometry.addAttribute( 'position', new Float32BufferAttribute( newPositionArray, 3 ) );
-		newGeometry.addAttribute( 'normal', new Float32BufferAttribute( newNormalArray, 3 ) );
-		newGeometry.addAttribute( 'uv', new Float32BufferAttribute( newUvArray, 2 ) );
-		newGeometry.addAttribute( 'uv2', new Float32BufferAttribute( newUv2Array, 2 ) );
-		newGeometry.setIndex( new Uint32BufferAttribute( newIndexArray, 1 ) );
-
-		mesh.geometry = newGeometry;
-
-		xatlas.destroyAtlas();
-
-	}
-
-}
+// https://github.com/mozilla/Spoke/commit/9701d647020e09d584885bd457eb225e9995c12f
+import XAtlas from 'xatlas-web';
+import { BufferGeometry, Float32BufferAttribute, Uint32BufferAttribute } from 'three';
+
+export class UVUnwrapper {
+
+	constructor() {
+
+		this._module = null;
+
+	}
+
+	async load() {
+
+		const wasmurl = new URL( '../../node_modules/xatlas-web/dist/xatlas-web.wasm', import.meta.url );
+		this._module = XAtlas( {
+
+			locateFile( path ) {
+
+				if ( path.endsWith( '.wasm' ) ) {
+
+					return wasmurl.toString();
+
+				}
+
+				return path;
+
+			}
+
+		} );
+		return this._module.ready;
+
+	}
+
+	generate( geometry ) {
+
+		const xatlas = this._module;
+		const originalVertexCount = geometry.attributes.position.count;
+		const originalIndexCount = geometry.index.count;
+
+		xatlas.createAtlas();
+
+		const meshInfo = xatlas.createMesh( originalVertexCount, originalIndexCount, true, true );
+		xatlas.HEAPU16.set( geometry.index.array, meshInfo.indexOffset / Uint16Array.BYTES_PER_ELEMENT );
+		xatlas.HEAPF32.set( geometry.attributes.position.array, meshInfo.positionOffset / Float32Array.BYTES_PER_ELEMENT );
+		xatlas.HEAPF32.set( geometry.attributes.normal.array, meshInfo.normalOffset / Float32Array.BYTES_PER_ELEMENT );
+		xatlas.HEAPF32.set( geometry.attributes.uv.array, meshInfo.uvOffset / Float32Array.BYTES_PER_ELEMENT );
+
+		const statusCode = xatlas.addMesh();
+		if ( statusCode !== AddMeshStatus.Success ) {
+
+			throw new Error( `UVUnwrapper: Error adding mesh. Status code ${ statusCode }` );
+
+		}
+
+		xatlas.generateAtlas();
+
+		const meshData = xatlas.getMeshData( meshInfo.meshId );
+		const oldPositionArray = geometry.attributes.position.array;
+		const oldNormalArray = geometry.attributes.normal.array;
+		const oldUvArray = geometry.attributes.uv.array;
+
+		const newPositionArray = new Float32Array( meshData.newVertexCount * 3 );
+		const newNormalArray = new Float32Array( meshData.newVertexCount * 3 );
+		const newUvArray = new Float32Array( meshData.newVertexCount * 2 );
+		const newUv2Array = new Float32Array( xatlas.HEAPF32.buffer, meshData.uvOffset, meshData.newVertexCount * 2 );
+		const newIndexArray = new Uint32Array( xatlas.HEAPU32.buffer, meshData.indexOffset, meshData.newIndexCount );
+		const originalIndexArray = new Uint32Array(
+			xatlas.HEAPU32.buffer,
+			meshData.originalIndexOffset,
+			meshData.newVertexCount
+		);
+
+		for ( let i = 0; i < meshData.newVertexCount; i ++ ) {
+
+			const originalIndex = originalIndexArray[ i ];
+			newPositionArray[ i * 3 ] = oldPositionArray[ originalIndex * 3 ];
+			newPositionArray[ i * 3 + 1 ] = oldPositionArray[ originalIndex * 3 + 1 ];
+			newPositionArray[ i * 3 + 2 ] = oldPositionArray[ originalIndex * 3 + 2 ];
+			newNormalArray[ i * 3 ] = oldNormalArray[ originalIndex * 3 ];
+			newNormalArray[ i * 3 + 1 ] = oldNormalArray[ originalIndex * 3 + 1 ];
+			newNormalArray[ i * 3 + 2 ] = oldNormalArray[ originalIndex * 3 + 2 ];
+			newUvArray[ i * 2 ] = oldUvArray[ originalIndex * 2 ];
+			newUvArray[ i * 2 + 1 ] = oldUvArray[ originalIndex * 2 + 1 ];
+
+		}
+
+		const newGeometry = new BufferGeometry();
+		newGeometry.addAttribute( 'position', new Float32BufferAttribute( newPositionArray, 3 ) );
+		newGeometry.addAttribute( 'normal', new Float32BufferAttribute( newNormalArray, 3 ) );
+		newGeometry.addAttribute( 'uv', new Float32BufferAttribute( newUvArray, 2 ) );
+		newGeometry.addAttribute( 'uv2', new Float32BufferAttribute( newUv2Array, 2 ) );
+		newGeometry.setIndex( new Uint32BufferAttribute( newIndexArray, 1 ) );
+
+		mesh.geometry = newGeometry;
+
+		xatlas.destroyAtlas();
+
+	}
+
+}

package/src/workers/PathTracingSceneWorker.js

@@ -0,0 +1,40 @@
+import { PathTracingSceneGenerator } from '../core/PathTracingSceneGenerator.js';
+import { SAH } from 'three-mesh-bvh';
+import { GenerateMeshBVHWorker } from 'three-mesh-bvh/src/workers/GenerateMeshBVHWorker.js';
+
+export class PathTracingSceneWorker extends PathTracingSceneGenerator {
+
+	constructor() {
+
+		super();
+		this.bvhGenerator = new GenerateMeshBVHWorker();
+
+	}
+
+	generate( scene, options = {} ) {
+
+		const { bvhGenerator } = this;
+		const { geometry, materials, textures } = this.prepScene( scene );
+
+		const bvhOptions = { strategy: SAH, ...options, maxLeafTris: 1 };
+		const bvhPromise = bvhGenerator.generate( geometry, bvhOptions );
+		return bvhPromise.then( bvh => {
+
+			return {
+				scene,
+				materials,
+				textures,
+				bvh,
+			};
+
+		} );
+
+	}
+
+	dispose() {
+
+		this.bvhGenerator.dispose();
+
+	}
+
+}

package/src/uniforms/EquirectPdfUniform.js

@@ -1,132 +0,0 @@
-import { Color, DataTexture, FloatType, RGFormat, LinearFilter } from 'three';
-
-function RGBEToLinear( r, g, b, e, target ) {
-
-	const exp = e * 255.0 - 128.0;
-	target.set( r, g, b ).multiplyScalar( Math.pow( exp ) );
-	return target;
-
-}
-
-export class EquirectPdfUniform {
-
-	constructor() {
-
-		const marginalData = new DataTexture();
-		marginalData.type = FloatType;
-		marginalData.format = RGFormat;
-		marginalData.minFilter = LinearFilter;
-		marginalData.maxFilter = LinearFilter;
-		marginalData.generateMipmaps = false;
-
-		const conditionalData = new DataTexture();
-		conditionalData.type = FloatType;
-		conditionalData.format = RGFormat;
-		conditionalData.minFilter = LinearFilter;
-		conditionalData.maxFilter = LinearFilter;
-		conditionalData.generateMipmaps = false;
-
-		this.marginalData = marginalData;
-		this.conditionalData = conditionalData;
-
-	}
-
-	updateFrom( hdr ) {
-
-		// TODO: another reference implementation with a different approach:
-		// https://github.com/nvpro-samples/vk_mini_samples/blob/main/hdr_sampling/src/hdr_env.cpp#L243
-
-		// https://github.com/knightcrawler25/GLSL-PathTracer/blob/master/src/loaders/hdrloader.cpp
-		const { width, height, data } = hdr.image;
-		const color = new Color();
-		const hsl = {};
-
-		// track the importance of any given pixel in the image by tracking its weight relative to other pixels in the image
-		const pdfConditional = new Float32Array( width * height );
-		const cdfConditional = new Float32Array( width * height );
-
-		const pdfMarginal = new Float32Array( height );
-		const cdfMarginal = new Float32Array( height );
-
-		let cumulativeWeightMarginal = 0.0;
-		for ( let y = 0; y < height; y ++ ) {
-
-			let cumulativeWeight = 0.0;
-			for ( let x = 0; x < width; x ++ ) {
-
-				const i = y * width + x;
-				const r = data[ 4 * i + 0 ];
-				const g = data[ 4 * i + 1 ];
-				const b = data[ 4 * i + 2 ];
-				const e = data[ 4 * i + 3 ];
-
-				// the probability of the pixel being selected in this row is the
-				// scale of the luminance relative to the rest of the pixels.
-				// TODO: this should also account for the solid angle of the pixel when sampling
-				const weight = RGBEToLinear( r, g, b, e, color ).getHSL( hsl ).l;
-				cumulativeWeight += weight;
-
-				pdfConditional[ i ] = weight;
-				cdfConditional[ i ] = cumulativeWeight;
-
-			}
-
-			// scale the pdf and cdf to [0.0, 1.0]
-			for ( let i = 0, l = pdfConditional.length; i < l; i ++ ) {
-
-				pdfConditional[ i ] /= cumulativeWeight;
-				cdfConditional[ i ] /= cumulativeWeight;
-
-			}
-
-			cumulativeWeightMarginal += cumulativeWeight;
-
-			// compute the marginal pdf and cdf along the height of the map.
-			pdfMarginal[ y ] = cumulativeWeight;
-			cdfMarginal[ y ] = cumulativeWeightMarginal;
-
-		}
-
-		// scale the marginal pdf and cdf to [0.0, 1.0]
-		for ( let i = 0, l = pdfMarginal.length; i < l; i ++ ) {
-
-			pdfMarginal[ i ] /= cumulativeWeightMarginal;
-			cdfMarginal[ i ] /= cumulativeWeightMarginal;
-
-		}
-
-		// compute a sorted index of distributions and the probabilities along them for both
-		// the marginal and conditional data. These will be used to sample with a random number
-		// to retrieve a uv value to sample in the environment map.
-		const marginalDataArray = new Float32Array( height * 2 );
-		const conditionalDataArray = new Float32Array( width * height * 2 );
-
-		for ( let i = 0; i < height; i ++ ) {
-
-			//const dist = ( i + 1 ) / height;
-			const row = 0; // TODO: find the row that lies at the given cumulative distribution value above
-			marginalDataArray[ 2 * i + 0 ] = row / height;
-			marginalDataArray[ 2 * i + 1 ] = pdfMarginal[ i ];
-
-		}
-
-		for ( let y = 0; y < height; y ++ ) {
-
-			for ( let x = 0; x < width; x ++ ) {
-
-				const i = y * width + x;
-				//const dist = ( x + 1 ) / width;
-				const col = 0; // TODO: find the column in the given row that lies at the cumulative dist value above
-				conditionalDataArray[ 2 * i + 0 ] = col / width;
-				conditionalDataArray[ 2 * i + 1 ] = pdfConditional[ i ];
-
-			}
-
-		}
-
-		this.marginalData.image = { width, height, data: marginalDataArray };
-		this.conditionalData.image = { width, height, data: conditionalDataArray };
-
-	}
-
-}

package/src/uniforms/MaterialStructArrayUniform.js

@@ -1,18 +0,0 @@
-import { MaterialStructUniform } from './MaterialStructUniform.js';
-
-export class MaterialStructArrayUniform extends Array {
-
-	updateFrom( materials, textures ) {
-
-		while ( this.length > materials.length ) this.pop();
-		while ( this.length < materials.length ) this.push( new MaterialStructUniform() );
-
-		for ( let i = 0, l = this.length; i < l; i ++ ) {
-
-			this[ i ].updateFrom( materials[ i ], textures );
-
-		}
-
-	}
-
-}

package/src/uniforms/MaterialStructUniform.js

@@ -1,94 +0,0 @@
-import { Color, Vector2 } from 'three';
-export class MaterialStructUniform {
-
-	constructor() {
-
-		this.init();
-
-	}
-
-	init() {
-
-		this.color = new Color( 0xffffff );
-		this.map = - 1;
-
-		this.metalness = 1.0;
-		this.metalnessMap = - 1;
-
-		this.roughness = 1.0;
-		this.roughnessMap = - 1;
-
-		this.ior = 1.0;
-		this.transmission = 0.0;
-		this.transmissionMap = - 1;
-
-		this.emissive = new Color( 0 );
-		this.emissiveIntensity = 1.0;
-		this.emissiveMap = - 1;
-
-		this.normalMap = - 1;
-		this.normalScale = new Vector2( 1, 1 );
-
-		this.opacity = 1.0;
-		this.alphaTest = 0.0;
-
-		// TODO: Clearcoat
-
-		// TODO: Sheen
-
-	}
-
-	updateFrom( material, textures = [] ) {
-
-		this.init();
-
-		// color
-		if ( 'color' in material ) this.color.copy( material.color );
-		else material.color.set( 0xffffff );
-
-		this.map = textures.indexOf( material.map );
-
-		// metalness
-		if ( 'metalness' in material ) this.metalness = material.metalness;
-		else this.metalness = 1.0;
-
-		this.metalnessMap = textures.indexOf( material.metalnessMap );
-
-		// roughness
-		if ( 'roughness' in material ) this.roughness = material.roughness;
-		else this.roughness = 1.0;
-
-		this.roughnessMap = textures.indexOf( material.roughnessMap );
-
-		// transmission
-		if ( 'ior' in material ) this.ior = material.ior;
-		else this.ior = 1.0;
-
-		if ( 'transmission' in material ) this.transmission = material.transmission;
-		else this.transmission = 0.0;
-
-		if ( 'transmissionMap' in material ) this.transmissionMap = textures.indexOf( material.transmissionMap );
-
-		// emission
-		if ( 'emissive' in material ) this.emissive.copy( material.emissive );
-		else this.emissive.set( 0 );
-
-		if ( 'emissiveIntensity' in material ) this.emissiveIntensity = material.emissiveIntensity;
-		else this.emissiveIntensity = 1.0;
-
-		this.emissiveMap = textures.indexOf( material.emissiveMap );
-
-		// normals
-		this.normalMap = textures.indexOf( material.normalMap );
-		if ( 'normalScale' in material ) this.normalScale.copy( material.normalScale );
-		else this.normalScale.set( 1, 1 );
-
-		// opacity
-		this.opacity = material.opacity;
-
-		// alpha test
-		this.alphaTest = material.alphaTest;
-
-	}
-
-}