From b35a2516a0b72fb55faf6183fe1411bb47c905c4 Mon Sep 17 00:00:00 2001 From: kobewi Date: Wed, 11 Aug 2021 21:39:18 +0200 Subject: Improve CapsuleShape2D size clamping --- scene/resources/capsule_shape_2d.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'scene') diff --git a/scene/resources/capsule_shape_2d.cpp b/scene/resources/capsule_shape_2d.cpp index 8f7f3edc28..596fa70f15 100644 --- a/scene/resources/capsule_shape_2d.cpp +++ b/scene/resources/capsule_shape_2d.cpp @@ -59,10 +59,7 @@ void CapsuleShape2D::_update_shape() { } void CapsuleShape2D::set_radius(real_t p_radius) { - radius = p_radius; - if (radius > height * 0.5) { - height = radius * 2; - } + radius = MIN(p_radius, height * 0.5); _update_shape(); } @@ -71,11 +68,7 @@ real_t CapsuleShape2D::get_radius() const { } void CapsuleShape2D::set_height(real_t p_height) { - height = p_height; - if (radius > height * 0.5) { - height = radius * 2; - } - + height = MAX(p_height, radius * 2); _update_shape(); } -- cgit v1.2.3