manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added tolerance parameter to quickhull

This commit is contained in:
Luigi Malomo 2019-01-05 13:01:50 +01:00
parent b7b1bc63e7
commit 44c32a0b02
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vcg/complex/algorithms/convex_hull.h
View File

@ -166,8 +166,9 @@ public:
"The quickhull algorithm for convex hulls" by C. Bradford Barber et al. "The quickhull algorithm for convex hulls" by C. Bradford Barber et al.
ACM Transactions on Mathematical Software, Volume 22 Issue 4, Dec. 1996 ACM Transactions on Mathematical Software, Volume 22 Issue 4, Dec. 1996
*/ */
static bool ComputeConvexHull(InputMesh& mesh, CHMesh& convexHull) static bool ComputeConvexHull(InputMesh& mesh, CHMesh& convexHull, ScalarType distTolerance = 0)
{ {
assert(distTolerance >= 0);
vcg::tri::RequireFFAdjacency(convexHull); vcg::tri::RequireFFAdjacency(convexHull);
vcg::tri::RequirePerFaceNormal(convexHull); vcg::tri::RequirePerFaceNormal(convexHull);
vcg::tri::Allocator<InputMesh>::CompactVertexVector(mesh); vcg::tri::Allocator<InputMesh>::CompactVertexVector(mesh);
@ -187,7 +188,7 @@ public:
for (size_t j = 0; j < convexHull.face.size(); j++) for (size_t j = 0; j < convexHull.face.size(); j++)
{ {
ScalarType dist = (mesh.vert[i].P() - convexHull.face[j].P(0)).dot(convexHull.face[j].N()); ScalarType dist = (mesh.vert[i].P() - convexHull.face[j].P(0)).dot(convexHull.face[j].N());
if (dist > 0) if (dist > distTolerance)
{ {
listVertexPerFace[j].push_back(&mesh.vert[i]); listVertexPerFace[j].push_back(&mesh.vert[i]);
if (dist > furthestVexterPerFace[j].second) if (dist > furthestVexterPerFace[j].second)
@ -223,7 +224,7 @@ public:
{ {
int indexF = vcg::tri::Index(convexHull, nextF); int indexF = vcg::tri::Index(convexHull, nextF);
ScalarType dist = (vertex->P() - nextF->P(0)).dot(nextF->N()); ScalarType dist = (vertex->P() - nextF->P(0)).dot(nextF->N());
if (dist < 0) if (dist < distTolerance)
{ {
borderFace.push_back(indexF); borderFace.push_back(indexF);
fp->SetB(ii); fp->SetB(ii);
@ -294,7 +295,7 @@ public:
if (!(*vertexToTest[ii]).IsV()) if (!(*vertexToTest[ii]).IsV())
{ {
float dist = ((*vertexToTest[ii]).P() - (*fi).P(0)).dot((*fi).N()); float dist = ((*vertexToTest[ii]).P() - (*fi).P(0)).dot((*fi).N());
if (dist > 0) if (dist > distTolerance)
{ {
tempVect.push_back(vertexToTest[ii]); tempVect.push_back(vertexToTest[ii]);
if (dist > newInfo.second) if (dist > newInfo.second)