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 /servers | |
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 'servers')
-rw-r--r-- | servers/physics_3d/shape_3d_sw.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics_3d/shape_3d_sw.cpp b/servers/physics_3d/shape_3d_sw.cpp index ccd37ca742..ca7248993f 100644 --- a/servers/physics_3d/shape_3d_sw.cpp +++ b/servers/physics_3d/shape_3d_sw.cpp @@ -31,8 +31,8 @@ #include "shape_3d_sw.h" #include "core/io/image.h" +#include "core/math/convex_hull.h" #include "core/math/geometry_3d.h" -#include "core/math/quick_hull.h" #include "core/templates/sort_array.h" // HeightMapShape3DSW is based on Bullet btHeightfieldTerrainShape. @@ -1089,9 +1089,9 @@ Vector3 ConvexPolygonShape3DSW::get_moment_of_inertia(real_t p_mass) const { } void ConvexPolygonShape3DSW::_setup(const Vector<Vector3> &p_vertices) { - Error err = QuickHull::build(p_vertices, mesh); + Error err = ConvexHullComputer::convex_hull(p_vertices, mesh); if (err != OK) { - ERR_PRINT("Failed to build QuickHull"); + ERR_PRINT("Failed to build convex hull"); } AABB _aabb; |