提交 fbce5eb1 编写于 作者: C ChenX

Update variable name

上级 72b90d5f
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
Reinhard: THREE.ReinhardToneMapping, Reinhard: THREE.ReinhardToneMapping,
Uncharted2: THREE.Uncharted2ToneMapping, Uncharted2: THREE.Uncharted2ToneMapping,
Cineon: THREE.CineonToneMapping, Cineon: THREE.CineonToneMapping,
ACESFilm: THREE.ACESFilmToneMapping ACESFilm: THREE.ACESFilmicToneMapping
}; };
var camera, scene, renderer, group; var camera, scene, renderer, group;
......
...@@ -55,7 +55,7 @@ export var LinearToneMapping = 1; ...@@ -55,7 +55,7 @@ export var LinearToneMapping = 1;
export var ReinhardToneMapping = 2; export var ReinhardToneMapping = 2;
export var Uncharted2ToneMapping = 3; export var Uncharted2ToneMapping = 3;
export var CineonToneMapping = 4; export var CineonToneMapping = 4;
export var ACESFilmToneMapping = 5; export var ACESFilmicToneMapping = 5;
export var UVMapping = 300; export var UVMapping = 300;
export var CubeReflectionMapping = 301; export var CubeReflectionMapping = 301;
export var CubeRefractionMapping = 302; export var CubeRefractionMapping = 302;
......
...@@ -41,7 +41,7 @@ vec3 OptimizedCineonToneMapping( vec3 color ) { ...@@ -41,7 +41,7 @@ vec3 OptimizedCineonToneMapping( vec3 color ) {
} }
// source: https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/ // source: https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/
vec3 ACESFilmToneMapping( vec3 color ) { vec3 ACESFilmicToneMapping( vec3 color ) {
color *= toneMappingExposure; color *= toneMappingExposure;
return saturate( ( color * ( 2.51 * color + 0.03 ) ) / ( color * ( 2.43 * color + 0.59 ) + 0.14 ) ); return saturate( ( color * ( 2.51 * color + 0.03 ) ) / ( color * ( 2.43 * color + 0.59 ) + 0.14 ) );
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import { WebGLUniforms } from './WebGLUniforms.js'; import { WebGLUniforms } from './WebGLUniforms.js';
import { WebGLShader } from './WebGLShader.js'; import { WebGLShader } from './WebGLShader.js';
import { ShaderChunk } from '../shaders/ShaderChunk.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; var programIdCount = 0;
...@@ -70,8 +70,8 @@ function getToneMappingFunction( functionName, toneMapping ) { ...@@ -70,8 +70,8 @@ function getToneMappingFunction( functionName, toneMapping ) {
toneMappingName = 'OptimizedCineon'; toneMappingName = 'OptimizedCineon';
break; break;
case ACESFilmToneMapping: case ACESFilmicToneMapping:
toneMappingName = 'ACESFilm'; toneMappingName = 'ACESFilmic';
break; break;
default: default:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册