Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100735 from tvenclovas96/tween_ignore_time_scale

Browse Source 
Add an option for tweens to ignore `Engine.time_scale`
This commit is contained in:
Thaddeus Crews
2024-12-30 08:58:25 -06:00
parent 01c6e18963 dbc0cc1437
commit 0e00f41650
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/classes/Tween.xml
View File

@@ -228,6 +228,13 @@
[/codeblock]
</description>
</method>
<method name="set_ignore_time_scale">
<return type="Tween" />
<param index="0" name="ignore" type="bool" default="true" />
<description>
If [param ignore] is [code]true[/code], the tween will ignore [member Engine.time_scale] and update with the real, elapsed time. This affects all [Tweener]s and their delays. Default value is [code]false[/code].
</description>
</method>
<method name="set_loops">
<return type="Tween" />
<param index="0" name="loops" type="int" default="0" />

10
scene/animation/tween.cpp
View File

@@ -226,6 +226,15 @@ Tween::TweenPauseMode Tween::get_pause_mode() {
return pause_mode;
}
Ref<Tween> Tween::set_ignore_time_scale(bool p_ignore) {
ignore_time_scale = p_ignore;
return this;
}
bool Tween::is_ignoring_time_scale() const {
return ignore_time_scale;
}
Ref<Tween> Tween::set_parallel(bool p_parallel) {
default_parallel = p_parallel;
parallel_enabled = p_parallel;
@@ -451,6 +460,7 @@ void Tween::_bind_methods() {
ClassDB::bind_method(D_METHOD("bind_node", "node"), &Tween::bind_node);
ClassDB::bind_method(D_METHOD("set_process_mode", "mode"), &Tween::set_process_mode);
ClassDB::bind_method(D_METHOD("set_pause_mode", "mode"), &Tween::set_pause_mode);
ClassDB::bind_method(D_METHOD("set_ignore_time_scale", "ignore"), &Tween::set_ignore_time_scale, DEFVAL(true));
ClassDB::bind_method(D_METHOD("set_parallel", "parallel"), &Tween::set_parallel, DEFVAL(true));
ClassDB::bind_method(D_METHOD("set_loops", "loops"), &Tween::set_loops, DEFVAL(0));

3
scene/animation/tween.h
View File

@@ -115,6 +115,7 @@ private:
int loops = 1;
int loops_done = 0;
float speed_scale = 1;
bool ignore_time_scale = false;
bool is_bound = false;
bool started = false;
@@ -161,6 +162,8 @@ public:
TweenProcessMode get_process_mode();
Ref<Tween> set_pause_mode(TweenPauseMode p_mode);
TweenPauseMode get_pause_mode();
Ref<Tween> set_ignore_time_scale(bool p_ignore = true);
bool is_ignoring_time_scale() const;
Ref<Tween> set_parallel(bool p_parallel);
Ref<Tween> set_loops(int p_loops);

3
scene/main/scene_tree.cpp
View File

@@ -691,7 +691,8 @@ void SceneTree::process_tweens(double p_delta, bool p_physics) {
continue;
}
if (!E->get()->step(p_delta)) {
double time_step = E->get()->is_ignoring_time_scale() ? Engine::get_singleton()->get_process_step() : p_delta;
if (!E->get()->step(time_step)) {
E->get()->clear();
tweens.erase(E);
}