Merge pull request #80702 from KoBeWi/lagging_animation

Fix initial value with delay in PropertyTweener
godotengine · Aug 17, 2023 · c5a7462 · c5a7462
2 parents c28cc5d + 1660575
commit c5a7462
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp
@@ -546,8 +546,9 @@ void PropertyTweener::start() {
 		return;
 	}
 
-	if (do_continue) {
+	if (do_continue && Math::is_zero_approx(delay)) {
 		initial_val = target_instance->get_indexed(property);
+		do_continue = false;
 	}
 
 	if (relative) {
@@ -572,6 +573,10 @@ bool PropertyTweener::step(double &r_delta) {
 	if (elapsed_time < delay) {
 		r_delta = 0;
 		return true;
+	} else if (do_continue && !Math::is_zero_approx(delay)) {
+		initial_val = target_instance->get_indexed(property);
+		delta_val = Animation::subtract_variant(final_val, initial_val);
+		do_continue = false;
 	}
 
 	double time = MIN(elapsed_time - delay, duration);