From 111e38ef25546836d243c9b14c72bd055478a53b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 9 Jan 2013 20:18:26 +0100
Subject: [PATCH] Revert "fog now distance based instead of depth"

This reverts commit 7ee038fdd7fcb51f901893ae0e6554a2f0cc3dc1.
---
 files/materials/objects.shader       | 2 +-
 files/materials/openmw.configuration | 1 +
 files/materials/terrain.shader       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/files/materials/objects.shader b/files/materials/objects.shader
index 25624351c8..130de0f3d6 100644
--- a/files/materials/objects.shader
+++ b/files/materials/objects.shader
@@ -265,7 +265,7 @@
 #endif
 
 #if FOG
-        float fogValue = shSaturate((length(cameraPos.xyz-worldPos) - fogParams.y) * fogParams.w);
+        float fogValue = shSaturate((depthPassthrough - fogParams.y) * fogParams.w);
         
         #if UNDERWATER
         // regular fog only if fragment is above water
diff --git a/files/materials/openmw.configuration b/files/materials/openmw.configuration
index 2f84680f0e..ee97451d39 100644
--- a/files/materials/openmw.configuration
+++ b/files/materials/openmw.configuration
@@ -1,5 +1,6 @@
 configuration water_reflection
 {
+    fog false
     shadows false
     shadows_pssm false
     mrt_output false
diff --git a/files/materials/terrain.shader b/files/materials/terrain.shader
index dee7332630..9494c1de99 100644
--- a/files/materials/terrain.shader
+++ b/files/materials/terrain.shader
@@ -337,7 +337,7 @@
     
         
 #if FOG
-        float fogValue = shSaturate((length(cameraPos.xyz-worldPos) - fogParams.y) * fogParams.w);
+        float fogValue = shSaturate((depth - fogParams.y) * fogParams.w);
         
         #if UNDERWATER
         // regular fog only if fragment is above water