Skip to content

Commit 630d7bc

Browse files
committed
Remove denoiser from core pt renderer
1 parent 316b4b1 commit 630d7bc

File tree

2 files changed

+6
-42
lines changed

2 files changed

+6
-42
lines changed

example/materialBall.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader.js';
88
import { MeshoptDecoder } from 'three/examples/jsm/libs/meshopt_decoder.module.js';
99
import { GUI } from 'three/examples/jsm/libs/lil-gui.module.min.js';
1010

11-
let renderer, controls, sceneInfo, ptRenderer, activeCamera, fsQuad, materials;
11+
let renderer, controls, sceneInfo, ptRenderer, activeCamera, blitQuad, materials;
1212
let perspectiveCamera, orthoCamera, equirectCamera;
1313
let envMap, envMapGenerator, scene;
1414
let samplesEl;
@@ -147,9 +147,8 @@ async function init() {
147147
ptRenderer.material.setDefine( 'TRANSPARENT_TRAVERSALS', params.transparentTraversals );
148148
ptRenderer.material.setDefine( 'FEATURE_MIS', Number( params.multipleImportanceSampling ) );
149149
ptRenderer.tiles.set( params.tiles, params.tiles );
150-
ptRenderer.denoise = params.denoiseEnabled;
151150

152-
fsQuad = new FullScreenQuad( new THREE.MeshBasicMaterial( {
151+
blitQuad = new FullScreenQuad( new THREE.MeshBasicMaterial( {
153152
map: ptRenderer.target.texture,
154153
blending: THREE.CustomBlending,
155154
} ) );
@@ -278,7 +277,7 @@ async function init() {
278277
ptFolder.add( params, 'acesToneMapping' ).onChange( value => {
279278

280279
renderer.toneMapping = value ? THREE.ACESFilmicToneMapping : THREE.NoToneMapping;
281-
fsQuad.material.needsUpdate = true;
280+
blitQuad.material.needsUpdate = true;
282281

283282
} );
284283
ptFolder.add( params, 'stableNoise' ).onChange( value => {
@@ -652,8 +651,8 @@ function animate() {
652651
}
653652

654653
renderer.autoClear = false;
655-
fsQuad.material.map = ptRenderer.target.texture;
656-
fsQuad.render( renderer );
654+
blitQuad.material.map = ptRenderer.target.texture;
655+
blitQuad.render( renderer );
657656
renderer.autoClear = true;
658657

659658
samplesEl.innerText = `Samples: ${ Math.floor( ptRenderer.samples ) }`;

src/core/PathTracingRenderer.js

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { RGBAFormat, FloatType, Color, Vector2, WebGLRenderTarget, NoBlending, NormalBlending } from 'three';
22
import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
33
import { BlendMaterial } from '../materials/BlendMaterial.js';
4-
import { DenoiseMaterial } from '../materials/DenoiseMaterial.js';
54

65
function* renderTask() {
76

@@ -105,16 +104,6 @@ function* renderTask() {
105104

106105
}
107106

108-
if ( denoise ) {
109-
110-
denoiseMaterial.map = alpha ? blendTarget2.texture : _primaryTarget.texture;
111-
112-
_renderer.setRenderTarget( _denoiseTarget );
113-
_denoiseQuad.render( _renderer );
114-
_renderer.setRenderTarget( ogRenderTarget );
115-
116-
}
117-
118107
this.samples += ( 1 / totalTiles );
119108

120109
yield;
@@ -148,7 +137,7 @@ export class PathTracingRenderer {
148137

149138
get target() {
150139

151-
return this._denoise ? this._denoiseTarget : ( this._alpha ? this._blendTargets[ 1 ] : this._primaryTarget );
140+
return this._alpha ? this._blendTargets[ 1 ] : this._primaryTarget;
152141

153142
}
154143

@@ -172,24 +161,6 @@ export class PathTracingRenderer {
172161

173162
}
174163

175-
set denoise( v ) {
176-
177-
if ( ! v ) {
178-
179-
this._denoiseTarget.dispose;
180-
181-
}
182-
183-
this._denoise = v;
184-
185-
}
186-
187-
get denoise() {
188-
189-
return this._denoise;
190-
191-
}
192-
193164
constructor( renderer ) {
194165

195166
this.camera = null;
@@ -201,8 +172,6 @@ export class PathTracingRenderer {
201172
this._alpha = false;
202173
this._fsQuad = new FullScreenQuad( null );
203174
this._blendQuad = new FullScreenQuad( new BlendMaterial() );
204-
this.denoiser = new DenoiseMaterial();
205-
this._denoiseQuad = new FullScreenQuad( this.denoiser );
206175
this._task = null;
207176

208177
this._primaryTarget = new WebGLRenderTarget( 1, 1, {
@@ -219,10 +188,6 @@ export class PathTracingRenderer {
219188
type: FloatType,
220189
} ),
221190
];
222-
this._denoiseTarget = new WebGLRenderTarget( 1, 1, {
223-
format: RGBAFormat,
224-
type: FloatType,
225-
} );
226191

227192
}
228193

0 commit comments

Comments
 (0)