mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-03 20:15:31 +00:00
Code Issues Releases Wiki Activity

Much more moons fallbacks

Browse source
This commit is contained in:
Glorf 2013-03-17 19:36:14 +01:00
parent 1369090a80
commit f3fd3a7691
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/openmw/mwworld/weather.cpp
View file

@ -415,13 +415,28 @@ void WeatherManager::update(float duration)
mRendering->getSkyManager()->masserEnable(); mRendering->getSkyManager()->masserEnable();
mRendering->getSkyManager()->secundaEnable(); mRendering->getSkyManager()->secundaEnable();
float hour_fade; float secunda_hour_fade;
if (mHour >= 7.f && mHour <= 14.f) float secunda_fadeout_start=mFallback->getFallbackFloat("Moons_Secunda_Fade_Out_Start");
hour_fade = 1-(mHour-7)/3.f; float secunda_fadein_start=mFallback->getFallbackFloat("Moons_Secunda_Fade_In_Start");
else if (mHour >= 14 && mHour <= 15.f) float secunda_fadein_finish=mFallback->getFallbackFloat("Moons_Secunda_Fade_In_Finish");
hour_fade = mHour-14;
if (mHour >= secunda_fadeout_start && mHour <= secunda_fadein_start)
secunda_hour_fade = 1-(mHour-secunda_fadeout_start)/3.f;
else if (mHour >= secunda_fadein_start && mHour <= secunda_fadein_finish)
secunda_hour_fade = mHour-secunda_fadein_start;
else else
hour_fade = 1; secunda_hour_fade = 1;
float masser_hour_fade;
float masser_fadeout_start=mFallback->getFallbackFloat("Moons_Masser_Fade_Out_Start");
float masser_fadein_start=mFallback->getFallbackFloat("Moons_Masser_Fade_In_Start");
float masser_fadein_finish=mFallback->getFallbackFloat("Moons_Masser_Fade_In_Finish");
if (mHour >= masser_fadeout_start && mHour <= masser_fadein_start)
masser_hour_fade = 1-(mHour-masser_fadeout_start)/3.f;
else if (mHour >= masser_fadein_start && mHour <= masser_fadein_finish)
masser_hour_fade = mHour-masser_fadein_start;
else
masser_hour_fade = 1;
float angle = moonHeight*90.f; float angle = moonHeight*90.f;
@ -445,8 +460,8 @@ void WeatherManager::update(float duration)
else else
masser_angle_fade = 1.f; masser_angle_fade = 1.f;
masser_angle_fade *= hour_fade; masser_angle_fade *= masser_hour_fade;
secunda_angle_fade *= hour_fade; secunda_angle_fade *= secunda_hour_fade;
mRendering->getSkyManager()->setMasserFade(masser_angle_fade); mRendering->getSkyManager()->setMasserFade(masser_angle_fade);
mRendering->getSkyManager()->setSecundaFade(secunda_angle_fade); mRendering->getSkyManager()->setSecundaFade(secunda_angle_fade);