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

cleaned up a few typenames

This commit is contained in:
Paolo Cignoni 2018-02-25 18:37:11 +01:00
parent a9bc96b798
commit 912e78c4cf
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vcg/complex/algorithms/clean.h
View File

@ -1792,7 +1792,7 @@ public:
*/ */
static void SelectFoldedFaceFromOneRingFaces(MeshType &m, ScalarType cosThreshold) static void SelectFoldedFaceFromOneRingFaces(MeshType &m, ScalarType cosThreshold)
{ {
typedef std::unordered_set<typename MeshType::VertexPointer> VertexSet; typedef std::unordered_set<VertexPointer> VertexSet;
tri::RequireVFAdjacency(m); tri::RequireVFAdjacency(m);
tri::RequirePerFaceNormal(m); tri::RequirePerFaceNormal(m);
tri::RequirePerVertexNormal(m); tri::RequirePerVertexNormal(m);
@ -1807,32 +1807,32 @@ public:
for (int i = 0; i < m.face.size(); i++) for (int i = 0; i < m.face.size(); i++)
{ {
VertexSet nearVertex; VertexSet nearVertex;
std::vector<typename MeshType::CoordType> point; std::vector<CoordType> pointVec;
typename MeshType::FacePointer f = &m.face[i]; FacePointer f = &m.face[i];
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
{ {
std::vector<typename MeshType::VertexPointer> temp; std::vector<VertexPointer> temp;
vcg::face::VVStarVF<typename MeshType::FaceType>(f->V(j), temp); vcg::face::VVStarVF<FaceType>(f->V(j), temp);
typename std::vector<typename MeshType::VertexPointer>::iterator iter = temp.begin(); typename std::vector<VertexPointer>::iterator iter = temp.begin();
for (; iter != temp.end(); iter++) for (; iter != temp.end(); iter++)
{ {
if ((*iter) != f->V1(j) && (*iter) != f->V2(j)) if ((*iter) != f->V1(j) && (*iter) != f->V2(j))
{ {
if (nearVertex.insert((*iter)).second) if (nearVertex.insert((*iter)).second)
point.push_back((*iter)->P()); pointVec.push_back((*iter)->P());
} }
} }
nearVertex.insert(f->V(j)); nearVertex.insert(f->V(j));
point.push_back(f->P(j)); pointVec.push_back(f->P(j));
} }
if (point.size() > 3) if (pointVec.size() > 3)
{ {
vcg::Plane3<typename MeshType::ScalarType> plane; vcg::Plane3<ScalarType> plane;
vcg::FitPlaneToPointSet(point, plane); vcg::FitPlaneToPointSet(pointVec, plane);
float avgDot = 0; float avgDot = 0;
for (auto nvp : nearVertex.end()) for (auto nvp : nearVertex)
avgDot += plane.Direction().dot((*nvp)->N()); avgDot += plane.Direction().dot(nvp->N());
avgDot /= nearVertex.size(); avgDot /= nearVertex.size();
typename MeshType::VertexType::NormalType normal; typename MeshType::VertexType::NormalType normal;
if (avgDot < 0) if (avgDot < 0)