Merge pull request #14633 from greggman/distance-fog

distance fog
mrdoob · Aug 3, 2018 · 3ba7d2b · 3ba7d2b
2 parents 10e1b75 + 54bebd9
commit 3ba7d2b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/renderers/shaders/ShaderChunk/fog_fragment.glsl b/src/renderers/shaders/ShaderChunk/fog_fragment.glsl
@@ -1,5 +1,7 @@
 #ifdef USE_FOG
 
+	float fogDepth = length(fogPosition);
+
 	#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 float fogDepth;
+	varying vec3 fogPosition;
 
 	#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 float fogDepth;
+  varying vec3 fogPosition;
 
 #endif
diff --git a/src/renderers/shaders/ShaderChunk/fog_vertex.glsl b/src/renderers/shaders/ShaderChunk/fog_vertex.glsl
@@ -1,4 +1,4 @@
 
 #ifdef USE_FOG
-fogDepth = -mvPosition.z;
+fogPosition = mvPosition.xyz;
 #endif