Reverted distance fog. See #14736 and #14786.

mrdoob · Aug 30, 2018 · 63f6d20 · 63f6d20
1 parent 37fb1d0
commit 63f6d20
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/src/renderers/shaders/ShaderChunk/fog_fragment.glsl b/src/renderers/shaders/ShaderChunk/fog_fragment.glsl
@@ -1,12 +1,5 @@
 #ifdef USE_FOG
 
-	// float fogDepth = length( vFogPosition );
-	// mediump support: divide then multiply by max component
-
-	vec3 fogPositionAbs = abs( vFogPosition );
-	float fogMaxComponent = max( fogPositionAbs.x, max( fogPositionAbs.y, fogPositionAbs.z ) );
-	float fogDepth = length( vFogPosition / fogMaxComponent ) * fogMaxComponent;
-
 	#ifdef FOG_EXP2
 
 		float fogFactor = whiteCompliment( exp2( - fogDensity * fogDensity * fogDepth * fogDepth * LOG2 ) );

diff --git a/src/renderers/shaders/ShaderChunk/fog_pars_fragment.glsl b/src/renderers/shaders/ShaderChunk/fog_pars_fragment.glsl
@@ -1,7 +1,7 @@
 #ifdef USE_FOG
 
 	uniform vec3 fogColor;
-	varying vec3 vFogPosition;
+	varying float fogDepth;
 
 	#ifdef FOG_EXP2
 

diff --git a/src/renderers/shaders/ShaderChunk/fog_pars_vertex.glsl b/src/renderers/shaders/ShaderChunk/fog_pars_vertex.glsl
@@ -1,5 +1,5 @@
 #ifdef USE_FOG
 
-	varying vec3 vFogPosition;
+	varying float fogDepth;
 
 #endif
diff --git a/src/renderers/shaders/ShaderChunk/fog_vertex.glsl b/src/renderers/shaders/ShaderChunk/fog_vertex.glsl
@@ -1,5 +1,5 @@
 #ifdef USE_FOG
 
-	vFogPosition = mvPosition.xyz;
+	fogDepth = -mvPosition.z;
 
 #endif