diff options
| author | Micky <micheledevita2@gmail.com> | 2022-08-30 10:43:32 +0200 |
|---|---|---|
| committer | Micky <micheledevita2@gmail.com> | 2022-08-30 10:53:31 +0200 |
| commit | 2b18a4002c8e500597bc8f5d605f9be8d1b22236 (patch) | |
| tree | 268c149f5afc11a87d9ec85c88b81434b7bfa3a7 /scene | |
| parent | 432b25d3649319517827dbf7bc275e81e0a2b92e (diff) | |
Cast between float and ints in Tween.`tween_property()`
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/tween.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 7d9f83b7a2..5b18d4e457 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -75,10 +75,17 @@ Ref<PropertyTweener> Tween::tween_property(Object *p_target, NodePath p_property ERR_FAIL_COND_V_MSG(!valid, nullptr, "Tween invalid. Either finished or created outside scene tree."); ERR_FAIL_COND_V_MSG(started, nullptr, "Can't append to a Tween that has started. Use stop() first."); -#ifdef DEBUG_ENABLED Variant::Type property_type = p_target->get_indexed(p_property.get_as_property_path().get_subnames()).get_type(); - ERR_FAIL_COND_V_MSG(property_type != p_to.get_type(), Ref<PropertyTweener>(), "Type mismatch between property and final value: " + Variant::get_type_name(property_type) + " and " + Variant::get_type_name(p_to.get_type())); -#endif + if (property_type != p_to.get_type()) { + // Cast p_to between floats and ints to avoid minor annoyances. + if (property_type == Variant::FLOAT && p_to.get_type() == Variant::INT) { + p_to = float(p_to); + } else if (property_type == Variant::INT && p_to.get_type() == Variant::FLOAT) { + p_to = int(p_to); + } else { + ERR_FAIL_V_MSG(Ref<PropertyTweener>(), "Type mismatch between property and final value: " + Variant::get_type_name(property_type) + " and " + Variant::get_type_name(p_to.get_type())); + } + } Ref<PropertyTweener> tweener = memnew(PropertyTweener(p_target, p_property, p_to, p_duration)); append(tweener); |