minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Format PR #4207

This commit is contained in:
NaruTrey 2016-06-12 03:29:49 +04:00
parent aa8b64cb2d
commit bc1ea1684f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/content_cao.cpp
View File

@ -1491,15 +1491,14 @@ void GenericCAO::updateAnimation()
return;
if (m_animated_meshnode->getStartFrame() != m_animation_range.X ||
m_animated_meshnode->getEndFrame() != m_animation_range.Y)
{
f32 current_frame = m_animated_meshnode->getFrameNr();
m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
// setFrameLoop method has a side effect, it resets the current frame of the animation
if (current_frame > m_animated_meshnode->getStartFrame() &&
current_frame < m_animated_meshnode->getEndFrame())
m_animated_meshnode->setCurrentFrame(current_frame);
}
m_animated_meshnode->getEndFrame() != m_animation_range.Y) {
f32 current_frame = m_animated_meshnode->getFrameNr();
m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y);
// setFrameLoop method has a side effect, it resets the current frame of the animation
if (current_frame > m_animated_meshnode->getStartFrame() &&
current_frame < m_animated_meshnode->getEndFrame())
m_animated_meshnode->setCurrentFrame(current_frame);
}
if (m_animated_meshnode->getAnimationSpeed() != m_animation_speed)
m_animated_meshnode->setAnimationSpeed(m_animation_speed);
m_animated_meshnode->setTransitionTime(m_animation_blend);