three-gpu-pathtracer 0.0.5 → 0.0.7

package/src/core/PathTracingRenderer.js

@@ -1,255 +1,270 @@
-import { RGBAFormat, FloatType, Color, Vector2, WebGLRenderTarget, NoBlending, NormalBlending } from 'three';
-import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
-import { BlendMaterial } from '../materials/BlendMaterial.js';
-
-function* renderTask() {
-
-	const {
-		_renderer,
-		_fsQuad,
-		_blendQuad,
-		_primaryTarget,
-		_blendTargets,
-		alpha,
-		camera,
-		material,
-	} = this;
-
-	const blendMaterial = _blendQuad.material;
-	let [ blendTarget1, blendTarget2 ] = _blendTargets;
-
-	while ( true ) {
-
-		if ( alpha ) {
-
-			blendMaterial.opacity = 1 / ( this.samples + 1 );
-			material.blending = NoBlending;
-			material.opacity = 1;
-
-		} else {
-
-			material.opacity = 1 / ( this.samples + 1 );
-			material.blending = NormalBlending;
-
-		}
-
-		const w = _primaryTarget.width;
-		const h = _primaryTarget.height;
-		material.resolution.set( w, h );
-		material.seed ++;
-
-		const tx = this.tiles.x || 1;
-		const ty = this.tiles.y || 1;
-		const totalTiles = tx * ty;
-		const dprInv = ( 1 / _renderer.getPixelRatio() );
-		for ( let y = 0; y < ty; y ++ ) {
-
-			for ( let x = 0; x < tx; x ++ ) {
-
-				material.cameraWorldMatrix.copy( camera.matrixWorld );
-				material.invProjectionMatrix.copy( camera.projectionMatrixInverse );
-
-				// Perspective camera (default)
-				let cameraType = 0;
-
-				// An orthographic projection matrix will always have the bottom right element == 1
-				// And a perspective projection matrix will always have the bottom right element == 0
-				if ( camera.projectionMatrix.elements[ 15 ] > 0 ) {
-
-					// Orthographic
-					cameraType = 1;
-
-				}
-
-				if ( camera.isEquirectCamera ) {
-
-					// Equirectangular
-					cameraType = 2;
-
-				}
-
-				material.setDefine( 'CAMERA_TYPE', cameraType );
-
-				const ogRenderTarget = _renderer.getRenderTarget();
-				const ogAutoClear = _renderer.autoClear;
-
-				// three.js renderer takes values relative to the current pixel ratio
-				_renderer.setRenderTarget( _primaryTarget );
-				_renderer.setScissorTest( true );
-				_renderer.setScissor(
-					dprInv * Math.ceil( x * w / tx ),
-					dprInv * Math.ceil( ( ty - y - 1 ) * h / ty ),
-					dprInv * Math.ceil( w / tx ),
-					dprInv * Math.ceil( h / ty ) );
-				_renderer.autoClear = false;
-				_fsQuad.render( _renderer );
-
-				_renderer.setScissorTest( false );
-				_renderer.setRenderTarget( ogRenderTarget );
-				_renderer.autoClear = ogAutoClear;
-
-				if ( alpha ) {
-
-					blendMaterial.target1 = blendTarget1.texture;
-					blendMaterial.target2 = _primaryTarget.texture;
-
-					_renderer.setRenderTarget( blendTarget2 );
-					_blendQuad.render( _renderer );
-					_renderer.setRenderTarget( ogRenderTarget );
-
-				}
-
-				this.samples += ( 1 / totalTiles );
-
-				yield;
-
-			}
-
-		}
-
-		[ blendTarget1, blendTarget2 ] = [ blendTarget2, blendTarget1 ];
-
-		this.samples = Math.round( this.samples );
-
-	}
-
-}
-
-const ogClearColor = new Color();
-export class PathTracingRenderer {
-
-	get material() {
-
-		return this._fsQuad.material;
-
-	}
-
-	set material( v ) {
-
-		this._fsQuad.material = v;
-
-	}
-
-	get target() {
-
-		return this._alpha ? this._blendTargets[ 1 ] : this._primaryTarget;
-
-	}
-
-	set alpha( v ) {
-
-		if ( ! v ) {
-
-			this._blendTargets[ 0 ].dispose();
-			this._blendTargets[ 1 ].dispose();
-
-		}
-
-		this._alpha = v;
-		this.reset();
-
-	}
-
-	get alpha() {
-
-		return this._alpha;
-
-	}
-
-	constructor( renderer ) {
-
-		this.camera = null;
-		this.tiles = new Vector2( 1, 1 );
-
-		this.samples = 0;
-		this.stableNoise = false;
-		this._renderer = renderer;
-		this._alpha = false;
-		this._fsQuad = new FullScreenQuad( null );
-		this._blendQuad = new FullScreenQuad( new BlendMaterial() );
-		this._task = null;
-
-		this._primaryTarget = new WebGLRenderTarget( 1, 1, {
-			format: RGBAFormat,
-			type: FloatType,
-		} );
-		this._blendTargets = [
-			new WebGLRenderTarget( 1, 1, {
-				format: RGBAFormat,
-				type: FloatType,
-			} ),
-			new WebGLRenderTarget( 1, 1, {
-				format: RGBAFormat,
-				type: FloatType,
-			} ),
-		];
-
-	}
-
-	setSize( w, h ) {
-
-		this._primaryTarget.setSize( w, h );
-		this._blendTargets[ 0 ].setSize( w, h );
-		this._blendTargets[ 1 ].setSize( w, h );
-		this.reset();
-
-	}
-
-	dispose() {
-
-		this._primaryTarget.dispose();
-		this._blendTargets[ 0 ].dispose();
-		this._blendTargets[ 1 ].dispose();
-
-		this._fsQuad.dispose();
-		this._blendQuad.dispose();
-		this._task = null;
-
-	}
-
-	reset() {
-
-		const { _renderer, _primaryTarget, _blendTargets } = this;
-		const ogRenderTarget = _renderer.getRenderTarget();
-		const ogClearAlpha = _renderer.getClearAlpha();
-		_renderer.getClearColor( ogClearColor );
-
-		_renderer.setRenderTarget( _primaryTarget );
-		_renderer.setClearColor( 0, 0 );
-		_renderer.clearColor();
-
-		_renderer.setRenderTarget( _blendTargets[ 0 ] );
-		_renderer.setClearColor( 0, 0 );
-		_renderer.clearColor();
-
-		_renderer.setRenderTarget( _blendTargets[ 1 ] );
-		_renderer.setClearColor( 0, 0 );
-		_renderer.clearColor();
-
-		_renderer.setClearColor( ogClearColor, ogClearAlpha );
-		_renderer.setRenderTarget( ogRenderTarget );
-
-		this.samples = 0;
-		this._task = null;
-
-		if ( this.stableNoise ) {
-
-			this.material.seed = 0;
-
-		}
-
-	}
-
-	update() {
-
-		if ( ! this._task ) {
-
-			this._task = renderTask.call( this );
-
-		}
-
-		this._task.next();
-
-	}
-
-}
+import { RGBAFormat, FloatType, Color, Vector2, WebGLRenderTarget, NoBlending, NormalBlending } from 'three';
+import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
+import { BlendMaterial } from '../materials/BlendMaterial.js';
+
+function* renderTask() {
+
+	const {
+		_renderer,
+		_fsQuad,
+		_blendQuad,
+		_primaryTarget,
+		_blendTargets,
+		alpha,
+		camera,
+		material,
+	} = this;
+
+	const blendMaterial = _blendQuad.material;
+	let [ blendTarget1, blendTarget2 ] = _blendTargets;
+
+	while ( true ) {
+
+		if ( alpha ) {
+
+			blendMaterial.opacity = 1 / ( this.samples + 1 );
+			material.blending = NoBlending;
+			material.opacity = 1;
+
+		} else {
+
+			material.opacity = 1 / ( this.samples + 1 );
+			material.blending = NormalBlending;
+
+		}
+
+		const w = _primaryTarget.width;
+		const h = _primaryTarget.height;
+		material.resolution.set( w, h );
+		material.seed ++;
+
+		const tilesX = this.tiles.x || 1;
+		const tilesY = this.tiles.y || 1;
+		const totalTiles = tilesX * tilesY;
+		const dprInv = ( 1 / _renderer.getPixelRatio() );
+		for ( let y = 0; y < tilesY; y ++ ) {
+
+			for ( let x = 0; x < tilesX; x ++ ) {
+
+				material.cameraWorldMatrix.copy( camera.matrixWorld );
+				material.invProjectionMatrix.copy( camera.projectionMatrixInverse );
+
+				// Perspective camera (default)
+				let cameraType = 0;
+
+				// An orthographic projection matrix will always have the bottom right element == 1
+				// And a perspective projection matrix will always have the bottom right element == 0
+				if ( camera.projectionMatrix.elements[ 15 ] > 0 ) {
+
+					// Orthographic
+					cameraType = 1;
+
+				}
+
+				if ( camera.isEquirectCamera ) {
+
+					// Equirectangular
+					cameraType = 2;
+
+				}
+
+				material.setDefine( 'CAMERA_TYPE', cameraType );
+
+				const ogRenderTarget = _renderer.getRenderTarget();
+				const ogAutoClear = _renderer.autoClear;
+
+				let tx = x;
+				let ty = y;
+				if ( ! this.stableTiles ) {
+
+					const tileIndex = ( this._currentTile ) % ( tilesX * tilesY );
+					tx = tileIndex % tilesX;
+					ty = ~ ~ ( tileIndex / tilesX );
+
+					this._currentTile = tileIndex + 1;
+
+				}
+
+				// three.js renderer takes values relative to the current pixel ratio
+				_renderer.setRenderTarget( _primaryTarget );
+				_renderer.setScissorTest( true );
+				_renderer.setScissor(
+					dprInv * Math.ceil( tx * w / tilesX ),
+					dprInv * Math.ceil( ( tilesY - ty - 1 ) * h / tilesY ),
+					dprInv * Math.ceil( w / tilesX ),
+					dprInv * Math.ceil( h / tilesY ) );
+				_renderer.autoClear = false;
+				_fsQuad.render( _renderer );
+
+				_renderer.setScissorTest( false );
+				_renderer.setRenderTarget( ogRenderTarget );
+				_renderer.autoClear = ogAutoClear;
+
+				if ( alpha ) {
+
+					blendMaterial.target1 = blendTarget1.texture;
+					blendMaterial.target2 = _primaryTarget.texture;
+
+					_renderer.setRenderTarget( blendTarget2 );
+					_blendQuad.render( _renderer );
+					_renderer.setRenderTarget( ogRenderTarget );
+
+				}
+
+				this.samples += ( 1 / totalTiles );
+
+				yield;
+
+			}
+
+		}
+
+		[ blendTarget1, blendTarget2 ] = [ blendTarget2, blendTarget1 ];
+
+		this.samples = Math.round( this.samples );
+
+	}
+
+}
+
+const ogClearColor = new Color();
+export class PathTracingRenderer {
+
+	get material() {
+
+		return this._fsQuad.material;
+
+	}
+
+	set material( v ) {
+
+		this._fsQuad.material = v;
+
+	}
+
+	get target() {
+
+		return this._alpha ? this._blendTargets[ 1 ] : this._primaryTarget;
+
+	}
+
+	set alpha( v ) {
+
+		if ( ! v ) {
+
+			this._blendTargets[ 0 ].dispose();
+			this._blendTargets[ 1 ].dispose();
+
+		}
+
+		this._alpha = v;
+		this.reset();
+
+	}
+
+	get alpha() {
+
+		return this._alpha;
+
+	}
+
+	constructor( renderer ) {
+
+		this.camera = null;
+		this.tiles = new Vector2( 1, 1 );
+
+		this.samples = 0;
+		this.stableNoise = false;
+		this.stableTiles = true;
+
+		this._renderer = renderer;
+		this._alpha = false;
+		this._fsQuad = new FullScreenQuad( null );
+		this._blendQuad = new FullScreenQuad( new BlendMaterial() );
+		this._task = null;
+		this._currentTile = 0;
+
+		this._primaryTarget = new WebGLRenderTarget( 1, 1, {
+			format: RGBAFormat,
+			type: FloatType,
+		} );
+		this._blendTargets = [
+			new WebGLRenderTarget( 1, 1, {
+				format: RGBAFormat,
+				type: FloatType,
+			} ),
+			new WebGLRenderTarget( 1, 1, {
+				format: RGBAFormat,
+				type: FloatType,
+			} ),
+		];
+
+	}
+
+	setSize( w, h ) {
+
+		this._primaryTarget.setSize( w, h );
+		this._blendTargets[ 0 ].setSize( w, h );
+		this._blendTargets[ 1 ].setSize( w, h );
+		this.reset();
+
+	}
+
+	dispose() {
+
+		this._primaryTarget.dispose();
+		this._blendTargets[ 0 ].dispose();
+		this._blendTargets[ 1 ].dispose();
+
+		this._fsQuad.dispose();
+		this._blendQuad.dispose();
+		this._task = null;
+
+	}
+
+	reset() {
+
+		const { _renderer, _primaryTarget, _blendTargets } = this;
+		const ogRenderTarget = _renderer.getRenderTarget();
+		const ogClearAlpha = _renderer.getClearAlpha();
+		_renderer.getClearColor( ogClearColor );
+
+		_renderer.setRenderTarget( _primaryTarget );
+		_renderer.setClearColor( 0, 0 );
+		_renderer.clearColor();
+
+		_renderer.setRenderTarget( _blendTargets[ 0 ] );
+		_renderer.setClearColor( 0, 0 );
+		_renderer.clearColor();
+
+		_renderer.setRenderTarget( _blendTargets[ 1 ] );
+		_renderer.setClearColor( 0, 0 );
+		_renderer.clearColor();
+
+		_renderer.setClearColor( ogClearColor, ogClearAlpha );
+		_renderer.setRenderTarget( ogRenderTarget );
+
+		this.samples = 0;
+		this._task = null;
+
+		if ( this.stableNoise ) {
+
+			this.material.seed = 0;
+
+		}
+
+	}
+
+	update() {
+
+		if ( ! this._task ) {
+
+			this._task = renderTask.call( this );
+
+		}
+
+		this._task.next();
+
+	}
+
+}

