godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-27 15:57:02 +00:00
Code Releases Wiki Activity

Merge pull request #103903 from kiroxas/improveCylinderGizmo

Browse Source 
Improve cylinder gizmo performance
This commit is contained in:
Thaddeus Crews
2025-03-10 21:05:45 -05:00
parent 13907ec474 8eaab62930
commit ff674de65e
1 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp
View File

@@ -530,50 +530,63 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
float radius = cs2->get_radius(); float radius = cs2->get_radius();
float height = cs2->get_height(); float height = cs2->get_height();
#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y) \
points_ptrw[index++] = Vector3(from_x, y, from_y); \
points_ptrw[index++] = Vector3(to_x, y, to_y); \
points_ptrw[index++] = Vector3(from_x, y, -from_y); \
points_ptrw[index++] = Vector3(to_x, y, -to_y); \
points_ptrw[index++] = Vector3(-from_x, y, from_y); \
points_ptrw[index++] = Vector3(-to_x, y, to_y); \
points_ptrw[index++] = Vector3(-from_x, y, -from_y); \
points_ptrw[index++] = Vector3(-to_x, y, -to_y);
// Number of points in an octant. So there will be 8 * points_in_octant * 2 points in total for one circle.
// This corresponds to the smoothness of the circle.
const uint32_t points_in_octant = 16;
const real_t inc = (Math_PI / (4 * points_in_octant));
const real_t radius_squared = radius * radius;
real_t r = 0;
Vector<Vector3> points; Vector<Vector3> points;
uint32_t index = 0;
// 4 vertical lines and 2 full circles.
points.resize(4 * 2 + 2 * 8 * points_in_octant * 2);
Vector3 *points_ptrw = points.ptrw();
float y_value = height * 0.5;
Vector3 d(0, height * 0.5, 0); // Vertical lines.
for (int i = 0; i < 360; i++) { points_ptrw[index++] = Vector3(0.f, y_value, radius);
float ra = Math::deg_to_rad((float)i); points_ptrw[index++] = Vector3(0.f, -y_value, radius);
float rb = Math::deg_to_rad((float)i + 1); points_ptrw[index++] = Vector3(0.f, y_value, -radius);
Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius; points_ptrw[index++] = Vector3(0.f, -y_value, -radius);
Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius; points_ptrw[index++] = Vector3(radius, y_value, 0.f);
points_ptrw[index++] = Vector3(radius, -y_value, 0.f);
points_ptrw[index++] = Vector3(-radius, y_value, 0.f);
points_ptrw[index++] = Vector3(-radius, -y_value, 0.f);
points.push_back(Vector3(a.x, 0, a.y) + d); float previous_x = radius;
points.push_back(Vector3(b.x, 0, b.y) + d); float previous_y = 0.f;
points.push_back(Vector3(a.x, 0, a.y) - d); for (uint32_t i = 0; i < points_in_octant; ++i) {
points.push_back(Vector3(b.x, 0, b.y) - d); r += inc;
real_t x = Math::cos(r) * radius;
real_t y = Math::sqrt(radius_squared - (x * x));
if (i % 90 == 0) { // High circle ring.
points.push_back(Vector3(a.x, 0, a.y) + d); PUSH_QUARTER(previous_x, previous_y, x, y, y_value);
points.push_back(Vector3(a.x, 0, a.y) - d); PUSH_QUARTER(previous_y, previous_x, y, x, y_value);
}
// Low circle ring.
PUSH_QUARTER(previous_x, previous_y, x, y, -y_value);
PUSH_QUARTER(previous_y, previous_x, y, x, -y_value);
previous_x = x;
previous_y = y;
} }
#undef PUSH_QUARTER
p_gizmo->add_lines(points, material, false, collision_color); p_gizmo->add_lines(points, material, false, collision_color);
p_gizmo->add_collision_segments(points);
Vector<Vector3> collision_segments;
for (int i = 0; i < 64; i++) {
float ra = i * (Math_TAU / 64.0);
float rb = (i + 1) * (Math_TAU / 64.0);
Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
collision_segments.push_back(Vector3(a.x, 0, a.y) + d);
collision_segments.push_back(Vector3(b.x, 0, b.y) + d);
collision_segments.push_back(Vector3(a.x, 0, a.y) - d);
collision_segments.push_back(Vector3(b.x, 0, b.y) - d);
if (i % 16 == 0) {
collision_segments.push_back(Vector3(a.x, 0, a.y) + d);
collision_segments.push_back(Vector3(a.x, 0, a.y) - d);
}
}
p_gizmo->add_collision_segments(collision_segments);
Vector<Vector3> handles = helper->cylinder_get_handles(cs2->get_height(), cs2->get_radius()); Vector<Vector3> handles = helper->cylinder_get_handles(cs2->get_height(), cs2->get_radius());
p_gizmo->add_handles(handles, handles_material); p_gizmo->add_handles(handles, handles_material);