mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 23:06:41 +00:00
Code Issues Releases Wiki Activity

Separate the UVController function out and make it generic

Browse source 
Also fix a timing bug in it.
This commit is contained in:
Chris Robinson 2013-04-06 12:26:58 -07:00
parent 6b151be3f4
commit ca289a317c
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
components/nifogre/ogrenifloader.cpp
View file

@ -66,6 +66,36 @@ namespace NifOgre
{ {
// FIXME: Should not be here. // FIXME: Should not be here.
class DefaultFunction : public Ogre::ControllerFunction<Ogre::Real>
{
private:
float mFrequency;
float mPhase;
float mStartTime;
float mStopTime;
public:
DefaultFunction(const Nif::Controller *ctrl)
: Ogre::ControllerFunction<Ogre::Real>(false)
, mFrequency(ctrl->frequency)
, mPhase(ctrl->phase)
, mStartTime(ctrl->timeStart)
, mStopTime(ctrl->timeStop)
{
mDeltaCount = mPhase;
while(mDeltaCount < mStartTime)
mDeltaCount += (mStopTime-mStartTime);
}
virtual Ogre::Real calculate(Ogre::Real value)
{
mDeltaCount += value*mFrequency;
mDeltaCount = std::fmod(mDeltaCount - mStartTime,
mStopTime - mStartTime) + mStartTime;
return mDeltaCount;
}
};
class VisController class VisController
{ {
public: public:
@ -208,35 +238,7 @@ public:
} }
}; };
class Function : public Ogre::ControllerFunction<Ogre::Real> typedef DefaultFunction Function;
{
private:
float mFrequency;
float mPhase;
float mStartTime;
float mStopTime;
public:
Function(const Nif::NiUVController *ctrl)
: Ogre::ControllerFunction<Ogre::Real>(false)
, mFrequency(ctrl->frequency)
, mPhase(ctrl->phase)
, mStartTime(ctrl->timeStart)
, mStopTime(ctrl->timeStop)
{
mDeltaCount = mPhase;
while(mDeltaCount < mStartTime)
mDeltaCount += (mStopTime-mStartTime);
}
virtual Ogre::Real calculate(Ogre::Real value)
{
mDeltaCount += value;
mDeltaCount = std::fmod(mDeltaCount+(value*mFrequency) - mStartTime,
mStopTime - mStartTime) + mStartTime;
return mDeltaCount;
}
};
}; };