godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26455 from hpvb/fix-21141

Browse Source 
Scale quickhull tolerance with mesh size
This commit is contained in:
Rémi Verschelde 2019-03-01 22:39:33 +01:00 committed by GitHub
commit 78fcbb80c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/math/quick_hull.cpp
View File

@ -36,8 +36,6 @@ uint32_t QuickHull::debug_stop_after = 0xFFFFFFFF;
Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_mesh) { Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_mesh) {
static const real_t over_tolerance = 0.0001;
/* CREATE AABB VOLUME */ /* CREATE AABB VOLUME */
AABB aabb; AABB aabb;
@ -180,6 +178,8 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_me
faces.push_back(f); faces.push_back(f);
} }
real_t over_tolerance = 3 * UNIT_EPSILON * (aabb.size.x + aabb.size.y + aabb.size.z);
/* COMPUTE AVAILABLE VERTICES */ /* COMPUTE AVAILABLE VERTICES */
for (int i = 0; i < p_points.size(); i++) { for (int i = 0; i < p_points.size(); i++) {

2
core/math/quick_hull.h
View File

@ -64,7 +64,7 @@ public:
struct Face { struct Face {
Plane plane; Plane plane;
int vertices[3]; uint32_t vertices[3];
Vector<int> points_over; Vector<int> points_over;
bool operator<(const Face &p_face) const { bool operator<(const Face &p_face) const {