Skip to content

Commit 316b4b1

Browse files
committed
remove slider
1 parent 8f42579 commit 316b4b1

File tree

2 files changed

+3
-33
lines changed

2 files changed

+3
-33
lines changed

example/materialBall.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ const params = {
7979
multipleImportanceSampling: true,
8080
stableNoise: false,
8181
denoiseEnabled: true,
82-
denoiseSliderEnabled: true,
83-
denoiseSlider: 0.0,
8482
denoiseSigma: 2.5,
8583
denoiseThreshold: 0.1,
8684
denoiseKSigma: 1.0,
@@ -150,7 +148,6 @@ async function init() {
150148
ptRenderer.material.setDefine( 'FEATURE_MIS', Number( params.multipleImportanceSampling ) );
151149
ptRenderer.tiles.set( params.tiles, params.tiles );
152150
ptRenderer.denoise = params.denoiseEnabled;
153-
ptRenderer.denoiser.setDefine( 'USE_SLIDER', Number( params.denoiseSliderEnabled ) );
154151

155152
fsQuad = new FullScreenQuad( new THREE.MeshBasicMaterial( {
156153
map: ptRenderer.target.texture,
@@ -328,16 +325,6 @@ async function init() {
328325

329326
ptRenderer.denoise = value;
330327

331-
} );
332-
denoiseFolder.add( params, 'denoiseSliderEnabled' ).onChange( value => {
333-
334-
ptRenderer.denoiser.setDefine( 'USE_SLIDER', Number( value ) );
335-
336-
} );
337-
denoiseFolder.add( params, 'denoiseSlider', - 1.0, 1.0 ).onChange( value => {
338-
339-
ptRenderer.denoiser.slider = value;
340-
341328
} );
342329
denoiseFolder.add( params, 'denoiseSigma', 0.01, 12.0 ).onChange( value => {
343330

src/materials/DenoiseMaterial.js

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ export class DenoiseMaterial extends MaterialBase {
2727
threshold: { value: 0.03 },
2828
kSigma: { value: 1.0 },
2929

30-
slider: { value: 0.0 },
31-
3230
map: { value: null },
3331

3432
},
3533

36-
vertexShader: `
34+
vertexShader: /* glsl */`
3735
3836
varying vec2 vUv;
3937
@@ -46,7 +44,7 @@ export class DenoiseMaterial extends MaterialBase {
4644
4745
`,
4846

49-
fragmentShader: `
47+
fragmentShader: /* glsl */`
5048
5149
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5250
// Copyright (c) 2018-2019 Michele Morrone
@@ -68,8 +66,6 @@ export class DenoiseMaterial extends MaterialBase {
6866
uniform float threshold;
6967
uniform float kSigma;
7068
71-
uniform float slider;
72-
7369
varying vec2 vUv;
7470
7571
#define INV_SQRT_OF_2PI 0.39894228040143267793994605993439
@@ -128,20 +124,7 @@ export class DenoiseMaterial extends MaterialBase {
128124
129125
void main() {
130126
131-
vec4 denoised = smartDeNoise( map, vec2( vUv.x, vUv.y ), sigma, kSigma, threshold );
132-
133-
#if USE_SLIDER
134-
135-
float slide = slider * 0.5 + 0.5;
136-
float szSlide = max( 0.001, 1.0 / float( textureSize( map, 0 ).x ) );
137-
138-
gl_FragColor = ( vUv.x < slide - szSlide ) ? texture2D( map, vec2( vUv.x, vUv.y ) ) : ( ( vUv.x > slide + szSlide ) ? denoised : vec4( 1.0 ) );
139-
140-
#else
141-
142-
gl_FragColor = denoised;
143-
144-
#endif
127+
gl_FragColor = smartDeNoise( map, vec2( vUv.x, vUv.y ), sigma, kSigma, threshold );
145128
146129
}
147130

0 commit comments

Comments
 (0)