godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kill subtweens when their parent tween is killed

Browse Source 
# Conflicts:
#	scene/animation/tween.h
This commit is contained in:
Malcolm Anderson
2025-07-02 20:49:51 -07:00
parent 8d8041bd4d
commit 9ad608691b
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/animation/tween.cpp
View File

@@ -164,6 +164,7 @@ Ref<SubtweenTweener> Tween::tween_subtween(const Ref<Tween> &p_subtween) {
if (tweener->subtween->parent_tree != nullptr) {
tweener->subtween->parent_tree->remove_tween(tweener->subtween);
}
subtweens.push_back(p_subtween);
append(tweener);
return tweener;
}
@@ -200,6 +201,11 @@ void Tween::kill() {
running = false; // For the sake of is_running().
valid = false;
dead = true;
// Kill all subtweens of this tween.
for (Ref<Tween> &st : subtweens) {
st->kill();
}
}
bool Tween::is_running() {

1
scene/animation/tween.h
View File

@@ -112,6 +112,7 @@ private:
SceneTree *parent_tree = nullptr;
LocalVector<List<Ref<Tweener>>> tweeners;
LocalVector<Ref<Tween>> subtweens;
double total_time = 0;
int current_step = -1;
int loops = 1;