mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 17:39:40 +00:00
Code Issues 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 fadeOutStart=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_Out_Start");
float fadeInStart=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_In_Start"); float fadeInStart=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_In_Start");
float fadeInFinish=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_In_Finish"); float fadeInFinish=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_In_Finish");
float fadeOutFinish=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_Out_Finish");
if (mHour >= fadeOutStart && mHour <= fadeInStart) if (mHour >= fadeOutStart && mHour <= fadeOutFinish)
return (1 - (mHour - fadeOutStart)); return (1 / (mHour - fadeOutStart));
else if (mHour >= fadeInStart && mHour <= fadeInFinish) else if (mHour >= fadeInStart && mHour <= fadeInFinish)
return (mHour - fadeInStart); return (1 / (mHour - fadeInStart));
else else
return 1; 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 endAngle=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_End_Angle");
float startAngle=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_Start_Angle"); float startAngle=mFallback->getFallbackFloat("Moons_"+moonName+"_Fade_Start_Angle");
if (angle >= endAngle && angle <= startAngle) if (angle >= endAngle && angle <= startAngle)
return (angle - endAngle); return ((angle - endAngle)/10); //10 is hardcoded, it just works this way
else if (angle < endAngle) else if (angle < endAngle)
return 0.f; return 0.f;
else else
@ -430,7 +431,7 @@ void WeatherManager::update(float duration)
else //if (mHour > 0 && mHour < 6) else //if (mHour > 0 && mHour < 6)
height = 1 - (mHour / mSunriseTime); height = 1 - (mHour / mSunriseTime);
int facing = (mHour > dayDuration) ? 1 : -1; int facing = (mHour > 13.f) ? 1 : -1;
Vector3 final( Vector3 final(
-(1 - height) * facing, -(1 - height) * facing,