Finish separating denoiser

Author: gkjohnson

example/materialBall.js

@@ -2,13 +2,13 @@ import * as THREE from 'three';
 import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
-import { PathTracingRenderer, PhysicalPathTracingMaterial, PhysicalCamera, BlurredEnvMapGenerator, EquirectCamera } from '../src/index.js';
+import { PathTracingRenderer, PhysicalPathTracingMaterial, PhysicalCamera, BlurredEnvMapGenerator, EquirectCamera, DenoiseMaterial } from '../src/index.js';
 import { PathTracingSceneWorker } from '../src/workers/PathTracingSceneWorker.js';
 import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader.js';
 import { MeshoptDecoder } from 'three/examples/jsm/libs/meshopt_decoder.module.js';
 import { GUI } from 'three/examples/jsm/libs/lil-gui.module.min.js';
 
-let renderer, controls, sceneInfo, ptRenderer, activeCamera, blitQuad, materials;
+let renderer, controls, sceneInfo, ptRenderer, activeCamera, blitQuad, denoiseQuad, materials;
 let perspectiveCamera, orthoCamera, equirectCamera;
 let envMap, envMapGenerator, scene;
 let samplesEl;
@@ -153,6 +153,8 @@ async function init() {
 		blending: THREE.CustomBlending,
 	} ) );
 
+	denoiseQuad = new FullScreenQuad( new DenoiseMaterial() );
+
 	controls = new OrbitControls( perspectiveCamera, renderer.domElement );
 	controls.addEventListener( 'change', () => {
 
@@ -320,24 +322,20 @@ async function init() {
 	} );
 
 	const denoiseFolder = gui.addFolder( 'Denoising' );
-	denoiseFolder.add( params, 'denoiseEnabled' ).onChange( value => {
-
-		ptRenderer.denoise = value;
-
-	} );
+	denoiseFolder.add( params, 'denoiseEnabled' );
 	denoiseFolder.add( params, 'denoiseSigma', 0.01, 12.0 ).onChange( value => {
 
-		ptRenderer.denoiser.sigma = value;
+		denoiseQuad.material.sigma = value;
 
 	} );
 	denoiseFolder.add( params, 'denoiseThreshold', 0.01, 1.0 ).onChange( value => {
 
-		ptRenderer.denoiser.threshold = value;
+		denoiseQuad.material.threshold = value;
 
 	} );
 	denoiseFolder.add( params, 'denoiseKSigma', 0.0, 12.0 ).onChange( value => {
 
-		ptRenderer.denoiser.kSigma = value;
+		denoiseQuad.material.kSigma = value;
 
 	} );
 
@@ -650,9 +648,11 @@ function animate() {
 
 	}
 
+	const quad = params.denoiseEnabled ? denoiseQuad : blitQuad;
+
 	renderer.autoClear = false;
-	blitQuad.material.map = ptRenderer.target.texture;
-	blitQuad.render( renderer );
+	quad.material.map = ptRenderer.target.texture;
+	quad.render( renderer );
 	renderer.autoClear = true;
 
 	samplesEl.innerText = `Samples: ${ Math.floor( ptRenderer.samples ) }`;

src/core/PathTracingRenderer.js

@@ -8,21 +8,16 @@ function* renderTask() {
 		_renderer,
 		_fsQuad,
 		_blendQuad,
-		_denoiseQuad,
 		_primaryTarget,
 		_blendTargets,
-		_denoiseTarget,
 		alpha,
-		denoise,
 		camera,
 		material,
 	} = this;
 
 	const blendMaterial = _blendQuad.material;
 	let [ blendTarget1, blendTarget2 ] = _blendTargets;
 
-	const denoiseMaterial = _denoiseQuad.material;
-
 	while ( true ) {
 
 		if ( alpha ) {
@@ -196,7 +191,6 @@ export class PathTracingRenderer {
 		this._primaryTarget.setSize( w, h );
 		this._blendTargets[ 0 ].setSize( w, h );
 		this._blendTargets[ 1 ].setSize( w, h );
-		this._denoiseTarget.setSize( w, h );
 		this.reset();
 
 	}
@@ -206,7 +200,6 @@ export class PathTracingRenderer {
 		this._primaryTarget.dispose();
 		this._blendTargets[ 0 ].dispose();
 		this._blendTargets[ 1 ].dispose();
-		this._denoiseTarget.dispose();
 
 		this._fsQuad.dispose();
 		this._blendQuad.dispose();
@@ -216,7 +209,7 @@ export class PathTracingRenderer {
 
 	reset() {
 
-		const { _renderer, _primaryTarget, _blendTargets, _denoiseTarget } = this;
+		const { _renderer, _primaryTarget, _blendTargets } = this;
 		const ogRenderTarget = _renderer.getRenderTarget();
 		const ogClearAlpha = _renderer.getClearAlpha();
 		_renderer.getClearColor( ogClearColor );
@@ -233,10 +226,6 @@ export class PathTracingRenderer {
 		_renderer.setClearColor( 0, 0 );
 		_renderer.clearColor();
 
-		_renderer.setRenderTarget( _denoiseTarget );
-		_renderer.setClearColor( 0, 0 );
-		_renderer.clearColor();
-
 		_renderer.setClearColor( ogClearColor, ogClearAlpha );
 		_renderer.setRenderTarget( ogRenderTarget );