mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Code Issues Releases Wiki Activity

Add some const correctness to MoonModel

Browse source
This commit is contained in:
slothlife 2015-07-30 14:00:08 -05:00
parent a4e1630ec2
commit 67a63cc662
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ namespace
} }
} }
MoonModel::MoonModel(const std::string& name, MWWorld::Fallback& fallback) MoonModel::MoonModel(const std::string& name, const MWWorld::Fallback& fallback)
: mFadeInStart(fallback.getFallbackFloat("Moons_" + name + "_Fade_In_Start")) : mFadeInStart(fallback.getFallbackFloat("Moons_" + name + "_Fade_In_Start"))
, mFadeInFinish(fallback.getFallbackFloat("Moons_" + name + "_Fade_In_Finish")) , mFadeInFinish(fallback.getFallbackFloat("Moons_" + name + "_Fade_In_Finish"))
, mFadeOutStart(fallback.getFallbackFloat("Moons_" + name + "_Fade_Out_Start")) , mFadeOutStart(fallback.getFallbackFloat("Moons_" + name + "_Fade_Out_Start"))
@ -54,7 +54,7 @@ MoonModel::MoonModel(const std::string& name, MWWorld::Fallback& fallback)
mSpeed = std::min(mSpeed, 180.0f / 23.0f); mSpeed = std::min(mSpeed, 180.0f / 23.0f);
} }
MWRender::MoonState MoonModel::calculateState(unsigned int daysPassed, float gameHour) MWRender::MoonState MoonModel::calculateState(unsigned int daysPassed, float gameHour) const
{ {
float rotationFromHorizon = angle(daysPassed, gameHour); float rotationFromHorizon = angle(daysPassed, gameHour);
MWRender::MoonState state = MWRender::MoonState state =
@ -69,7 +69,7 @@ MWRender::MoonState MoonModel::calculateState(unsigned int daysPassed, float gam
return state; return state;
} }
inline float MoonModel::angle(unsigned int daysPassed, float gameHour) inline float MoonModel::angle(unsigned int daysPassed, float gameHour) const
{ {
// Morrowind's moons start travel on one side of the horizon (let's call it H-rise) and travel 180 degrees to the // Morrowind's moons start travel on one side of the horizon (let's call it H-rise) and travel 180 degrees to the
// opposite horizon (let's call it H-set). Upon reaching H-set, they reset to H-rise until the next moon rise. // opposite horizon (let's call it H-set). Upon reaching H-set, they reset to H-rise until the next moon rise.
@ -108,7 +108,7 @@ inline float MoonModel::angle(unsigned int daysPassed, float gameHour)
return moonRiseAngleToday; return moonRiseAngleToday;
} }
inline float MoonModel::moonRiseHour(unsigned int daysPassed) inline float MoonModel::moonRiseHour(unsigned int daysPassed) const
{ {
// This arises from the start date of 16 Last Seed, 427 // This arises from the start date of 16 Last Seed, 427
// TODO: Find an alternate formula that doesn't rely on this day being fixed. // TODO: Find an alternate formula that doesn't rely on this day being fixed.
@ -122,7 +122,7 @@ inline float MoonModel::moonRiseHour(unsigned int daysPassed)
return mDailyIncrement + std::fmod((daysPassed - 1 + startDay) * mDailyIncrement, 24.0f); return mDailyIncrement + std::fmod((daysPassed - 1 + startDay) * mDailyIncrement, 24.0f);
} }
inline float MoonModel::rotation(float hours) inline float MoonModel::rotation(float hours) const
{ {
// 15 degrees per hour was reverse engineered from the rotation matrices of the Morrowind scene graph. // 15 degrees per hour was reverse engineered from the rotation matrices of the Morrowind scene graph.
// Note that this correlates to 360 / 24, which is a full rotation every 24 hours, so speed is a measure // Note that this correlates to 360 / 24, which is a full rotation every 24 hours, so speed is a measure
@ -130,7 +130,7 @@ inline float MoonModel::rotation(float hours)
return 15.0f * mSpeed * hours; return 15.0f * mSpeed * hours;
} }
inline unsigned int MoonModel::phase(unsigned int daysPassed) inline unsigned int MoonModel::phase(unsigned int daysPassed) const
{ {
// Morrowind starts with a full moon on 16 Last Seed and then begins to wane 17 Last Seed, working on 3 day phase cycle. // Morrowind starts with a full moon on 16 Last Seed and then begins to wane 17 Last Seed, working on 3 day phase cycle.
// Note: this is an internal helper, and as such we don't want to return MWRender::MoonState::Phase since we can't // Note: this is an internal helper, and as such we don't want to return MWRender::MoonState::Phase since we can't
@ -138,7 +138,7 @@ inline unsigned int MoonModel::phase(unsigned int daysPassed)
return ((daysPassed + 1) / 3) % 8; return ((daysPassed + 1) / 3) % 8;
} }
inline float MoonModel::shadowBlend(float angle) inline float MoonModel::shadowBlend(float angle) const
{ {
// The Fade End Angle and Fade Start Angle describe a region where the moon transitions from a solid disk // The Fade End Angle and Fade Start Angle describe a region where the moon transitions from a solid disk
// that is roughly the color of the sky, to a textured surface. // that is roughly the color of the sky, to a textured surface.
@ -161,7 +161,7 @@ inline float MoonModel::shadowBlend(float angle)
return 0.0f; return 0.0f;
} }
inline float MoonModel::hourlyAlpha(float gameHour) inline float MoonModel::hourlyAlpha(float gameHour) const
{ {
// The Fade Out Start / Finish and Fade In Start / Finish describe the hours at which the moon // The Fade Out Start / Finish and Fade In Start / Finish describe the hours at which the moon
// appears and disappears. // appears and disappears.
@ -180,7 +180,7 @@ inline float MoonModel::hourlyAlpha(float gameHour)
return 1.0f; return 1.0f;
} }
inline float MoonModel::earlyMoonShadowAlpha(float angle) inline float MoonModel::earlyMoonShadowAlpha(float angle) const
{ {
// The Moon Shadow Early Fade Angle describes an arc relative to Fade End Angle. // The Moon Shadow Early Fade Angle describes an arc relative to Fade End Angle.
// Depending on the current angle, the following values describe how transparent the moon is. // Depending on the current angle, the following values describe how transparent the moon is.

18
apps/openmw/mwworld/weather.hpp
View file

@ -154,9 +154,9 @@ namespace MWWorld
class MoonModel class MoonModel
{ {
public: public:
MoonModel(const std::string& name, MWWorld::Fallback& fallback); MoonModel(const std::string& name, const MWWorld::Fallback& fallback);
MWRender::MoonState calculateState(unsigned int daysPassed, float gameHour); MWRender::MoonState calculateState(unsigned int daysPassed, float gameHour) const;
private: private:
float mFadeInStart; float mFadeInStart;
@ -170,13 +170,13 @@ namespace MWWorld
float mFadeEndAngle; float mFadeEndAngle;
float mMoonShadowEarlyFadeAngle; float mMoonShadowEarlyFadeAngle;
float angle(unsigned int daysPassed, float gameHour); float angle(unsigned int daysPassed, float gameHour) const;
float moonRiseHour(unsigned int daysPassed); float moonRiseHour(unsigned int daysPassed) const;
float rotation(float hours); float rotation(float hours) const;
unsigned int phase(unsigned int daysPassed); unsigned int phase(unsigned int daysPassed) const;
float shadowBlend(float angle); float shadowBlend(float angle) const;
float hourlyAlpha(float gameHour); float hourlyAlpha(float gameHour) const;
float earlyMoonShadowAlpha(float angle); float earlyMoonShadowAlpha(float angle) const;
}; };
/// ///