mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Playing with moons part 1

Browse Source
This commit is contained in:
Glorf 2013-05-10 18:55:56 +02:00
parent 1981a3cb3c
commit 9cc85cbe81
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwworld/weather.cpp
View File

@ -68,11 +68,12 @@ float WeatherManager::calculateHourFade (const std::string& moonName) const
float fadeOutStart=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_Out_Start");
float fadeInStart=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_In_Start");
float fadeInFinish=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_In_Finish");
float fadeOutFinish=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_Out_Finish");
if (mHour >= fadeOutStart && mHour <= fadeInStart)
return (1 - (mHour - fadeOutStart));
if (mHour >= fadeOutStart && mHour <= fadeOutFinish)
return (1 / (mHour - fadeOutStart));
else if (mHour >= fadeInStart && mHour <= fadeInFinish)
return (mHour - fadeInStart);
return (1 / (mHour - fadeInStart));
else
return 1;
}
@ -82,7 +83,7 @@ float WeatherManager::calculateAngleFade (const std::string& moonName, float ang
float endAngle=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_End_Angle");
float startAngle=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_Start_Angle");
if (angle >= endAngle && angle <= startAngle)
return (angle - endAngle);
return ((angle - endAngle)/10); //10 is hardcoded, it just works this way
else if (angle < endAngle)
return 0.f;
else
@ -430,7 +431,7 @@ void WeatherManager::update(float duration)
else //if (mHour > 0 && mHour < 6)
height = 1 - (mHour / mSunriseTime);
int facing = (mHour > dayDuration) ? 1 : -1;
int facing = (mHour > 13.f) ? 1 : -1;
Vector3 final(
-(1 - height) * facing,