package/src/core/PathTracingSceneGenerator.js

@@ -18,6 +18,7 @@ export class PathTracingSceneGenerator {
 				if ( c.isSkinnedMesh || c.isMesh && c.morphTargetInfluences ) {
 
 					const generator = new StaticGeometryGenerator( c );
+					generator.attributes = [ 'position', 'color', 'normal', 'tangent', 'uv', 'uv2' ];
 					generator.applyWorldTransforms = false;
 					const mesh = new Mesh(
 						generator.generate(),
@@ -32,7 +33,7 @@ export class PathTracingSceneGenerator {
 
 					meshes.push( c );
 
-				} else if ( c.isRectAreaLight ) {
+				} else if ( c.isRectAreaLight || c.isSpotLight ) {
 
 					lights.push( c );
 
@@ -44,9 +45,9 @@ export class PathTracingSceneGenerator {
 
 		return {
 			...mergeMeshes( meshes, {
-				attributes: [ 'position', 'normal', 'tangent', 'uv' ],
+				attributes: [ 'position', 'normal', 'tangent', 'uv', 'color' ],
 			} ),
-			lights
+			lights,
 		};
 
 	}

package/src/index.js

@@ -1,26 +1,35 @@
-// core
-export * from './core/PathTracingRenderer.js';
-export * from './core/PathTracingSceneGenerator.js';
-export * from './core/DynamicPathTracingSceneGenerator.js';
-export * from './core/MaterialReducer.js';
-export * from './core/PhysicalCamera.js';
-export * from './core/EquirectCamera.js';
-
-// uniforms
-export * from './uniforms/MaterialsTexture.js';
-export * from './uniforms/RenderTarget2DArray.js';
-export * from './uniforms/EquirectHdrInfoUniform.js';
-export * from './uniforms/PhysicalCameraUniform.js';
-
-// utils
-export * from './utils/GeometryPreparationUtils.js';
-export * from './utils/BlurredEnvMapGenerator.js';
-
-// materials
-export * from './materials/MaterialBase.js';
-export * from './materials/PhysicalPathTracingMaterial.js';
-
-// shaders
-export * from './shader/shaderMaterialSampling.js';
-export * from './shader/shaderUtils.js';
-export * from './shader/shaderStructs.js';
+// core
+export * from './core/PathTracingRenderer.js';
+export * from './core/PathTracingSceneGenerator.js';
+export * from './core/DynamicPathTracingSceneGenerator.js';
+export * from './core/MaterialReducer.js';
+
+// objects
+export * from './objects/PhysicalCamera.js';
+export * from './objects/EquirectCamera.js';
+export * from './objects/PhysicalSpotLight.js';
+export * from './objects/ShapedAreaLight.js';
+
+// uniforms
+export * from './uniforms/MaterialsTexture.js';
+export * from './uniforms/RenderTarget2DArray.js';
+export * from './uniforms/EquirectHdrInfoUniform.js';
+export * from './uniforms/PhysicalCameraUniform.js';
+export * from './uniforms/LightsInfoUniformStruct.js';
+export * from './uniforms/IESProfilesTexture.js';
+
+// utils
+export * from './utils/GeometryPreparationUtils.js';
+export * from './utils/BlurredEnvMapGenerator.js';
+export * from './utils/IESLoader.js';
+
+// materials
+export * from './materials/DenoiseMaterial.js';
+export * from './materials/GraphMaterial.js';
+export * from './materials/MaterialBase.js';
+export * from './materials/PhysicalPathTracingMaterial.js';
+
+// shaders
+export * from './shader/shaderMaterialSampling.js';
+export * from './shader/shaderUtils.js';
+export * from './shader/shaderStructs.js';