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

missing std and other gcc detected syntax errors

This commit is contained in:
Paolo Cignoni 2006-05-25 09:41:09 +00:00
parent 283834183d
commit 0102ac5f9f
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vcg/complex/trimesh/clean.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.39 2006/05/16 21:51:07 cignoni
Redesigned the function for the removal of faces according to their area and edge lenght
Revision 1.38 2006/05/03 21:40:27 cignoni Revision 1.38 2006/05/03 21:40:27 cignoni
Changed HasMark to HasPerFaceMark(m) and commented some unused internal vars of the class Changed HasMark to HasPerFaceMark(m) and commented some unused internal vars of the class
@ -390,7 +393,7 @@ private:
These functions can optionally take into account only the selected faces. These functions can optionally take into account only the selected faces.
*/ */
template<bool Selected> template<bool Selected>
static int RemoveFaceOutOfRangeAreaSel(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeAreaSel(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=std::numeric_limits<ScalarType>::max())
{ {
FaceIterator fi; FaceIterator fi;
int count_fd = 0; int count_fd = 0;
@ -411,7 +414,7 @@ private:
return count_fd; return count_fd;
} }
template<bool Selected> template<bool Selected>
static int RemoveFaceOutOfRangeEdgeSel( MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeEdgeSel( MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=std::numeric_limits<ScalarType>::max())
{ {
FaceIterator fi; FaceIterator fi;
int count_fd = 0; int count_fd = 0;
@ -440,11 +443,11 @@ private:
static int RemoveZeroAreaFace(MeshType& m) { return RemoveFaceOutOfRangeArea(m);} static int RemoveZeroAreaFace(MeshType& m) { return RemoveFaceOutOfRangeArea(m);}
// Aliases for the functions that do not look at selection // Aliases for the functions that do not look at selection
static int RemoveFaceOutOfRangeArea(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeArea(MeshType& m, ScalarType MinAreaThr=0, ScalarType MaxAreaThr=std::numeric_limits<ScalarType>::max())
{ {
return RemoveFaceOutOfRangeArea<false>(m,MinAreaThr,MaxAreaThr); return RemoveFaceOutOfRangeAreaSel<false>(m,MinAreaThr,MaxAreaThr);
} }
static int RemoveFaceOutOfRangeEdge(MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=numeric_limits<ScalarType>::max()) static int RemoveFaceOutOfRangeEdge(MeshType& m, ScalarType MinEdgeThr=0, ScalarType MaxEdgeThr=std::numeric_limits<ScalarType>::max())
{ {
return RemoveFaceOutOfRangeEdgeSel<false>(m,MinEdgeThr,MaxEdgeThr); return RemoveFaceOutOfRangeEdgeSel<false>(m,MinEdgeThr,MaxEdgeThr);
} }
@ -880,7 +883,7 @@ private:
if (!fpaux->IsS()) if (!fpaux->IsS())
{ {
SwapEdge(*fpaux, iaux); face::SwapEdge<FaceType,false>(*fpaux, iaux);
assert(CheckOrientation(*fpaux, iaux)); assert(CheckOrientation(*fpaux, iaux));
} }
else else
@ -909,7 +912,7 @@ private:
static void FlipMesh(MeshType &m) static void FlipMesh(MeshType &m)
{ {
for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi) for (FaceIterator fi = m.face.begin(); fi != m.face.end(); ++fi)
SwapEdge<FaceType,false>((*fi), 0); face::SwapEdge<FaceType,false>((*fi), 0);
} }
static bool SelfIntersections(MeshType &m, std::vector<FaceType*> &ret) static bool SelfIntersections(MeshType &m, std::vector<FaceType*> &ret)
{ {

12
vcg/complex/trimesh/stat.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.1 2006/05/21 06:59:13 cignoni
Initial Commit
****************************************************************************/ ****************************************************************************/
#ifndef __VCGLIB_TRIMESH_STAT #ifndef __VCGLIB_TRIMESH_STAT
@ -61,7 +64,7 @@ class Stat
static std::pair<float,float> ComputePerVertexQualityMinMax( MeshType & m) // V1.0 static std::pair<float,float> ComputePerVertexQualityMinMax( MeshType & m) // V1.0
{ {
std::pair<float,float> minmax = make_pair(std::numeric_limits<float>::max(),-std::numeric_limits<float>::max()); std::pair<float,float> minmax = std::make_pair(std::numeric_limits<float>::max(),-std::numeric_limits<float>::max());
VertexIterator vi; VertexIterator vi;
for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) for(vi = m.vert.begin(); vi != m.vert.end(); ++vi)
@ -86,8 +89,8 @@ class Stat
static int ComputeEdgeHistogram( MeshType & m, Histogramf &h) // V1.0 static int ComputeEdgeHistogram( MeshType & m, Histogramf &h) // V1.0
{ {
ScalarType Diag = m.bbox.Diag(); ScalarType Diag = m.bbox.Diag();
h.clear(); h.Clear();
h.SetRange( 0, diagonale, 10000); h.SetRange( 0, Diag, 10000);
FaceIterator fi; FaceIterator fi;
for(fi = m.face.begin(); fi != m.face.end(); ++fi) for(fi = m.face.begin(); fi != m.face.end(); ++fi)
{ {
@ -116,7 +119,8 @@ class Stat
VertexIterator vi; VertexIterator vi;
for(vi = m.cm.vert.begin(); vi != m.cm.vert.end(); ++vi) for(vi = m.cm.vert.begin(); vi != m.cm.vert.end(); ++vi)
(*vi).ClearS(); (*vi).ClearS();
} return 0;
}
}; // end class }; // end class
} //End Namespace tri } //End Namespace tri

5
vcg/simplex/faceplus/component_ocf.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.12 2006/05/03 21:37:02 cignoni
Added Optional Mark
Revision 1.11 2006/02/28 11:59:39 ponchio Revision 1.11 2006/02/28 11:59:39 ponchio
g++ compliance: g++ compliance:
@ -391,7 +394,7 @@ public:
static bool HasFaceMark() { return true; } static bool HasFaceMark() { return true; }
static bool HasFaceMarkOcf() { return true; } static bool HasFaceMarkOcf() { return true; }
inline void InitIMark() { _imark = 0; } inline void InitIMark() { IMark() = 0; }
}; };
///*-------------------------- WEDGE TEXCOORD ----------------------------------*/ ///*-------------------------- WEDGE TEXCOORD ----------------------------------*/