diff options
| author | Morris Tabor <80684659+mortarroad@users.noreply.github.com> | 2021-05-21 09:58:01 +0200 |
|---|---|---|
| committer | Morris Tabor <80684659+mortarroad@users.noreply.github.com> | 2021-05-22 22:35:42 +0200 |
| commit | d1bc88d426b3751a37beb9c81513ccd16c7e2860 (patch) | |
| tree | 96b3ab3d650a4910c84523ed0e7e475572ee1cca /servers/physics_3d/shape_3d_sw.cpp | |
| parent | d5f9f58b61c2430ee5fae59a0366581482a3b636 (diff) | |
Replace QuickHull with Bullet's convex hull computer.
The code is based on the current version of thirdparty/vhacd and modified to use Godot's types and code style.
Additional changes:
- extended PagedAllocator to allow leaked objects
- applied patch from https://github.com/bulletphysics/bullet3/pull/3037
Diffstat (limited to 'servers/physics_3d/shape_3d_sw.cpp')
| -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; |