three-gpu-pathtracer 0.0.14 → 0.0.16

package/src/utils/SobolNumberMapGenerator.js

@@ -1,80 +1,80 @@
-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';
-
-class SobolNumbersMaterial extends MaterialBase {
-
-	constructor() {
-
-		super( {
-
-			blending: NoBlending,
-
-			uniforms: {
-
-				resolution: { value: new Vector2() },
-
-			},
-
-			vertexShader: /* glsl */`
-
-				varying vec2 vUv;
-				void main() {
-
-					vUv = uv;
-					gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
-
-				}
-			`,
-
-			fragmentShader: /* glsl */`
-
-				${ sobolCommonGLSL }
-				${ sobolGenerationGLSL }
-
-				varying vec2 vUv;
-				uniform vec2 resolution;
-				void main() {
-
-					uint index = uint( gl_FragCoord.y ) * uint( resolution.x ) + uint( gl_FragCoord.x );
-					gl_FragColor = generateSobolPoint( index );
-
-				}
-			`,
-
-		} );
-
-	}
-
-}
-
-export class SobolNumberMapGenerator {
-
-	generate( renderer, dimensions = 256 ) {
-
-		const target = new WebGLRenderTarget( dimensions, dimensions, {
-
-			type: FloatType,
-			format: RGBAFormat,
-			minFilter: NearestFilter,
-			magFilter: NearestFilter,
-			generateMipmaps: false,
-
-		} );
-
-		const ogTarget = renderer.getRenderTarget();
-		renderer.setRenderTarget( target );
-
-		const quad = new FullScreenQuad( new SobolNumbersMaterial() );
-		quad.material.resolution.set( dimensions, dimensions );
-		quad.render( renderer );
-
-		renderer.setRenderTarget( ogTarget );
-		quad.dispose();
-
-		return target;
-
-	}
-
-}
+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';
+
+class SobolNumbersMaterial extends MaterialBase {
+
+	constructor() {
+
+		super( {
+
+			blending: NoBlending,
+
+			uniforms: {
+
+				resolution: { value: new Vector2() },
+
+			},
+
+			vertexShader: /* glsl */`
+
+				varying vec2 vUv;
+				void main() {
+
+					vUv = uv;
+					gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
+
+				}
+			`,
+
+			fragmentShader: /* glsl */`
+
+				${ sobolCommonGLSL }
+				${ sobolGenerationGLSL }
+
+				varying vec2 vUv;
+				uniform vec2 resolution;
+				void main() {
+
+					uint index = uint( gl_FragCoord.y ) * uint( resolution.x ) + uint( gl_FragCoord.x );
+					gl_FragColor = generateSobolPoint( index );
+
+				}
+			`,
+
+		} );
+
+	}
+
+}
+
+export class SobolNumberMapGenerator {
+
+	generate( renderer, dimensions = 256 ) {
+
+		const target = new WebGLRenderTarget( dimensions, dimensions, {
+
+			type: FloatType,
+			format: RGBAFormat,
+			minFilter: NearestFilter,
+			magFilter: NearestFilter,
+			generateMipmaps: false,
+
+		} );
+
+		const ogTarget = renderer.getRenderTarget();
+		renderer.setRenderTarget( target );
+
+		const quad = new FullScreenQuad( new SobolNumbersMaterial() );
+		quad.material.resolution.set( dimensions, dimensions );
+		quad.render( renderer );
+
+		renderer.setRenderTarget( ogTarget );
+		quad.dispose();
+
+		return target;
+
+	}
+
+}

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/utils/macroify.js

@@ -1,9 +1,9 @@
-export function macroify( contents ) {
-
-	return contents
-		.trim()
-		.replace( /\/\/.*[\n\r]/g, '' )
-		.split( /[\n\r]+/ )
-		.join( '\\\n' ) + '\\\n';
-
-}
+export function macroify( contents ) {
+
+	return contents
+		.trim()
+		.replace( /\/\/.*[\n\r]/g, '' )
+		.split( /[\n\r]+/ )
+		.join( '\\\n' ) + '\\\n';
+
+}

package/src/workers/PathTracingSceneWorker.js

@@ -1,42 +1,42 @@
-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, lights, spotLights } = this.prepScene( scene );
-
-		const bvhOptions = { strategy: SAH, ...options, maxLeafTris: 1 };
-		const bvhPromise = bvhGenerator.generate( geometry, bvhOptions );
-		return bvhPromise.then( bvh => {
-
-			return {
-				scene,
-				materials,
-				textures,
-				lights,
-				spotLights,
-				bvh,
-			};
-
-		} );
-
-	}
-
-	dispose() {
-
-		this.bvhGenerator.dispose();
-
-	}
-
-}
+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, lights, spotLights } = this.prepScene( scene );
+
+		const bvhOptions = { strategy: SAH, ...options, maxLeafTris: 1 };
+		const bvhPromise = bvhGenerator.generate( geometry, bvhOptions );
+		return bvhPromise.then( bvh => {
+
+			return {
+				scene,
+				materials,
+				textures,
+				lights,
+				spotLights,
+				bvh,
+			};
+
+		} );
+
+	}
+
+	dispose() {
+
+		this.bvhGenerator.dispose();
+
+	}
+
+}