mrdoob#8445 Fix Errors in Tone Mapping Demo

Mugen87 · Mugen87 · commit 786ed7f2d96d · 2016-03-23T13:20:31.000+01:00
diff --git a/examples/js/postprocessing/AdaptiveToneMappingPass.js b/examples/js/postprocessing/AdaptiveToneMappingPass.js
@@ -186,7 +186,7 @@ THREE.AdaptiveToneMappingPass.prototype = {
 			this.previousLuminanceRT.dispose();
 
 		}
-		var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat };
+		var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBAFormat };
 
 		this.luminanceRT = new THREE.WebGLRenderTarget( this.resolution, this.resolution, pars );
 		this.luminanceRT.texture.generateMipmaps = false;
diff --git a/examples/js/shaders/GammaCorrectionShader.js b/examples/js/shaders/GammaCorrectionShader.js
@@ -34,13 +34,11 @@ THREE.GammaCorrectionShader = {
 
 		"varying vec2 vUv;",
 
-		THREE.ShaderChunk[ "common" ],
-
 		"void main() {",
 
 			"vec4 tex = texture2D( tDiffuse, vec2( vUv.x, vUv.y ) );",
 
-			"gl_FragColor = vec4( linearToOutput( tex.rgb ), tex.a );",
+			"gl_FragColor = LinearToGamma( tex, 2.0 );",
 
 		"}"
 

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ THREE.AdaptiveToneMappingPass.prototype = {`
`186`	`186`	`this.previousLuminanceRT.dispose();`
`187`	`187`
`188`	`188`	`}`
`189`		`- var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat };`
	`189`	`+ var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBAFormat };`
`190`	`190`
`191`	`191`	`this.luminanceRT = new THREE.WebGLRenderTarget( this.resolution, this.resolution, pars );`
`192`	`192`	`this.luminanceRT.texture.generateMipmaps = false;`