godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug with Tween.is_active, fixes #39760 

(cherry picked from commit d60617de10)
This commit is contained in:
Chistpohe LY 2020-06-24 12:26:18 +02:00 committed by Rémi Verschelde
parent 582b4318f8
commit 8ef40b9306
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scene/animation/tween.cpp
View File

@ -689,7 +689,7 @@ void Tween::_tween_process(float p_delta) {
} }
// Are all of the tweens complete? // Are all of the tweens complete?
bool all_finished = true; int any_unfinished = 0;
// For each tween we wish to interpolate... // For each tween we wish to interpolate...
for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) { for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {
@ -697,13 +697,13 @@ void Tween::_tween_process(float p_delta) {
// Get the data from it // Get the data from it
InterpolateData &data = E->get(); InterpolateData &data = E->get();
// Track if we hit one that isn't finished yet
all_finished = all_finished && data.finish;
// Is the data not active or already finished? No need to go any further // Is the data not active or already finished? No need to go any further
if (!data.active || data.finish) if (!data.active || data.finish)
continue; continue;
// Track if we hit one that isn't finished yet
any_unfinished++;
// Get the target object for this interpolation // Get the target object for this interpolation
Object *object = ObjectDB::get_instance(data.id); Object *object = ObjectDB::get_instance(data.id);
if (object == NULL) if (object == NULL)
@ -787,18 +787,17 @@ void Tween::_tween_process(float p_delta) {
emit_signal("tween_completed", object, NodePath(Vector<StringName>(), data.key, false)); emit_signal("tween_completed", object, NodePath(Vector<StringName>(), data.key, false));
// If we are not repeating the tween, remove it // If we are not repeating the tween, remove it
if (!repeat) if (!repeat) {
call_deferred("_remove_by_uid", data.uid); call_deferred("_remove_by_uid", data.uid);
} else if (!repeat) { any_unfinished--;
// Check whether all tweens are finished }
all_finished = all_finished && data.finish;
} }
} }
// One less update left to go // One less update left to go
pending_update--; pending_update--;
// If all tweens are completed, we no longer need to be active // If all tweens are completed, we no longer need to be active
if (all_finished) { if (any_unfinished == 0) {
set_active(false); set_active(false);
emit_signal("tween_all_completed"); emit_signal("tween_all_completed");
} }