transition tweak 2

This commit is contained in:
scrawl 2012-03-16 20:32:41 +01:00
parent 460b584934
commit d18b3271b1

View file

@ -377,7 +377,7 @@ WeatherResult WeatherManager::getResult(const String& weather)
} }
// sunrise // sunrise
else if (mHour >= 5.5f && mHour <= 8) else if (mHour >= 5.5f && mHour <= 9)
{ {
if (mHour <= 6) if (mHour <= 6)
{ {
@ -393,7 +393,7 @@ WeatherResult WeatherManager::getResult(const String& weather)
else //if (mHour >= 6) else //if (mHour >= 6)
{ {
// fade out // fade out
float advance = mHour-9; float advance = mHour-6;
float factor = advance / 3.f; float factor = advance / 3.f;
result.mFogColor = lerp(current.mFogSunriseColor, current.mFogDayColor); result.mFogColor = lerp(current.mFogSunriseColor, current.mFogDayColor);
result.mAmbientColor = lerp(current.mAmbientSunriseColor, current.mAmbientDayColor); result.mAmbientColor = lerp(current.mAmbientSunriseColor, current.mAmbientDayColor);
@ -403,7 +403,7 @@ WeatherResult WeatherManager::getResult(const String& weather)
} }
// day // day
else if (mHour >= 8 && mHour <= 17) else if (mHour >= 9 && mHour <= 17)
{ {
result.mFogColor = current.mFogDayColor; result.mFogColor = current.mFogDayColor;
result.mAmbientColor = current.mAmbientDayColor; result.mAmbientColor = current.mAmbientDayColor;