|
@@ -37,14 +37,14 @@ function getEncodingComponents( encoding ) {
|
|
|
function getTexelDecodingFunction( functionName, encoding ) {
|
|
|
|
|
|
var components = getEncodingComponents( encoding );
|
|
|
- return "vec4 " + functionName + "( vec4 value ) { return " + components[ 0 ] + "ToLinear" + components[ 1 ] + "; }";
|
|
|
+ return 'vec4 ' + functionName + '( vec4 value ) { return ' + components[ 0 ] + 'ToLinear' + components[ 1 ] + '; }';
|
|
|
|
|
|
}
|
|
|
|
|
|
function getTexelEncodingFunction( functionName, encoding ) {
|
|
|
|
|
|
var components = getEncodingComponents( encoding );
|
|
|
- return "vec4 " + functionName + "( vec4 value ) { return LinearTo" + components[ 0 ] + components[ 1 ] + "; }";
|
|
|
+ return 'vec4 ' + functionName + '( vec4 value ) { return LinearTo' + components[ 0 ] + components[ 1 ] + '; }';
|
|
|
|
|
|
}
|
|
|
|
|
@@ -55,19 +55,19 @@ function getToneMappingFunction( functionName, toneMapping ) {
|
|
|
switch ( toneMapping ) {
|
|
|
|
|
|
case LinearToneMapping:
|
|
|
- toneMappingName = "Linear";
|
|
|
+ toneMappingName = 'Linear';
|
|
|
break;
|
|
|
|
|
|
case ReinhardToneMapping:
|
|
|
- toneMappingName = "Reinhard";
|
|
|
+ toneMappingName = 'Reinhard';
|
|
|
break;
|
|
|
|
|
|
case Uncharted2ToneMapping:
|
|
|
- toneMappingName = "Uncharted2";
|
|
|
+ toneMappingName = 'Uncharted2';
|
|
|
break;
|
|
|
|
|
|
case CineonToneMapping:
|
|
|
- toneMappingName = "OptimizedCineon";
|
|
|
+ toneMappingName = 'OptimizedCineon';
|
|
|
break;
|
|
|
|
|
|
default:
|
|
@@ -75,7 +75,7 @@ function getToneMappingFunction( functionName, toneMapping ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- return "vec3 " + functionName + "( vec3 color ) { return " + toneMappingName + "ToneMapping( color ); }";
|
|
|
+ return 'vec3 ' + functionName + '( vec3 color ) { return ' + toneMappingName + 'ToneMapping( color ); }';
|
|
|
|
|
|
}
|
|
|
|
|
@@ -468,9 +468,9 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
|
|
|
parameters.shadowMapEnabled ? '#define USE_SHADOWMAP' : '',
|
|
|
parameters.shadowMapEnabled ? '#define ' + shadowMapTypeDefine : '',
|
|
|
|
|
|
- parameters.premultipliedAlpha ? "#define PREMULTIPLIED_ALPHA" : '',
|
|
|
+ parameters.premultipliedAlpha ? '#define PREMULTIPLIED_ALPHA' : '',
|
|
|
|
|
|
- parameters.physicallyCorrectLights ? "#define PHYSICALLY_CORRECT_LIGHTS" : '',
|
|
|
+ parameters.physicallyCorrectLights ? '#define PHYSICALLY_CORRECT_LIGHTS' : '',
|
|
|
|
|
|
parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
|
|
|
parameters.logarithmicDepthBuffer && extensions.get( 'EXT_frag_depth' ) ? '#define USE_LOGDEPTHBUF_EXT' : '',
|
|
@@ -480,9 +480,9 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
|
|
|
'uniform mat4 viewMatrix;',
|
|
|
'uniform vec3 cameraPosition;',
|
|
|
|
|
|
- ( parameters.toneMapping !== NoToneMapping ) ? "#define TONE_MAPPING" : '',
|
|
|
+ ( parameters.toneMapping !== NoToneMapping ) ? '#define TONE_MAPPING' : '',
|
|
|
( parameters.toneMapping !== NoToneMapping ) ? ShaderChunk[ 'tonemapping_pars_fragment' ] : '', // this code is required here because it is used by the toneMapping() function defined below
|
|
|
- ( parameters.toneMapping !== NoToneMapping ) ? getToneMappingFunction( "toneMapping", parameters.toneMapping ) : '',
|
|
|
+ ( parameters.toneMapping !== NoToneMapping ) ? getToneMappingFunction( 'toneMapping', parameters.toneMapping ) : '',
|
|
|
|
|
|
parameters.dithering ? '#define DITHERING' : '',
|
|
|
|
|
@@ -490,9 +490,9 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
|
|
|
parameters.mapEncoding ? getTexelDecodingFunction( 'mapTexelToLinear', parameters.mapEncoding ) : '',
|
|
|
parameters.envMapEncoding ? getTexelDecodingFunction( 'envMapTexelToLinear', parameters.envMapEncoding ) : '',
|
|
|
parameters.emissiveMapEncoding ? getTexelDecodingFunction( 'emissiveMapTexelToLinear', parameters.emissiveMapEncoding ) : '',
|
|
|
- parameters.outputEncoding ? getTexelEncodingFunction( "linearToOutputTexel", parameters.outputEncoding ) : '',
|
|
|
+ parameters.outputEncoding ? getTexelEncodingFunction( 'linearToOutputTexel', parameters.outputEncoding ) : '',
|
|
|
|
|
|
- parameters.depthPacking ? "#define DEPTH_PACKING " + material.depthPacking : '',
|
|
|
+ parameters.depthPacking ? '#define DEPTH_PACKING ' + material.depthPacking : '',
|
|
|
|
|
|
'\n'
|
|
|
|