AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-22 11:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite CharacterController::updateAnimQueue() to properly maintain the animation queue and clean up finished animations.

Browse Source
This commit is contained in:
Mads Buvik Sandvei 2023-10-25 18:00:26 +02:00
parent 50f3b81096
commit cdb325f19a
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/openmw/mwmechanics/character.cpp
View File

@ -1852,17 +1852,39 @@ namespace MWMechanics
void CharacterController::updateAnimQueue() void CharacterController::updateAnimQueue()
{ {
if (mAnimQueue.size() > 1) if (mAnimQueue.empty())
{ return;
if (mAnimation->isPlaying(mAnimQueue.front().mGroup) == false) if (mAnimation->isPlaying(mAnimQueue.front().mGroup) == false)
{
if (mAnimQueue.size() > 1)
{ {
mAnimation->disable(mAnimQueue.front().mGroup); mAnimation->disable(mAnimQueue.front().mGroup);
mAnimQueue.pop_front(); mAnimQueue.pop_front();
bool loopfallback = mAnimQueue.front().mGroup.starts_with("idle"); bool loopfallback = mAnimQueue.front().mGroup.starts_with("idle");
mAnimation->play(mAnimQueue.front().mGroup, Priority_Default, MWRender::Animation::BlendMask_All, false, mAnimation->play(mAnimQueue.front().mGroup, Priority_Default, MWRender::Animation::BlendMask_All,
1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback); false, 1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount, loopfallback);
} }
else if (mAnimQueue.front().mLoopCount > 1 && mAnimQueue.front().mPersist)
{
// The last animation stopped playing when it shouldn't have.
// This is caused by a rebuild of the animation object, so we should restart the animation here
// Subtract 1 from mLoopCount to consider the current loop done.
bool loopfallback = mAnimQueue.front().mGroup.starts_with("idle");
mAnimation->play(mAnimQueue.front().mGroup, Priority_Persistent, MWRender::Animation::BlendMask_All,
false, 1.0f, "start", "stop", 0.0f, mAnimQueue.front().mLoopCount - 1, loopfallback);
}
else
{
// Animation is done, remove it from the queue.
mAnimation->disable(mAnimQueue.front().mGroup);
mAnimQueue.pop_front();
}
}
else
{
mAnimQueue.front().mLoopCount = mAnimation->getCurrentLoopCount(mAnimQueue.front().mGroup);
} }
if (!mAnimQueue.empty()) if (!mAnimQueue.empty())