From 802620a86b08850f07a88b1eea1120d0b5ac1ea0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 1 Nov 2015 23:03:16 +0100
Subject: [PATCH] Use TimeOfDayInterpolator for Land Fog Depth

Fixes the sudden fog jump at nightfall.
---
 apps/openmw/mwworld/weather.cpp | 9 +++++----
 apps/openmw/mwworld/weather.hpp | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index ed43059f4..24b45fcea 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -122,8 +122,10 @@ Weather::Weather(const std::string& name,
                 fallback.getFallbackColour("Weather_" + name + "_Sun_Day_Color"),
                 fallback.getFallbackColour("Weather_" + name + "_Sun_Sunset_Color"),
                 fallback.getFallbackColour("Weather_" + name + "_Sun_Night_Color"))
-    , mLandFogDayDepth(fallback.getFallbackFloat("Weather_" + name + "_Land_Fog_Day_Depth"))
-    , mLandFogNightDepth(fallback.getFallbackFloat("Weather_" + name + "_Land_Fog_Night_Depth"))
+    , mLandFogDepth(fallback.getFallbackFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+                    fallback.getFallbackFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+                    fallback.getFallbackFloat("Weather_" + name + "_Land_Fog_Day_Depth"),
+                    fallback.getFallbackFloat("Weather_" + name + "_Land_Fog_Night_Depth"))
     , mSunDiscSunsetColor(fallback.getFallbackColour("Weather_" + name + "_Sun_Disc_Sunset_Color"))
     , mWindSpeed(fallback.getFallbackFloat("Weather_" + name + "_Wind_Speed"))
     , mCloudSpeed(fallback.getFallbackFloat("Weather_" + name + "_Cloud_Speed"))
@@ -1043,8 +1045,7 @@ inline void WeatherManager::calculateResult(const int weatherID, const float gam
 
     mResult.mNight = (gameHour < mSunriseTime || gameHour > mTimeSettings.mNightStart - 1);
 
-    mResult.mFogDepth = mResult.mNight ? current.mLandFogNightDepth : current.mLandFogDayDepth;
-
+    mResult.mFogDepth = current.mLandFogDepth.getValue(gameHour, mTimeSettings);
     mResult.mFogColor = current.mFogColor.getValue(gameHour, mTimeSettings);
     mResult.mAmbientColor = current.mAmbientColor.getValue(gameHour, mTimeSettings);
     mResult.mSunColor = current.mSunColor.getValue(gameHour, mTimeSettings);
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 86d1898fa..4a78350fe 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -84,8 +84,7 @@ namespace MWWorld
         TimeOfDayInterpolator<osg::Vec4f> mSunColor;
 
         // Fog depth/density
-        float mLandFogDayDepth;
-        float mLandFogNightDepth;
+        TimeOfDayInterpolator<float> mLandFogDepth;
 
         // Color modulation for the sun itself during sunset
         osg::Vec4f mSunDiscSunsetColor;