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

Merge pull request #52059 from mortarroad/3.x-fix-convex-hull-double-edges

Browse Source 
[3.x] Fix emitting duplicate edges for convex hulls
This commit is contained in:
Camille Mohr-Daurat 2021-08-24 15:41:11 -07:00 committed by GitHub
commit 52b7be5c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/math/convex_hull.cpp
View File

@ -2268,10 +2268,21 @@ Error ConvexHullComputer::convex_hull(const Vector3 *p_points, int32_t p_point_c
r_mesh.vertices = ch.vertices;
r_mesh.edges.resize(ch.edges.size());
// Copy the edges over. There's two "half-edges" for every edge, so we pick only one of them.
r_mesh.edges.resize(ch.edges.size() / 2);
uint32_t edges_copied = 0;
for (uint32_t i = 0; i < ch.edges.size(); i++) {
r_mesh.edges.write[i].a = (&ch.edges[i])->get_source_vertex();
r_mesh.edges.write[i].b = (&ch.edges[i])->get_target_vertex();
uint32_t a = (&ch.edges[i])->get_source_vertex();
uint32_t b = (&ch.edges[i])->get_target_vertex();
if (a < b) { // Copy only the "canonical" edge. For the reverse edge, this will be false.
ERR_BREAK(edges_copied >= (uint32_t)r_mesh.edges.size());
r_mesh.edges.write[edges_copied].a = a;
r_mesh.edges.write[edges_copied].b = b;
edges_copied++;
}
}
if (edges_copied != (uint32_t)r_mesh.edges.size()) {
ERR_PRINT("Invalid edge count.");
}
r_mesh.faces.resize(ch.faces.size());