diff options
| author | Rémi Verschelde | 2017-11-14 12:29:02 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-14 12:29:02 +0100 |
| commit | bd775aa0bd25eaa331952c8cdaf0cabb66cbc213 (patch) | |
| tree | dafd5d0eb940436803cdb190742b67c0d6f26cef | |
| parent | 468567438974ccfea11bcd5525cdeece3e1e546a (diff) | |
| parent | e477fa2bd2d6cca37540e1c0791288f52bbb50b2 (diff) | |
| download | godot-bd775aa0bd25eaa331952c8cdaf0cabb66cbc213.tar.gz godot-bd775aa0bd25eaa331952c8cdaf0cabb66cbc213.tar.zst godot-bd775aa0bd25eaa331952c8cdaf0cabb66cbc213.zip | |
Merge pull request #12898 from RandomShaper/improve-anim-loop
Change AnimationPlayer looping logic
Diffstat (limited to '')
| -rw-r--r-- | scene/animation/animation_player.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 80b774807..6be3ff88d 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -545,7 +545,14 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, f } else { - next_pos = Math::fposmod(next_pos, len); + float looped_next_pos = Math::fposmod(next_pos, len); + if (looped_next_pos == 0 && next_pos != 0) { + // Loop multiples of the length to it, rather than 0 + // so state at time=length is previewable in the editor + next_pos = len; + } else { + next_pos = looped_next_pos; + } } cd.pos = next_pos; |