Browse Source

honor renderer.outputEncoding

WestLangley 5 năm trước cách đây
mục cha
commit
37275fa2ec
1 tập tin đã thay đổi với 2 bổ sung22 xóa
  1. 2 22
      examples/jsm/helpers/LightProbeHelper.js

+ 2 - 22
examples/jsm/helpers/LightProbeHelper.js

@@ -14,13 +14,9 @@ function LightProbeHelper( lightProbe, size ) {
 
 	this.size = size;
 
-	var defines = {};
-	defines[ 'GAMMA_OUTPUT' ] = "";
-
-	// material
 	var material = new ShaderMaterial( {
 
-		defines: defines,
+		type: 'LightProbeHelperMaterial',
 
 		uniforms: {
 
@@ -56,20 +52,6 @@ function LightProbeHelper( lightProbe, size ) {
 
 			'}',
 
-			'vec3 linearToOutput( in vec3 a ) {',
-
-			'	#ifdef GAMMA_OUTPUT',
-
-			'		return pow( a, vec3( 1.0 / float( GAMMA_FACTOR ) ) );',
-
-			'	#else',
-
-			'		return a;',
-
-			'	#endif',
-
-			'}',
-
 			'// source: https://graphics.stanford.edu/papers/envmap/envmap.pdf',
 			'vec3 shGetIrradianceAt( in vec3 normal, in vec3 shCoefficients[ 9 ] ) {',
 
@@ -112,9 +94,7 @@ function LightProbeHelper( lightProbe, size ) {
 
 			'	vec3 outgoingLight = RECIPROCAL_PI * irradiance * intensity;',
 
-			'	outgoingLight = linearToOutput( outgoingLight );',
-
-			'	gl_FragColor = vec4( outgoingLight, 1.0 );',
+			'	gl_FragColor = linearToOutputTexel( vec4( outgoingLight, 1.0 ) );',
 
 			'}'