diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-22 23:22:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 23:22:48 +0200 |
| commit | de4c17f716acf0efe484a3f553ebd817fd4c256e (patch) | |
| tree | a23662879adedea7e4a967a06d4ace2b63c6d3e3 /editor | |
| parent | 234a101eb377d95a7ae11d4830cfdb115fbd0599 (diff) | |
| parent | d1bc88d426b3751a37beb9c81513ccd16c7e2860 (diff) | |
Merge pull request #48916 from mortarroad/master-convex-hull-ported
Replace QuickHull with Bullet's convex hull computer.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/node_3d_editor_gizmos.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/node_3d_editor_gizmos.cpp b/editor/node_3d_editor_gizmos.cpp index afafd7d195..cc261ea868 100644 --- a/editor/node_3d_editor_gizmos.cpp +++ b/editor/node_3d_editor_gizmos.cpp @@ -30,9 +30,9 @@ #include "node_3d_editor_gizmos.h" +#include "core/math/convex_hull.h" #include "core/math/geometry_2d.h" #include "core/math/geometry_3d.h" -#include "core/math/quick_hull.h" #include "scene/3d/audio_stream_player_3d.h" #include "scene/3d/baked_lightmap.h" #include "scene/3d/collision_polygon_3d.h" @@ -4161,7 +4161,7 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) { if (points.size() > 3) { Vector<Vector3> varr = Variant(points); Geometry3D::MeshData md; - Error err = QuickHull::build(varr, md); + Error err = ConvexHullComputer::convex_hull(varr, md); if (err == OK) { Vector<Vector3> points2; points2.resize(md.edges.size() * 2); |