godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51527 from KoBeWi/minmax

Browse Source 
Improve CapsuleShape2D size clamping
This commit is contained in:
Rémi Verschelde 2021-08-11 22:09:52 +02:00 committed by GitHub
commit d2fc0a8057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/resources/capsule_shape_2d.cpp
View File

@ -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();
}