diff options
| author | Silc Lizard (Tokage) Renew <61938263+TokageItLab@users.noreply.github.com> | 2023-11-10 21:29:45 +0900 |
|---|---|---|
| committer | Silc Lizard (Tokage) Renew <61938263+TokageItLab@users.noreply.github.com> | 2023-11-16 21:37:18 +0900 |
| commit | 80c9533810de435ba0b7ed5d7a0d5ae0f8e95e55 (patch) | |
| tree | eb322f1367027235ce6a38e9661a522a9f4ca464 /scene/animation/tween.cpp | |
| parent | d5217b68db68d52a2f393e935fb38dde6a0f802a (diff) | |
| download | redot-engine-80c9533810de435ba0b7ed5d7a0d5ae0f8e95e55.tar.gz | |
Rework blending method in Variant animation for Int/Array/String
Diffstat (limited to 'scene/animation/tween.cpp')
| -rw-r--r-- | scene/animation/tween.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 32028bcf28..d6a6af3f08 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -420,13 +420,8 @@ Variant Tween::interpolate_variant(const Variant &p_initial_val, const Variant & ERR_FAIL_INDEX_V(p_trans, TransitionType::TRANS_MAX, Variant()); ERR_FAIL_INDEX_V(p_ease, EaseType::EASE_MAX, Variant()); - // Special case for bool. - if (p_initial_val.get_type() == Variant::BOOL) { - return run_equation(p_trans, p_ease, p_time, p_initial_val, p_delta_val, p_duration) >= 0.5; - } - Variant ret = Animation::add_variant(p_initial_val, p_delta_val); - ret = Animation::interpolate_variant(p_initial_val, ret, run_equation(p_trans, p_ease, p_time, 0.0, 1.0, p_duration)); + ret = Animation::interpolate_variant(p_initial_val, ret, run_equation(p_trans, p_ease, p_time, 0.0, 1.0, p_duration), p_initial_val.is_string()); return ret; } |