From c518b96362f5a92a31b9b993f6f31cff3d397d2d Mon Sep 17 00:00:00 2001 From: Rasmus Ketelsen Date: Wed, 23 May 2018 13:55:15 +0200 Subject: [PATCH] Take tween speed into account when calculating runtime --- scene/animation/tween.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 49013b160af..4eefcc9ced0 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -886,6 +886,10 @@ real_t Tween::tell() const { real_t Tween::get_runtime() const { + if (speed_scale == 0) { + return INFINITY; + } + pending_update++; real_t runtime = 0; for (const List::Element *E = interpolates.front(); E; E = E->next()) { @@ -896,7 +900,8 @@ real_t Tween::get_runtime() const { runtime = t; } pending_update--; - return runtime; + + return runtime / speed_scale; } bool Tween::_calc_delta_val(const Variant &p_initial_val, const Variant &p_final_val, Variant &p_delta_val) {