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

Added missing std:: to swap

This commit is contained in:
Paolo Cignoni 2006-05-24 08:54:04 +00:00
parent a6d3a2c1ea
commit a21b630e88
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vcg/complex/trimesh/clustering.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.5 2006/05/21 06:40:31 cignoni
Added DoubleFace management
Revision 1.4 2006/05/19 20:49:03 m_di_benedetto Revision 1.4 2006/05/19 20:49:03 m_di_benedetto
Added check for empty generated mesh (prevent call to mesh allocator with zero vertices or faces). Added check for empty generated mesh (prevent call to mesh allocator with zero vertices or faces).
@ -154,15 +157,15 @@ class Clustering
// Sort the vertex of the face maintaining the original face orientation (it only ensure that v0 is the minimum) // Sort the vertex of the face maintaining the original face orientation (it only ensure that v0 is the minimum)
void sortOrient() void sortOrient()
{ {
if(v[1] < v[0] && v[1] < v[2] ) { swap(v[0],v[1]); swap(v[1],v[2]); return; } // v1 was the minimum if(v[1] < v[0] && v[1] < v[2] ) { std::swap(v[0],v[1]); swap(v[1],v[2]); return; } // v1 was the minimum
if(v[2] < v[0] && v[2] < v[1] ) { swap(v[0],v[2]); swap(v[1],v[2]); return; } // v2 was the minimum if(v[2] < v[0] && v[2] < v[1] ) { std::swap(v[0],v[2]); swap(v[1],v[2]); return; } // v2 was the minimum
return; // v0 was the minimum; return; // v0 was the minimum;
} }
void sort() void sort()
{ {
if(v[0] > v[1] ) swap(v[0],v[1]); // now v0 < v1 if(v[0] > v[1] ) std::swap(v[0],v[1]); // now v0 < v1
if(v[0] > v[2] ) swap(v[0],v[2]); // now v0 is the minimum if(v[0] > v[2] ) std::swap(v[0],v[2]); // now v0 is the minimum
if(v[1] > v[2] ) swap(v[1],v[2]); // sorted! if(v[1] > v[2] ) std::swap(v[1],v[2]); // sorted!
} }
// Hashing Function; // Hashing Function;
operator size_t () const operator size_t () const
@ -260,7 +263,7 @@ class Clustering
if( N*(*ti).v[1]->n <0) ++badOrient; if( N*(*ti).v[1]->n <0) ++badOrient;
if( N*(*ti).v[2]->n <0) ++badOrient; if( N*(*ti).v[2]->n <0) ++badOrient;
if(badOrient>2) if(badOrient>2)
swap(m.face[i].V(0),m.face[i].V(1)); std::swap(m.face[i].V(0),m.face[i].V(1));
} }
i++; i++;
} }