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

Changed all the MeshType::HasSomething() into the now standard tri::HasSomething(MeshType &m)

This commit is contained in:
Paolo Cignoni 2012-01-20 07:58:43 +00:00
parent 58042fda3e
commit 6094438b4b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,7 +600,7 @@ private:
static bool IsBitQuadOnly(const MeshType &m) static bool IsBitQuadOnly(const MeshType &m)
{ {
typedef typename MeshType::FaceType F; typedef typename MeshType::FaceType F;
if (!m.HasPerFaceFlags()) return false; if (!HasPerFaceFlags(m)) return false;
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) { for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) {
unsigned int tmp = fi->Flags()&(F::FAUX0|F::FAUX1|F::FAUX2); unsigned int tmp = fi->Flags()&(F::FAUX0|F::FAUX1|F::FAUX2);
if ( tmp != F::FAUX0 && tmp != F::FAUX1 && tmp != F::FAUX2) return false; if ( tmp != F::FAUX0 && tmp != F::FAUX1 && tmp != F::FAUX2) return false;
@ -614,7 +614,7 @@ private:
*/ */
static bool IsBitTriOnly(const MeshType &m) static bool IsBitTriOnly(const MeshType &m)
{ {
if (!m.HasPerFaceFlags()) return true; if (!HasPerFaceFlags(m)) return true;
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) { for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) {
if ( if (
!fi->IsD() && fi->IsAnyF() !fi->IsD() && fi->IsAnyF()
@ -633,7 +633,7 @@ private:
static bool IsBitTriQuadOnly(const MeshType &m) static bool IsBitTriQuadOnly(const MeshType &m)
{ {
typedef typename MeshType::FaceType F; typedef typename MeshType::FaceType F;
if (!m.HasPerFaceFlags()) return false; if (!HasPerFaceFlags(m)) return false;
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) { for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) {
unsigned int tmp = fi->Flags()&(F::FAUX0|F::FAUX1|F::FAUX2); unsigned int tmp = fi->Flags()&(F::FAUX0|F::FAUX1|F::FAUX2);
if ( tmp!=F::FAUX0 && tmp!=F::FAUX1 && tmp!=F::FAUX2 && tmp!=0 ) return false; if ( tmp!=F::FAUX0 && tmp!=F::FAUX1 && tmp!=F::FAUX2 && tmp!=0 ) return false;
@ -646,7 +646,7 @@ private:
*/ */
static int CountBitQuads(const MeshType &m) static int CountBitQuads(const MeshType &m)
{ {
if (!m.HasPerFaceFlags()) return 0; if (!HasPerFaceFlags(m)) return 0;
typedef typename MeshType::FaceType F; typedef typename MeshType::FaceType F;
int count=0; int count=0;
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) { for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) {
@ -661,7 +661,7 @@ private:
*/ */
static int CountBitTris(const MeshType &m) static int CountBitTris(const MeshType &m)
{ {
if (!m.HasPerFaceFlags()) return m.fn; if (!HasPerFaceFlags(m)) return m.fn;
int count=0; int count=0;
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) { for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) {
if (!(fi->IsAnyF())) count++; if (!(fi->IsAnyF())) count++;
@ -674,7 +674,7 @@ private:
*/ */
static int CountBitPolygons(const MeshType &m) static int CountBitPolygons(const MeshType &m)
{ {
if (!m.HasPerFaceFlags()) return m.fn; if (!HasPerFaceFlags(m)) return m.fn;
typedef typename MeshType::FaceType F; typedef typename MeshType::FaceType F;
int count = 0; int count = 0;
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) { for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) if (!fi->IsD()) {
@ -707,7 +707,7 @@ private:
// Second Loop, count (twice) faux edges and mark all vertices touched by non faux edges (e.g vertexes on the boundary of a polygon) // Second Loop, count (twice) faux edges and mark all vertices touched by non faux edges (e.g vertexes on the boundary of a polygon)
if (!m.HasPerFaceFlags()) return m.fn; if (!HasPerFaceFlags(m)) return m.fn;
typedef typename MeshType::FaceType F; typedef typename MeshType::FaceType F;
int countE = 0; int countE = 0;
for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
@ -742,8 +742,8 @@ private:
*/ */
static bool HasConsistentPerFaceFauxFlag(const MeshType &m) static bool HasConsistentPerFaceFauxFlag(const MeshType &m)
{ {
assert(m.HasPerFaceFlags()); assert(HasPerFaceFlags(m));
assert(m.HasFFTopology()); // todo: remove this constraint assert(HasFFAdjacency(m)); // todo: remove this constraint
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
if(!(*fi).IsD()) if(!(*fi).IsD())
@ -759,7 +759,7 @@ private:
static bool HasConsistentEdges(const MeshType &m) static bool HasConsistentEdges(const MeshType &m)
{ {
assert(m.HasPerFaceFlags()); assert(HasPerFaceFlags(m));
for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) for (ConstFaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
if(!(*fi).IsD()) if(!(*fi).IsD())
@ -1199,7 +1199,7 @@ private:
{ {
assert(&Oriented != &Orientable); assert(&Oriented != &Orientable);
// This algorithms requires FF topology // This algorithms requires FF topology
assert(m.HasFFTopology()); assert(HasFFAdjacency(m));
// This algorithms require FF topology initialized // This algorithms require FF topology initialized
assert(m.face.back().FFp(0)); assert(m.face.back().FFp(0));
@ -1342,8 +1342,8 @@ private:
// - choose the edge that brings to the face f1 containing the vertex opposite to that edge. // - choose the edge that brings to the face f1 containing the vertex opposite to that edge.
static int RemoveFaceFoldByFlip(MeshType &m, float normalThresholdDeg=175, bool repeat=true) static int RemoveFaceFoldByFlip(MeshType &m, float normalThresholdDeg=175, bool repeat=true)
{ {
assert(m.HasFFTopology()); assert(HasFFAdjacency(m));
assert(m.HasPerVertexMark()); assert(HasPerVertexMark(m));
//Counters for logging and convergence //Counters for logging and convergence
int count, total = 0; int count, total = 0;
@ -1392,8 +1392,8 @@ private:
static int RemoveTVertexByFlip(MeshType &m, float threshold=40, bool repeat=true) static int RemoveTVertexByFlip(MeshType &m, float threshold=40, bool repeat=true)
{ {
assert(m.HasFFTopology()); assert(HasFFAdjacency(m));
assert(m.HasPerVertexMark()); assert(HasPerVertexMark(m));
//Counters for logging and convergence //Counters for logging and convergence
int count, total = 0; int count, total = 0;