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

corrected small bug (!visited instead of visited)

This commit is contained in:
Paolo Cignoni 2015-10-26 10:06:17 +00:00
parent ec8dde9326
commit d015efca10
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ private:
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
(*chVi).P().Import(v[i]->P()); (*chVi).P().Import(v[i]->P());
v[i]->SetV(); v[i]->SetV();
indexInputVertex[chVi] = vcg::tri::Index(mesh, v[i]); indexInputVertex[chVi] = vcg::tri::Index(mesh, v[i]);
chVi++; chVi++;
} }
@ -145,7 +145,7 @@ private:
chVi = vcg::tri::Allocator<CHMesh>::AddVertices(convexHull, 1); chVi = vcg::tri::Allocator<CHMesh>::AddVertices(convexHull, 1);
(*chVi).P().Import(v4->P()); (*chVi).P().Import(v4->P());
indexInputVertex[chVi] = vcg::tri::Index(mesh, v4); indexInputVertex[chVi] = vcg::tri::Index(mesh, v4);
v4->SetV(); v4->SetV();
fi = vcg::tri::Allocator<CHMesh>::AddFace(convexHull, &convexHull.vert[3], convexHull.face[0].V0(1), convexHull.face[0].V0(0)); fi = vcg::tri::Allocator<CHMesh>::AddFace(convexHull, &convexHull.vert[3], convexHull.face[0].V0(1), convexHull.face[0].V0(0));
(*fi).N() = vcg::NormalizedTriangleNormal(*fi); (*fi).N() = vcg::NormalizedTriangleNormal(*fi);
fi = vcg::tri::Allocator<CHMesh>::AddFace(convexHull, &convexHull.vert[3], convexHull.face[0].V1(1), convexHull.face[0].V1(0)); fi = vcg::tri::Allocator<CHMesh>::AddFace(convexHull, &convexHull.vert[3], convexHull.face[0].V1(1), convexHull.face[0].V1(0));
@ -175,7 +175,7 @@ public:
typename CHMesh:: template PerVertexAttributeHandle<size_t> indexInputVertex = Allocator<InputMesh>::template GetPerVertexAttribute<size_t>(convexHull, std::string("indexInput")); typename CHMesh:: template PerVertexAttributeHandle<size_t> indexInputVertex = Allocator<InputMesh>::template GetPerVertexAttribute<size_t>(convexHull, std::string("indexInput"));
if (mesh.vert.size() < 4) if (mesh.vert.size() < 4)
return false; return false;
vcg::tri::UpdateFlags<InputMesh>::VertexClearV(mesh); vcg::tri::UpdateFlags<InputMesh>::VertexClearV(mesh);
InitConvexHull(mesh, convexHull); InitConvexHull(mesh, convexHull);
//Build list of visible vertices for each convex hull face and find the furthest vertex for each face //Build list of visible vertices for each convex hull face and find the furthest vertex for each face
@ -183,23 +183,23 @@ public:
std::vector<Pair> furthestVexterPerFace(convexHull.face.size(), std::make_pair((InputVertexPointer)NULL, 0.0f)); std::vector<Pair> furthestVexterPerFace(convexHull.face.size(), std::make_pair((InputVertexPointer)NULL, 0.0f));
for (int i = 0; i < mesh.vert.size(); i++) for (int i = 0; i < mesh.vert.size(); i++)
{ {
if (!mesh.vert[i].IsV()) if (!mesh.vert[i].IsV())
{ {
ScalarType maxDist = 0; ScalarType maxDist = 0;
for (int j = 0; j < convexHull.face.size(); j++) for (int 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 > 0)
{ {
listVertexPerFace[j].push_back(&mesh.vert[i]); listVertexPerFace[j].push_back(&mesh.vert[i]);
if (dist > furthestVexterPerFace[j].second) if (dist > furthestVexterPerFace[j].second)
{ {
furthestVexterPerFace[j].second = dist; furthestVexterPerFace[j].second = dist;
furthestVexterPerFace[j].first = &mesh.vert[i]; furthestVexterPerFace[j].first = &mesh.vert[i];
} }
} }
} }
} }
} }
for (int i = 0; i < listVertexPerFace.size(); i++) for (int i = 0; i < listVertexPerFace.size(); i++)
@ -243,7 +243,7 @@ public:
{ {
CHVertexIterator vi = vcg::tri::Allocator<CHMesh>::AddVertices(convexHull, 1); CHVertexIterator vi = vcg::tri::Allocator<CHMesh>::AddVertices(convexHull, 1);
(*vi).P().Import((*vertex).P()); (*vi).P().Import((*vertex).P());
vertex->SetV(); vertex->SetV();
indexInputVertex[vi] = vcg::tri::Index(mesh, vertex); indexInputVertex[vi] = vcg::tri::Index(mesh, vertex);
} }
@ -293,19 +293,19 @@ public:
Pair newInfo = std::make_pair((InputVertexPointer)NULL , 0.0f); Pair newInfo = std::make_pair((InputVertexPointer)NULL , 0.0f);
for (int ii = 0; ii < vertexToTest.size(); ii++) for (int ii = 0; ii < vertexToTest.size(); ii++)
{ {
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 > 0)
{ {
tempVect.push_back(vertexToTest[ii]); tempVect.push_back(vertexToTest[ii]);
if (dist > newInfo.second) if (dist > newInfo.second)
{ {
newInfo.second = dist; newInfo.second = dist;
newInfo.first = vertexToTest[ii]; newInfo.first = vertexToTest[ii];
} }
} }
} }
} }
listVertexPerFace.push_back(tempVect); listVertexPerFace.push_back(tempVect);
furthestVexterPerFace.push_back(newInfo); furthestVexterPerFace.push_back(newInfo);
@ -365,6 +365,8 @@ public:
tri::RequireCompactness(m); tri::RequireCompactness(m);
InputMesh flipM; InputMesh flipM;
printf("Input mesh m %i %i\n",m.vn,m.fn);
tri::Allocator<InputMesh>::AddVertices(flipM,m.vn); tri::Allocator<InputMesh>::AddVertices(flipM,m.vn);
ScalarType maxDist=0; ScalarType maxDist=0;
InputVertexIterator ci=flipM.vert.begin(); InputVertexIterator ci=flipM.vert.begin();