|
@@ -61,6 +61,11 @@ Ref<Tween> Tweener::_get_tween() {
|
|
|
return Ref<Tween>(ObjectDB::get_instance(tween_id));
|
|
|
}
|
|
|
|
|
|
+void Tweener::_finish() {
|
|
|
+ finished = true;
|
|
|
+ emit_signal(SceneStringName(finished));
|
|
|
+}
|
|
|
+
|
|
|
void Tweener::_bind_methods() {
|
|
|
ADD_SIGNAL(MethodInfo("finished"));
|
|
|
}
|
|
@@ -612,9 +617,8 @@ bool PropertyTweener::step(double &r_delta) {
|
|
|
return true;
|
|
|
} else {
|
|
|
target_instance->set_indexed(property, final_val);
|
|
|
- finished = true;
|
|
|
r_delta = elapsed_time - delay - duration;
|
|
|
- emit_signal(SceneStringName(finished));
|
|
|
+ _finish();
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
@@ -672,9 +676,8 @@ bool IntervalTweener::step(double &r_delta) {
|
|
|
r_delta = 0;
|
|
|
return true;
|
|
|
} else {
|
|
|
- finished = true;
|
|
|
r_delta = elapsed_time - duration;
|
|
|
- emit_signal(SceneStringName(finished));
|
|
|
+ _finish();
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
@@ -715,9 +718,8 @@ bool CallbackTweener::step(double &r_delta) {
|
|
|
ERR_FAIL_V_MSG(false, "Error calling method from CallbackTweener: " + Variant::get_callable_error_text(callback, nullptr, 0, ce) + ".");
|
|
|
}
|
|
|
|
|
|
- finished = true;
|
|
|
r_delta = elapsed_time - delay;
|
|
|
- emit_signal(SceneStringName(finished));
|
|
|
+ _finish();
|
|
|
return false;
|
|
|
}
|
|
|
|
|
@@ -801,9 +803,8 @@ bool MethodTweener::step(double &r_delta) {
|
|
|
r_delta = 0;
|
|
|
return true;
|
|
|
} else {
|
|
|
- finished = true;
|
|
|
r_delta = elapsed_time - delay - duration;
|
|
|
- emit_signal(SceneStringName(finished));
|
|
|
+ _finish();
|
|
|
return false;
|
|
|
}
|
|
|
}
|