ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #4353

Browse Source
This commit is contained in:
Benau 2021-02-05 14:58:19 +08:00
parent fa4318b6ad
commit 5ccbb97046
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/karts/kart_model.cpp
View File

@ -907,11 +907,22 @@ void KartModel::setAnimation(AnimationFrameType type, bool play_non_loop)
// if animations disabled, give up // if animations disabled, give up
if (m_animated_node == NULL) return; if (m_animated_node == NULL) return;
bool transition = false;
if (m_current_animation == AF_JUMP_START && type == AF_DEFAULT)
{
// For seamless transition back to AF_DEFAULT
transition = true;
}
m_play_non_loop = play_non_loop; m_play_non_loop = play_non_loop;
m_current_animation = type; m_current_animation = type;
if(m_current_animation==AF_DEFAULT) if(m_current_animation==AF_DEFAULT)
{ {
m_animated_node->setLoopMode(false); m_animated_node->setLoopMode(false);
// setTransitionTime before setFrameLoop so the node will save the last
// frame
if (transition)
m_animated_node->setTransitionTime(0.2f);
const bool support_backpedal = const bool support_backpedal =
m_animation_frame[AF_BACK_STRAIGHT] > -1 && m_animation_frame[AF_BACK_STRAIGHT] > -1 &&
m_animation_frame[AF_BACK_LEFT] > -1 && m_animation_frame[AF_BACK_LEFT] > -1 &&
@ -935,6 +946,7 @@ void KartModel::setAnimation(AnimationFrameType type, bool play_non_loop)
} }
m_animated_node->setAnimationEndCallback(NULL); m_animated_node->setAnimationEndCallback(NULL);
m_animated_node->setAnimationSpeed(0); m_animated_node->setAnimationSpeed(0);
m_animated_node->setCurrentFrame(m_animation_frame[AF_STRAIGHT]);
} }
else if(m_animation_frame[type]>-1) else if(m_animation_frame[type]>-1)
{ {