Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-26 06:03:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #57372 from KoBeWi/tween_freeze()

Browse Source 
Better handle infinite Tween loops
This commit is contained in:
Rémi Verschelde 2022-01-29 08:08:34 +01:00 committed by GitHub
commit cb3d308f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Tween.xml
View File

@ -146,7 +146,7 @@
<description> <description>
Sets the number of times the tweening sequence will be repeated, i.e. [code]set_loops(2)[/code] will run the animation twice. Sets the number of times the tweening sequence will be repeated, i.e. [code]set_loops(2)[/code] will run the animation twice.
Calling this method without arguments will make the [Tween] run infinitely, until it is either killed by [method kill] or by freeing bound node, or all the animated objects have been freed (which makes further animation impossible). Calling this method without arguments will make the [Tween] run infinitely, until it is either killed by [method kill] or by freeing bound node, or all the animated objects have been freed (which makes further animation impossible).
[b]Warning:[/b] Make sure to always add some duration/delay when using infinite loops. 0-duration looped animations (e.g. single [CallbackTweener] with no delay) are equivalent to infinite [code]while[/code] loops and will freeze your game. [b]Warning:[/b] Make sure to always add some duration/delay when using infinite loops. 0-duration looped animations (e.g. single [CallbackTweener] with no delay or [PropertyTweener] with invalid node) are equivalent to infinite [code]while[/code] loops and will freeze your game. If a [Tween]'s lifetime depends on some node, always use [method bind_node].
</description> </description>
</method> </method>
<method name="set_parallel"> <method name="set_parallel">

10
scene/animation/tween.cpp
View File

@ -283,6 +283,10 @@ bool Tween::step(float p_delta) {
float step_delta = rem_delta; float step_delta = rem_delta;
step_active = false; step_active = false;
#ifdef DEBUG_ENABLED
float prev_delta = rem_delta;
#endif
for (Ref<Tweener> &tweener : tweeners.write[current_step]) { for (Ref<Tweener> &tweener : tweeners.write[current_step]) {
// Modified inside Tweener.step(). // Modified inside Tweener.step().
float temp_delta = rem_delta; float temp_delta = rem_delta;
@ -312,6 +316,12 @@ bool Tween::step(float p_delta) {
start_tweeners(); start_tweeners();
} }
} }
#ifdef DEBUG_ENABLED
if (Math::is_equal_approx(rem_delta, prev_delta) && running && loops <= 0) {
ERR_FAIL_V_MSG(false, "Infinite loop detected. Check set_loops() description for more info.");
}
#endif
} }
return true; return true;