fade in/out for sunrise and sunset

apps/openmw/mwrender/sky.cpp

@@ -496,8 +496,7 @@ void SkyManager::setWeather(const MWWorld::WeatherResult& weather)
     
     if (mCloudColour != weather.mSunColor)
     {
-        /// \todo the cloud color looks a bit out of place sometimes (especially in Sunset) - maybe there's a multiplier or setting that i've missed?
+        mCloudMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(weather.mSunColor + weather.mAmbientColor);
-        mCloudMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(weather.mSunColor);
         mCloudColour = weather.mSunColor;
     }
     

apps/openmw/mwworld/weather.cpp

@@ -8,8 +8,10 @@ using namespace MWWorld;
 
 #define TRANSITION_TIME 10
 
+#define lerp(x, y) (x * (1-factor) + y * factor)
+
 WeatherManager::WeatherManager(MWRender::RenderingManager* rendering, World* world) : 
-     mHour(0), mCurrentWeather("clear")
+     mHour(14), mCurrentWeather("clear")
 {
     mRendering = rendering;
     mWorld = world;
@@ -115,7 +117,7 @@ WeatherResult WeatherManager::getResult(const String& weather)
     result.mGlareView = current.mGlareView;
     result.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
         
-    /// \todo interpolation
+    const float fade_duration = current.mTransitionDelta;
     
     // night
     if (mHour <= (mGlobals.mSunriseTime-mGlobals.mSunriseDuration) || mHour >= (mGlobals.mSunsetTime+mGlobals.mSunsetDuration))
@@ -127,16 +129,39 @@ WeatherResult WeatherManager::getResult(const String& weather)
     }
     
     // sunrise
-    else if (mHour >= (mGlobals.mSunriseTime-mGlobals.mSunriseDuration) && mHour <= (mGlobals.mSunriseTime+mGlobals.mSunriseDuration))
+    else if (mHour >= (mGlobals.mSunriseTime-mGlobals.mSunriseDuration) && mHour <= mGlobals.mSunriseTime)
+    {
+        if (mHour <= (mGlobals.mSunriseTime-mGlobals.mSunriseDuration+fade_duration))
+        {
+            // fade in
+            float advance = (mGlobals.mSunriseTime-mGlobals.mSunriseDuration+fade_duration)-mHour;
+            float factor = (advance / fade_duration);
+            result.mFogColor = lerp(current.mFogSunriseColor, current.mFogNightColor);
+            result.mAmbientColor = lerp(current.mAmbientSunriseColor, current.mAmbientNightColor);
+            result.mSunColor = lerp(current.mSunSunriseColor, current.mSunNightColor);
+            result.mSkyColor = lerp(current.mSkySunriseColor, current.mSkyNightColor);
+        }
+        else if (mHour >= (mGlobals.mSunriseTime-fade_duration))
+        {
+            // fade out
+            float advance = mHour-(mGlobals.mSunriseTime-fade_duration);
+            float factor = advance / fade_duration;
+            result.mFogColor = lerp(current.mFogSunriseColor, current.mFogDayColor);
+            result.mAmbientColor = lerp(current.mAmbientSunriseColor, current.mAmbientDayColor);
+            result.mSunColor = lerp(current.mSunSunriseColor, current.mSunDayColor);
+            result.mSkyColor = lerp(current.mSkySunriseColor, current.mSkyDayColor);
+        }
+        else 
         {
             result.mFogColor = current.mFogSunriseColor;
             result.mAmbientColor = current.mAmbientSunriseColor;
             result.mSunColor = current.mSunSunriseColor;
             result.mSkyColor = current.mSkySunriseColor;
         }
+    }
     
     // day
-    else if (mHour >= (mGlobals.mSunriseTime+mGlobals.mSunriseDuration) && mHour <= (mGlobals.mSunsetTime-mGlobals.mSunsetDuration))
+    else if (mHour >= (mGlobals.mSunriseTime) && mHour <= (mGlobals.mSunsetTime))
     {
         result.mFogColor = current.mFogDayColor;
         result.mAmbientColor = current.mAmbientDayColor;
@@ -145,13 +170,36 @@ WeatherResult WeatherManager::getResult(const String& weather)
     }
     
     // sunset
-    else if (mHour >= (mGlobals.mSunsetTime-mGlobals.mSunsetDuration) && mHour <= (mGlobals.mSunsetTime+mGlobals.mSunsetDuration))
+    else if (mHour >= (mGlobals.mSunsetTime) && mHour <= (mGlobals.mSunsetTime+mGlobals.mSunsetDuration))
+    {
+        if (mHour <= (mGlobals.mSunsetTime+fade_duration))
+        {
+            // fade in
+            float advance = (mGlobals.mSunsetTime+fade_duration)-mHour;
+            float factor = (advance / fade_duration);
+            result.mFogColor = lerp(current.mFogSunsetColor, current.mFogDayColor);
+            result.mAmbientColor = lerp(current.mAmbientSunsetColor, current.mAmbientDayColor);
+            result.mSunColor = lerp(current.mSunSunsetColor, current.mSunDayColor);
+            result.mSkyColor = lerp(current.mSkySunsetColor, current.mSkyDayColor);
+        }
+        else if (mHour >= (mGlobals.mSunsetTime+mGlobals.mSunsetDuration-fade_duration))
+        {
+            // fade out
+            float advance = mHour-(mGlobals.mSunsetTime+mGlobals.mSunsetDuration-fade_duration);
+            float factor = advance / fade_duration;
+            result.mFogColor = lerp(current.mFogSunsetColor, current.mFogNightColor);
+            result.mAmbientColor = lerp(current.mAmbientSunsetColor, current.mAmbientNightColor);
+            result.mSunColor = lerp(current.mSunSunsetColor, current.mSunNightColor);
+            result.mSkyColor = lerp(current.mSkySunsetColor, current.mSkyNightColor);
+        }
+        else 
         {
             result.mFogColor = current.mFogSunsetColor;
             result.mAmbientColor = current.mAmbientSunsetColor;
             result.mSunColor = current.mSunSunsetColor;
             result.mSkyColor = current.mSkySunsetColor;
         }
+    }
     
     return result;
 }
@@ -166,8 +214,6 @@ WeatherResult WeatherManager::transition(float factor)
     result.mNextCloudTexture = other.mCloudTexture;
     result.mCloudBlendFactor = factor;
     
-    #define lerp(x, y) (x * (1-factor) + y * factor)
-    
     result.mCloudOpacity = lerp(current.mCloudOpacity, other.mCloudOpacity);
     result.mFogColor = lerp(current.mFogColor, other.mFogColor);
     result.mSunColor = lerp(current.mSunColor, other.mSunColor);
@@ -232,7 +278,7 @@ void WeatherManager::setHour(const float hour)
 {
     // accelerate a bit for testing
     /*
-    mHour += 0.001;
+    mHour += 0.005;
     
     if (mHour >= 24.f) mHour = 0.f;