diff --git a/vcg/complex/trimesh/clean.h b/vcg/complex/trimesh/clean.h index 337d7b6a..4117719b 100644 --- a/vcg/complex/trimesh/clean.h +++ b/vcg/complex/trimesh/clean.h @@ -24,6 +24,9 @@ History $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 Added ConnectedIterator (should be moved somewhere else) Cleaned ConnectedComponents @@ -242,11 +245,11 @@ private: typedef GridStaticPtr TriMeshGrid; typedef Point3 Point3x; - TriMeshGrid gM; - FaceIterator fi; - FaceIterator gi; - vcg::face::Pos he; - vcg::face::Pos hei; + //TriMeshGrid gM; + //FaceIterator fi; + //FaceIterator gi; + //vcg::face::Pos he; + //vcg::face::Pos hei; /* classe di confronto per l'algoritmo di eliminazione vertici duplicati*/ class RemoveDuplicateVert_Compare{ @@ -634,7 +637,7 @@ private: */ static int ConnectedComponents(MeshType &m) { - std::vector< std::pair > &CCV; + std::vector< std::pair > CCV; return ConnectedComponents(m,CCV); } static int ConnectedComponents(MeshType &m, std::vector< std::pair > &CCV) @@ -829,7 +832,7 @@ private: if (!fpaux->IsS()) { - SwapEdge(*fpaux, iaux); + SwapEdge(*fpaux, iaux); assert(CheckOrientation(*fpaux, iaux)); } else @@ -855,18 +858,21 @@ private: } } - static bool SelfIntersections(MeshType &m, std::vector &ret) + static void FlipMesh(MeshType &m) + { + for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) + SwapEdge((*fi), 0); + } + static bool SelfIntersections(MeshType &m, std::vector &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; TriMeshGrid gM; ret.clear(); FaceIterator fi; int referredBit = FaceType::NewBitFlag(); - int deleted = 0; - for(fi=m.face.begin();fi!=m.face.end();++fi) (*fi).ClearUserBit(referredBit);