summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-05-22 23:22:48 +0200
committerGitHub <noreply@github.com>2021-05-22 23:22:48 +0200
commitde4c17f716acf0efe484a3f553ebd817fd4c256e (patch)
treea23662879adedea7e4a967a06d4ace2b63c6d3e3 /modules
parent234a101eb377d95a7ae11d4830cfdb115fbd0599 (diff)
parentd1bc88d426b3751a37beb9c81513ccd16c7e2860 (diff)
Merge pull request #48916 from mortarroad/master-convex-hull-ported
Replace QuickHull with Bullet's convex hull computer.
Diffstat (limited to 'modules')
-rw-r--r--modules/gdnavigation/navigation_mesh_generator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdnavigation/navigation_mesh_generator.cpp b/modules/gdnavigation/navigation_mesh_generator.cpp
index a7d4e79148..7d30ce0f44 100644
--- a/modules/gdnavigation/navigation_mesh_generator.cpp
+++ b/modules/gdnavigation/navigation_mesh_generator.cpp
@@ -32,7 +32,7 @@
#include "navigation_mesh_generator.h"
-#include "core/math/quick_hull.h"
+#include "core/math/convex_hull.h"
#include "core/os/thread.h"
#include "scene/3d/collision_shape_3d.h"
#include "scene/3d/mesh_instance_3d.h"
@@ -220,7 +220,7 @@ void NavigationMeshGenerator::_parse_geometry(Transform p_accumulated_transform,
Vector<Vector3> varr = Variant(convex_polygon->get_points());
Geometry3D::MeshData md;
- Error err = QuickHull::build(varr, md);
+ Error err = ConvexHullComputer::convex_hull(varr, md);
if (err == OK) {
PackedVector3Array faces;