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

Changed HasMark to HasPerFaceMark(m) and commented some unused internal vars of the class

This commit is contained in:
Paolo Cignoni 2006-05-03 21:40:27 +00:00
parent c7196917fd
commit 6ce9535dc3
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vcg/complex/trimesh/clean.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.37 2006/04/18 07:01:22 zifnab1974
added a ; how could this ever compile?
Revision 1.36 2006/04/12 15:08:51 cignoni Revision 1.36 2006/04/12 15:08:51 cignoni
Added ConnectedIterator (should be moved somewhere else) Added ConnectedIterator (should be moved somewhere else)
Cleaned ConnectedComponents Cleaned ConnectedComponents
@ -242,11 +245,11 @@ private:
typedef GridStaticPtr<FaceType, ScalarType > TriMeshGrid; typedef GridStaticPtr<FaceType, ScalarType > TriMeshGrid;
typedef Point3<ScalarType> Point3x; typedef Point3<ScalarType> Point3x;
TriMeshGrid gM; //TriMeshGrid gM;
FaceIterator fi; //FaceIterator fi;
FaceIterator gi; //FaceIterator gi;
vcg::face::Pos<FaceType> he; //vcg::face::Pos<FaceType> he;
vcg::face::Pos<FaceType> hei; //vcg::face::Pos<FaceType> hei;
/* classe di confronto per l'algoritmo di eliminazione vertici duplicati*/ /* classe di confronto per l'algoritmo di eliminazione vertici duplicati*/
class RemoveDuplicateVert_Compare{ class RemoveDuplicateVert_Compare{
@ -634,7 +637,7 @@ private:
*/ */
static int ConnectedComponents(MeshType &m) static int ConnectedComponents(MeshType &m)
{ {
std::vector< std::pair<int,FacePointer> > &CCV; std::vector< std::pair<int,FacePointer> > CCV;
return ConnectedComponents(m,CCV); return ConnectedComponents(m,CCV);
} }
static int ConnectedComponents(MeshType &m, std::vector< std::pair<int,FacePointer> > &CCV) static int ConnectedComponents(MeshType &m, std::vector< std::pair<int,FacePointer> > &CCV)
@ -829,7 +832,7 @@ private:
if (!fpaux->IsS()) if (!fpaux->IsS())
{ {
SwapEdge(*fpaux, iaux); SwapEdge(*fpaux, iaux);
assert(CheckOrientation(*fpaux, iaux)); assert(CheckOrientation(*fpaux, iaux));
} }
else else
@ -855,18 +858,21 @@ private:
} }
} }
static bool SelfIntersections(MeshType &m, std::vector<FaceType*> &ret) static void FlipMesh(MeshType &m)
{
for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
SwapEdge<FaceType,false>((*fi), 0);
}
static bool SelfIntersections(MeshType &m, std::vector<FaceType*> &ret)
{ {
assert(FaceType::HasMark()); // Needed by the UG //assert(FaceType::HasMark()); // Needed by the UG
assert(HasPerFaceMark(m));// Needed by the UG
Box3< ScalarType> bbox; Box3< ScalarType> bbox;
TriMeshGrid gM; TriMeshGrid gM;
ret.clear(); ret.clear();
FaceIterator fi; FaceIterator fi;
int referredBit = FaceType::NewBitFlag(); int referredBit = FaceType::NewBitFlag();
int deleted = 0;
for(fi=m.face.begin();fi!=m.face.end();++fi) for(fi=m.face.begin();fi!=m.face.end();++fi)
(*fi).ClearUserBit(referredBit); (*fi).ClearUserBit(referredBit);