|
@@ -247,11 +247,9 @@ THREE.ShaderSkin = {
|
|
|
|
|
|
"outgoingLight += diffuseColor.xyz * ( totalDiffuseLight + ambientLightColor * diffuse ) + totalSpecularLight;",
|
|
|
|
|
|
- THREE.ShaderChunk[ "linear_to_gamma_fragment" ],
|
|
|
- THREE.ShaderChunk[ "fog_fragment" ],
|
|
|
-
|
|
|
- "gl_FragColor = vec4( outgoingLight, diffuseColor.a );", // TODO, this should be pre-multiplied to allow for bright highlights on very transparent objects
|
|
|
+ "gl_FragColor = linearToOutputTexel( vec4( outgoingLight, diffuseColor.a ) );", // TODO, this should be pre-multiplied to allow for bright highlights on very transparent objects
|
|
|
|
|
|
+ THREE.ShaderChunk[ "fog_fragment" ],
|
|
|
|
|
|
"}"
|
|
|
|
|
@@ -550,10 +548,10 @@ THREE.ShaderSkin = {
|
|
|
|
|
|
"}",
|
|
|
|
|
|
- THREE.ShaderChunk[ "fog_fragment" ],
|
|
|
-
|
|
|
"gl_FragColor = vec4( outgoingLight, diffuseColor.a );", // TODO, this should be pre-multiplied to allow for bright highlights on very transparent objects
|
|
|
|
|
|
+ THREE.ShaderChunk[ "fog_fragment" ],
|
|
|
+
|
|
|
"}"
|
|
|
|
|
|
].join( "\n" ),
|