From fbce5eb12dd71405c70f9318315c2289f746ac81 Mon Sep 17 00:00:00 2001 From: ChenX Date: Tue, 20 Nov 2018 09:09:31 +0800 Subject: [PATCH] Update variable name --- examples/webgl_tonemapping.html | 2 +- src/constants.js | 2 +- .../shaders/ShaderChunk/tonemapping_pars_fragment.glsl | 2 +- src/renderers/webgl/WebGLProgram.js | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/webgl_tonemapping.html b/examples/webgl_tonemapping.html index c73f995895..73b6e1cb80 100644 --- a/examples/webgl_tonemapping.html +++ b/examples/webgl_tonemapping.html @@ -74,7 +74,7 @@ Reinhard: THREE.ReinhardToneMapping, Uncharted2: THREE.Uncharted2ToneMapping, Cineon: THREE.CineonToneMapping, - ACESFilm: THREE.ACESFilmToneMapping + ACESFilm: THREE.ACESFilmicToneMapping }; var camera, scene, renderer, group; diff --git a/src/constants.js b/src/constants.js index 483209693e..5a68b3d008 100644 --- a/src/constants.js +++ b/src/constants.js @@ -55,7 +55,7 @@ export var LinearToneMapping = 1; export var ReinhardToneMapping = 2; export var Uncharted2ToneMapping = 3; export var CineonToneMapping = 4; -export var ACESFilmToneMapping = 5; +export var ACESFilmicToneMapping = 5; export var UVMapping = 300; export var CubeReflectionMapping = 301; export var CubeRefractionMapping = 302; diff --git a/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl b/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl index 51c46a9fac..ca6a98672d 100644 --- a/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl +++ b/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl @@ -41,7 +41,7 @@ vec3 OptimizedCineonToneMapping( vec3 color ) { } // source: https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/ -vec3 ACESFilmToneMapping( vec3 color ) { +vec3 ACESFilmicToneMapping( vec3 color ) { color *= toneMappingExposure; return saturate( ( color * ( 2.51 * color + 0.03 ) ) / ( color * ( 2.43 * color + 0.59 ) + 0.14 ) ); diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js index 9ee8663689..846b1e86dd 100644 --- a/src/renderers/webgl/WebGLProgram.js +++ b/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, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, ACESFilmToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding } from '../../constants.js'; +import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, ACESFilmicToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding } from '../../constants.js'; var programIdCount = 0; @@ -70,8 +70,8 @@ function getToneMappingFunction( functionName, toneMapping ) { toneMappingName = 'OptimizedCineon'; break; - case ACESFilmToneMapping: - toneMappingName = 'ACESFilm'; + case ACESFilmicToneMapping: + toneMappingName = 'ACESFilmic'; break; default: -- GitLab