godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix some AnimationPlayer bugs and update documentation

Browse Source
This commit is contained in:
Luiz
2019-02-13 14:40:22 -03:00
parent d2765cd04a
commit 06a0a29711
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/animation/animation_player.cpp
View File

@@ -1205,9 +1205,16 @@ void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float
_stop_playing_caches();
c.current.from = &animation_set[name];
c.current.pos = p_from_end ? c.current.from->animation->get_length() : 0;
if (c.assigned != name) { // reset
c.current.pos = p_from_end ? c.current.from->animation->get_length() : 0;
} else if (p_from_end && c.current.pos == 0) {
// Animation reset BUT played backwards, set position to the end
c.current.pos = c.current.from->animation->get_length();
}
c.current.speed_scale = p_custom_scale;
c.assigned = p_name;
c.assigned = name;
c.seeked = false;
c.started = true;
@@ -1286,6 +1293,7 @@ void AnimationPlayer::stop(bool p_reset) {
if (p_reset) {
c.current.from = NULL;
c.current.speed_scale = 1;
c.current.pos = 0;
}
_set_process(false);
queued.clear();