WebGLRenderer: Removed Uncharted2ToneMapping.

docs/api/en/constants/Renderer.html

@@ -55,7 +55,6 @@
 		THREE.NoToneMapping
 		THREE.LinearToneMapping
 		THREE.ReinhardToneMapping
-		THREE.Uncharted2ToneMapping
 		THREE.CineonToneMapping
 		THREE.ACESFilmicToneMapping
 		</code>

docs/api/zh/constants/Renderer.html

@@ -55,7 +55,6 @@
 		THREE.NoToneMapping
 		THREE.LinearToneMapping
 		THREE.ReinhardToneMapping
-		THREE.Uncharted2ToneMapping
 		THREE.CineonToneMapping
 		</code>
 		<p>

editor/js/Sidebar.Project.js

@@ -150,9 +150,8 @@ var SidebarProject = function ( editor ) {
 		0: 'None',
 		1: 'Linear',
 		2: 'Reinhard',
-		3: 'Uncharted2',
-		4: 'Cineon',
-		5: 'ACESFilmic',
+		3: 'Cineon',
+		4: 'ACESFilmic'
 	} ).setWidth( '150px' ).onChange( function () {
 
 		var toneMapping = parseFloat( this.getValue() );

examples/webgl_materials_variations_physical.html

@@ -158,7 +158,7 @@
 				container.appendChild( renderer.domElement );
 
 				renderer.outputEncoding = THREE.sRGBEncoding;
-				renderer.toneMapping = THREE.Uncharted2ToneMapping;
+				renderer.toneMapping = THREE.ACESFilmicToneMapping;
 				renderer.toneMappingExposure = 0.75;
 
 				//

examples/webgl_materials_variations_standard.html

@@ -163,7 +163,7 @@
 				container.appendChild( renderer.domElement );
 
 				renderer.outputEncoding = THREE.sRGBEncoding;
-				renderer.toneMapping = THREE.Uncharted2ToneMapping;
+				renderer.toneMapping = THREE.ACESFilmicToneMapping;
 				renderer.toneMappingExposure = 0.75;
 
 				//

examples/webgl_tonemapping.html

@@ -36,7 +36,6 @@
 				None: THREE.NoToneMapping,
 				Linear: THREE.LinearToneMapping,
 				Reinhard: THREE.ReinhardToneMapping,
-				Uncharted2: THREE.Uncharted2ToneMapping,
 				Cineon: THREE.CineonToneMapping,
 				ACESFilmic: THREE.ACESFilmicToneMapping
 			};

src/constants.d.ts

@@ -107,7 +107,6 @@ export enum ToneMapping {}
 export const NoToneMapping: ToneMapping;
 export const LinearToneMapping: ToneMapping;
 export const ReinhardToneMapping: ToneMapping;
-export const Uncharted2ToneMapping: ToneMapping;
 export const CineonToneMapping: ToneMapping;
 export const ACESFilmicToneMapping: ToneMapping;
 

src/constants.js

@@ -52,9 +52,8 @@ export const AddOperation = 2;
 export const NoToneMapping = 0;
 export const LinearToneMapping = 1;
 export const ReinhardToneMapping = 2;
-export const Uncharted2ToneMapping = 3;
-export const CineonToneMapping = 4;
-export const ACESFilmicToneMapping = 5;
+export const CineonToneMapping = 3;
+export const ACESFilmicToneMapping = 4;
 
 export const UVMapping = 300;
 export const CubeReflectionMapping = 301;

src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl.js

@@ -21,16 +21,6 @@ vec3 ReinhardToneMapping( vec3 color ) {
 
 }
 
-// source: http://filmicworlds.com/blog/filmic-tonemapping-operators/
-#define Uncharted2Helper( x ) max( ( ( x * ( 0.15 * x + 0.10 * 0.50 ) + 0.20 * 0.02 ) / ( x * ( 0.15 * x + 0.50 ) + 0.20 * 0.30 ) ) - 0.02 / 0.30, vec3( 0.0 ) )
-vec3 Uncharted2ToneMapping( vec3 color ) {
-
-	// John Hable's filmic operator from Uncharted 2 video game
-	color *= toneMappingExposure;
-	return saturate( Uncharted2Helper( color ) / Uncharted2Helper( vec3( 1.0 ) ) );
-
-}
-
 // source: http://filmicworlds.com/blog/filmic-tonemapping-operators/
 vec3 OptimizedCineonToneMapping( vec3 color ) {
 

src/renderers/webgl/WebGLProgram.js

@@ -5,7 +5,7 @@
 import { WebGLUniforms } from './WebGLUniforms.js';
 import { WebGLShader } from './WebGLShader.js';
 import { ShaderChunk } from '../shaders/ShaderChunk.js';
-import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding, LogLuvEncoding } from '../../constants.js';
+import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding, LogLuvEncoding } from '../../constants.js';
 
 let programIdCount = 0;
 
@@ -94,10 +94,6 @@ function getToneMappingFunction( functionName, toneMapping ) {
 			toneMappingName = 'Reinhard';
 			break;
 
-		case Uncharted2ToneMapping:
-			toneMappingName = 'Uncharted2';
-			break;
-
 		case CineonToneMapping:
 			toneMappingName = 'OptimizedCineon';
 			break;

test/unit/src/constants.tests.js

@@ -61,7 +61,6 @@ export default QUnit.module( 'Constants', () => {
 		assert.equal( Constants.NoToneMapping, 0, 'NoToneMapping is equal to 0' );
 		assert.equal( Constants.LinearToneMapping, 1, 'LinearToneMapping is equal to 1' );
 		assert.equal( Constants.ReinhardToneMapping, 2, 'ReinhardToneMapping is equal to 2' );
-		assert.equal( Constants.Uncharted2ToneMapping, 3, 'Uncharted2ToneMapping is equal to 3' );
 		assert.equal( Constants.CineonToneMapping, 4, 'CineonToneMapping is equal to 4' );
 		assert.equal( Constants.UVMapping, 300, 'UVMapping is equal to 300' );
 		assert.equal( Constants.CubeReflectionMapping, 301, 'CubeReflectionMapping is equal to 301' );