asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15132 from RandomShaper/fix-multiple-finish

Browse source 
Fix AnimationPlayer redundantly signaling finish
This commit is contained in:
Rémi Verschelde 2018-01-03 11:24:48 +01:00 committed by GitHub
commit 48962db5b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scene/animation/animation_player.cpp
View file

@ -547,12 +547,14 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd, float p_delta, f
if (!backwards && cd.pos <= len && next_pos == len /*&& playback.blend.empty()*/) {
//playback finished
end_notify = true;
end_reached = true;
end_notify = cd.pos < len; // Notify only if not already at the end
}
if (backwards && cd.pos >= 0 && next_pos == 0 /*&& playback.blend.empty()*/) {
//playback finished
end_notify = true;
end_reached = true;
end_notify = cd.pos > 0; // Notify only if not already at the beginning
}
}
@ -679,24 +681,26 @@ void AnimationPlayer::_animation_process(float p_delta) {
if (playback.current.from) {
end_reached = false;
end_notify = false;
_animation_process2(p_delta);
_animation_update_transforms();
if (end_notify) {
if (end_reached) {
if (queued.size()) {
String old = playback.assigned;
play(queued.front()->get());
String new_name = playback.assigned;
queued.pop_front();
end_notify = false;
emit_signal(SceneStringNames::get_singleton()->animation_changed, old, new_name);
if (end_notify)
emit_signal(SceneStringNames::get_singleton()->animation_changed, old, new_name);
} else {
//stop();
playing = false;
_set_process(false);
end_notify = false;
emit_signal(SceneStringNames::get_singleton()->animation_finished, playback.assigned);
if (end_notify)
emit_signal(SceneStringNames::get_singleton()->animation_finished, playback.assigned);
}
end_reached = false;
}
} else {
@ -954,7 +958,7 @@ void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float
c.current.speed_scale = p_custom_scale;
c.assigned = p_name;
if (!end_notify)
if (!end_reached)
queued.clear();
_set_process(true); // always process when starting an animation
playing = true;
@ -1348,6 +1352,7 @@ AnimationPlayer::AnimationPlayer() {
cache_update_size = 0;
cache_update_prop_size = 0;
speed_scale = 1;
end_reached = false;
end_notify = false;
animation_process_mode = ANIMATION_PROCESS_IDLE;
processing = false;

1
scene/animation/animation_player.h
View file

@ -205,6 +205,7 @@ private:
List<StringName> queued;
bool end_reached;
bool end_notify;
String autoplay;