teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Support playgroup mode 0

Browse source
This commit is contained in:
Chris Robinson 2012-07-24 14:54:12 -07:00
parent 13ab2baef0
commit 9f0c1eeb7b
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwrender/animation.cpp
View file

@ -120,13 +120,14 @@ void Animation::playGroup(std::string groupname, int mode, int loops)
else if(!findGroupTimes(groupname, &times))
throw std::runtime_error("Failed to find animation group "+groupname);
// FIXME: mode = 0 not yet supported
if(mode == 0)
mode = 1;
mCurGroup = times;
mTime = ((mode==1) ? mCurGroup.mStart : mCurGroup.mLoopStart);
if(mode == 0 && mCurGroup.mLoops > 0)
mNextGroup = times;
else
{
mCurGroup = times;
mNextGroup = GroupTimes();
mTime = ((mode==2) ? mCurGroup.mLoopStart : mCurGroup.mStart);
}
}
void Animation::skipAnim()
@ -148,8 +149,12 @@ void Animation::runAnimation(float timepassed)
}
else if(mTime >= mCurGroup.mStop)
{
mCurGroup.mLoops--;
mTime = mCurGroup.mStop;
if(mNextGroup.mLoops > 0)
mTime = mTime - mCurGroup.mStop + mNextGroup.mStart;
else
mTime = mCurGroup.mStop;
mCurGroup = mNextGroup;
mNextGroup = GroupTimes();
}
}

1
apps/openmw/mwrender/animation.hpp
View file

@ -35,6 +35,7 @@ protected:
float mTime;
GroupTimes mCurGroup;
GroupTimes mNextGroup;
bool mSkipFrame;