Skip to content

GodotCylinderShape3D::get_supports: delete dead code #66568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2022
Merged

GodotCylinderShape3D::get_supports: delete dead code #66568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions servers/physics_3d/godot_shape_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,29 +735,6 @@ void GodotCylinderShape3D::get_supports(const Vector3 &p_normal, int p_max, Vect
r_amount = 1;
r_type = FEATURE_POINT;
r_supports[0] = get_support(p_normal);
return;

Vector3 n = p_normal;
real_t h = n.y * Math::sqrt(0.25 * height * height + radius * radius);
if (Math::abs(h) > 1.0) {
// Top or bottom surface.
n.y = (n.y > 0.0) ? height * 0.5 : -height * 0.5;
} else {
// Lateral surface.
n.y = height * 0.5 * h;
}

real_t s = Math::sqrt(n.x * n.x + n.z * n.z);
if (Math::is_zero_approx(s)) {
n.x = 0.0;
n.z = 0.0;
} else {
real_t scaled_radius = radius / s;
n.x = n.x * scaled_radius;
n.z = n.z * scaled_radius;
}

r_supports[0] = n;
}
}

Expand Down