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

changed tri::RequirePerEdgeFlags to RequirePerEdgeFlags

This commit is contained in:
Nico Pietroni 2013-01-22 10:50:40 +00:00
parent c2554e5236
commit 37e8a2118b
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vcg/complex/algorithms/update/flag.h
View File

@ -71,7 +71,7 @@ public:
static void VertexClear(MeshType &m, unsigned int FlagMask = 0xffffffff) static void VertexClear(MeshType &m, unsigned int FlagMask = 0xffffffff)
{ {
tri::RequirePerVertexFlags(m); RequirePerVertexFlags(m);
int andMask = ~FlagMask; int andMask = ~FlagMask;
for(VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi) for(VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi)
if(!(*vi).IsD()) (*vi).Flags() &= andMask ; if(!(*vi).IsD()) (*vi).Flags() &= andMask ;
@ -79,7 +79,7 @@ public:
static void EdgeClear(MeshType &m, unsigned int FlagMask = 0xffffffff) static void EdgeClear(MeshType &m, unsigned int FlagMask = 0xffffffff)
{ {
tri::RequirePerEdgeFlags(m); RequirePerEdgeFlags(m);
int andMask = ~FlagMask; int andMask = ~FlagMask;
for(EdgeIterator ei=m.edge.begin(); ei!=m.edge.end(); ++ei) for(EdgeIterator ei=m.edge.begin(); ei!=m.edge.end(); ++ei)
if(!(*ei).IsD()) (*ei).Flags() &= andMask ; if(!(*ei).IsD()) (*ei).Flags() &= andMask ;
@ -87,7 +87,7 @@ public:
static void FaceClear(MeshType &m, unsigned int FlagMask = 0xffffffff) static void FaceClear(MeshType &m, unsigned int FlagMask = 0xffffffff)
{ {
tri::RequirePerFaceFlags(m); RequirePerFaceFlags(m);
int andMask = ~FlagMask; int andMask = ~FlagMask;
for(FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi) for(FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi)
if(!(*fi).IsD()) (*fi).Flags() &= andMask ; if(!(*fi).IsD()) (*fi).Flags() &= andMask ;
@ -95,21 +95,21 @@ public:
static void VertexSet(MeshType &m, unsigned int FlagMask) static void VertexSet(MeshType &m, unsigned int FlagMask)
{ {
tri::RequirePerVertexFlags(m); RequirePerVertexFlags(m);
for(VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi) for(VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi)
if(!(*vi).IsD()) (*vi).Flags() |= FlagMask ; if(!(*vi).IsD()) (*vi).Flags() |= FlagMask ;
} }
static void EdgeSet(MeshType &m, unsigned int FlagMask) static void EdgeSet(MeshType &m, unsigned int FlagMask)
{ {
tri::RequirePerEdgeFlags(m); RequirePerEdgeFlags(m);
for(EdgeIterator ei=m.edge.begin(); ei!=m.edge.end(); ++ei) for(EdgeIterator ei=m.edge.begin(); ei!=m.edge.end(); ++ei)
if(!(*ei).IsD()) (*ei).Flags() |= FlagMask ; if(!(*ei).IsD()) (*ei).Flags() |= FlagMask ;
} }
static void FaceSet(MeshType &m, unsigned int FlagMask) static void FaceSet(MeshType &m, unsigned int FlagMask)
{ {
tri::RequirePerFaceFlags(m); RequirePerFaceFlags(m);
for(FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi) for(FaceIterator fi=m.face.begin(); fi!=m.face.end(); ++fi)
if(!(*fi).IsD()) (*fi).Flags() |= FlagMask ; if(!(*fi).IsD()) (*fi).Flags() |= FlagMask ;
} }
@ -139,8 +139,8 @@ public:
*/ */
static void FaceBorderFromFF(MeshType &m) static void FaceBorderFromFF(MeshType &m)
{ {
tri::RequirePerFaceFlags(m); RequirePerFaceFlags(m);
tri::RequireFFAdjacency(m); RequireFFAdjacency(m);
for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi)if(!(*fi).IsD()) for(FaceIterator fi=m.face.begin();fi!=m.face.end();++fi)if(!(*fi).IsD())
for(int j=0;j<3;++j) for(int j=0;j<3;++j)
@ -153,8 +153,8 @@ public:
static void FaceBorderFromVF(MeshType &m) static void FaceBorderFromVF(MeshType &m)
{ {
tri::RequirePerFaceFlags(m); RequirePerFaceFlags(m);
tri::RequireVFAdjacency(m); RequireVFAdjacency(m);
FaceClearB(m); FaceClearB(m);
int visitedBit=VertexType::NewBitFlag(); int visitedBit=VertexType::NewBitFlag();
@ -239,7 +239,7 @@ public:
// versione minimale che non calcola i complex flag. // versione minimale che non calcola i complex flag.
static void VertexBorderFromNone(MeshType &m) static void VertexBorderFromNone(MeshType &m)
{ {
tri::RequirePerVertexFlags(m); RequirePerVertexFlags(m);
std::vector<EdgeSorter> e; std::vector<EdgeSorter> e;
typename UpdateMeshType::FaceIterator pf; typename UpdateMeshType::FaceIterator pf;
@ -285,7 +285,7 @@ public:
/// It has a O(fn log fn) complexity. /// It has a O(fn log fn) complexity.
static void FaceBorderFromNone(MeshType &m) static void FaceBorderFromNone(MeshType &m)
{ {
tri::RequirePerFaceFlags(m); RequirePerFaceFlags(m);
std::vector<EdgeSorter> e; std::vector<EdgeSorter> e;
typename UpdateMeshType::FaceIterator pf; typename UpdateMeshType::FaceIterator pf;
@ -338,8 +338,8 @@ public:
/// Compute the PerVertex Border flag deriving it from the border flag of faces /// Compute the PerVertex Border flag deriving it from the border flag of faces
static void VertexBorderFromFace(MeshType &m) static void VertexBorderFromFace(MeshType &m)
{ {
tri::RequirePerFaceFlags(m); RequirePerFaceFlags(m);
tri::RequirePerVertexFlags(m); RequirePerVertexFlags(m);
for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi) for(VertexIterator vi=m.vert.begin();vi!=m.vert.end();++vi)
(*vi).ClearB(); (*vi).ClearB();
@ -357,8 +357,8 @@ public:
// //
static void FaceFauxCrease(MeshType &m,float AngleRad) static void FaceFauxCrease(MeshType &m,float AngleRad)
{ {
tri::RequirePerFaceFlags(m); RequirePerFaceFlags(m);
tri::RequireFFAdjacency(m); RequireFFAdjacency(m);
typename MeshType::FaceIterator f; typename MeshType::FaceIterator f;