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

Merge pull request #46609 from jmb462/fix-no-tween-repeat-after-stop

Browse source 
Fix no tween repeat after stop and restart (Fix #39801)
This commit is contained in:
Rémi Verschelde 2021-03-03 09:15:26 +01:00 committed by GitHub
commit 4d1f83a621
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scene/animation/tween.cpp
View file

@ -869,8 +869,21 @@ void Tween::start() {
return;
}
pending_update++;
for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {
InterpolateData &data = E->get();
data.active = true;
}
pending_update--;
// We want to be activated
set_active(true);
// Don't resume from current position if stop_all() function has been used
if (was_stopped) {
seek(0);
}
was_stopped = false;
}
void Tween::reset(Object *p_object, StringName p_key) {
@ -939,7 +952,7 @@ void Tween::stop(Object *p_object, StringName p_key) {
void Tween::stop_all() {
// We no longer need to be active since all tweens have been stopped
set_active(false);
was_stopped = true;
// For each interpolation...
pending_update++;
for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) {

1
scene/animation/tween.h
View file

@ -107,6 +107,7 @@ private:
float speed_scale = 1.0;
mutable int pending_update = 0;
int uid = 0;
bool was_stopped = false;
List<InterpolateData> interpolates;