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

corrected a few overloading error in the execute flipping members

This commit is contained in:
Paolo Cignoni 2014-07-13 06:23:46 +00:00
parent 8f35e48f43
commit 7b226f290c
1 changed files with 460 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vcg/complex/algorithms/local_optimization/tri_edge_flip.h
View File

@ -493,7 +493,7 @@ public:
/*! /*!
* Execute the flipping of the edge * Execute the flipping of the edge
*/ */
void Execute(TRIMESH_TYPE &m) void Execute(TRIMESH_TYPE &m, BaseParameterClass *)
{ {
int i = this->_pos.E(); int i = this->_pos.E();
FacePointer f1 = this->_pos.F(); FacePointer f1 = this->_pos.F();
@ -536,7 +536,7 @@ public:
} }
void UpdateHeap(HeapType &heap) void UpdateHeap(HeapType &heap, BaseParameterClass *pp)
{ {
this->GlobalMark()++; this->GlobalMark()++;
@ -558,13 +558,13 @@ public:
// edges of the first face, except the flipped edge // edges of the first face, except the flipped edge
for(int i = 0; i < 3; i++) if(i != flipped) { for(int i = 0; i < 3; i++) if(i != flipped) {
PosType newpos(f1, i); PosType newpos(f1, i);
Insert(heap, newpos, this->GlobalMark()); this->Insert(heap, newpos, this->GlobalMark(),pp);
} }
// edges of the second face, except the flipped edge // edges of the second face, except the flipped edge
for(int i = 0; i < 3; i++) if(i != f1->FFi(flipped)) { for(int i = 0; i < 3; i++) if(i != f1->FFi(flipped)) {
PosType newpos(f2, i); PosType newpos(f2, i);
Insert(heap, newpos, this->GlobalMark()); this->Insert(heap, newpos, this->GlobalMark(),pp);
} }
// every edge with v0, v1 v3 of f1 // every edge with v0, v1 v3 of f1
@ -583,7 +583,7 @@ public:
do { do {
VertexPointer v = pos.VFlip(); VertexPointer v = pos.VFlip();
if(v != v0 && v != v1 && v != v2 && v != v3) if(v != v0 && v != v1 && v != v2 && v != v3)
Insert(heap, pos, this->GlobalMark()); this->Insert(heap, pos, this->GlobalMark(),pp);
pos.NextE(); pos.NextE();
} while(pos != startpos && !pos.IsBorder()); } while(pos != startpos && !pos.IsBorder());
@ -603,7 +603,7 @@ public:
do { do {
VertexPointer v = pos.VFlip(); VertexPointer v = pos.VFlip();
if(v != v0 && v != v1 && v != v2 && v != v3) if(v != v0 && v != v1 && v != v2 && v != v3)
Insert(heap, pos, this->GlobalMark()); this->Insert(heap, pos, this->GlobalMark(),pp);
pos.NextE(); pos.NextE();
} while(pos != startpos && !pos.IsBorder()); } while(pos != startpos && !pos.IsBorder());