removed harmless gcc warnings
This commit is contained in:
parent
d4b7e1c8fe
commit
0165f918f1
|
@ -209,7 +209,7 @@ namespace vcg {
|
||||||
return v_ret;
|
return v_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ++++++++++ edges +++++++++++++
|
/* ++++++++++ edges +++++++++++++ */
|
||||||
/** Function to add n edges to the mesh. The second parameter hold a vector of
|
/** Function to add n edges to the mesh. The second parameter hold a vector of
|
||||||
pointers to pointer to elements of the mesh that should be updated after a
|
pointers to pointer to elements of the mesh that should be updated after a
|
||||||
possible vector realloc.
|
possible vector realloc.
|
||||||
|
@ -287,7 +287,7 @@ namespace vcg {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* ++++++++++ hedges +++++++++++++
|
/* ++++++++++ hedges +++++++++++++ */
|
||||||
/** Function to add n edges to the mesh. The second parameter hold a vector of
|
/** Function to add n edges to the mesh. The second parameter hold a vector of
|
||||||
pointers to pointer to elements of the mesh that should be updated after a
|
pointers to pointer to elements of the mesh that should be updated after a
|
||||||
possible vector realloc.
|
possible vector realloc.
|
||||||
|
|
|
@ -130,7 +130,7 @@ class NearestToCenter
|
||||||
typedef BasicGrid<typename MeshType::ScalarType> GridType;
|
typedef BasicGrid<typename MeshType::ScalarType> GridType;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
inline void AddVertex(MeshType &m, GridType &g, Point3i &pi, VertexType &v)
|
inline void AddVertex(MeshType &/*m*/, GridType &g, Point3i &pi, VertexType &v)
|
||||||
{
|
{
|
||||||
CoordType c;
|
CoordType c;
|
||||||
g.IPiToBoxCenter(pi,c);
|
g.IPiToBoxCenter(pi,c);
|
||||||
|
@ -186,7 +186,7 @@ class AverageColorCell
|
||||||
n+=f.cN();
|
n+=f.cN();
|
||||||
cnt++;
|
cnt++;
|
||||||
}
|
}
|
||||||
inline void AddVertex(MeshType &m, GridType &g, Point3i &pi, VertexType &v)
|
inline void AddVertex(MeshType &/*m*/, GridType &/*g*/, Point3i &/*pi*/, VertexType &v)
|
||||||
{
|
{
|
||||||
p+=v.cP();
|
p+=v.cP();
|
||||||
n+=v.cN();
|
n+=v.cN();
|
||||||
|
|
|
@ -148,7 +148,7 @@ template <class OLD_MESH_TYPE,class NEW_MESH_TYPE, class FLT, class DISTFUNCTOR
|
||||||
return VV(x,y,z).second+offset;
|
return VV(x,y,z).second+offset;
|
||||||
}
|
}
|
||||||
///return true if the distance form the mesh is less than maxdim and return distance
|
///return true if the distance form the mesh is less than maxdim and return distance
|
||||||
field_value DistanceFromMesh(Point3f &pp,Old_Mesh *mesh)
|
field_value DistanceFromMesh(Point3f &pp,Old_Mesh */*mesh*/)
|
||||||
{
|
{
|
||||||
float dist;
|
float dist;
|
||||||
typename Old_Mesh::FaceType *f=NULL;
|
typename Old_Mesh::FaceType *f=NULL;
|
||||||
|
@ -208,7 +208,7 @@ template <class OLD_MESH_TYPE,class NEW_MESH_TYPE, class FLT, class DISTFUNCTOR
|
||||||
return field_value(true,dist);
|
return field_value(true,dist);
|
||||||
}
|
}
|
||||||
|
|
||||||
field_value MultiDistanceFromMesh(Point3f &pp,Old_Mesh *mesh)
|
field_value MultiDistanceFromMesh(Point3f &pp, Old_Mesh */*mesh*/)
|
||||||
{
|
{
|
||||||
float distSum=0;
|
float distSum=0;
|
||||||
int positiveCnt=0; // positive results counter
|
int positiveCnt=0; // positive results counter
|
||||||
|
|
|
@ -191,7 +191,7 @@ class Geo{
|
||||||
|
|
||||||
std::vector <std::pair<VertexPointer,ScalarType> > expansion;
|
std::vector <std::pair<VertexPointer,ScalarType> > expansion;
|
||||||
typename std::vector <VertDist >::iterator ifr;
|
typename std::vector <VertDist >::iterator ifr;
|
||||||
face::VFIterator<FaceType> x;int k;
|
face::VFIterator<FaceType> x;
|
||||||
VertexPointer pw;
|
VertexPointer pw;
|
||||||
|
|
||||||
//Requirements
|
//Requirements
|
||||||
|
|
|
@ -1040,7 +1040,7 @@ static void PoissonDiskPruning(MetroMesh &origMesh, VertexSampler &ps, MetroMesh
|
||||||
std::random_shuffle(montecarloSHT.AllocatedCells.begin(),montecarloSHT.AllocatedCells.end(), p_myrandom);
|
std::random_shuffle(montecarloSHT.AllocatedCells.begin(),montecarloSHT.AllocatedCells.end(), p_myrandom);
|
||||||
|
|
||||||
#ifdef QT_VERSION
|
#ifdef QT_VERSION
|
||||||
qDebug("PDS: Completed creation of activeCells, %i cells (%i msec)", montecarloSHT.AllocatedCells.size(), tt.restart());
|
qDebug("PDS: Completed creation of activeCells, %i cells (%i msec)", (int)montecarloSHT.AllocatedCells.size(), tt.restart());
|
||||||
#endif
|
#endif
|
||||||
int removedCnt=0;
|
int removedCnt=0;
|
||||||
if(pp.preGenFlag)
|
if(pp.preGenFlag)
|
||||||
|
@ -1261,7 +1261,6 @@ static void RegularRecursiveOffset(MetroMesh & m, std::vector<Point3f> &pvec, Sc
|
||||||
static void SubdivideAndSample(MetroMesh & m, std::vector<Point3f> &pvec, const Box3<ScalarType> bb, RRParam &rrp, float curDiag)
|
static void SubdivideAndSample(MetroMesh & m, std::vector<Point3f> &pvec, const Box3<ScalarType> bb, RRParam &rrp, float curDiag)
|
||||||
{
|
{
|
||||||
Point3f startPt = bb.Center();
|
Point3f startPt = bb.Center();
|
||||||
ScalarType bound;
|
|
||||||
|
|
||||||
ScalarType dist;
|
ScalarType dist;
|
||||||
// Compute mesh point nearest to bb center
|
// Compute mesh point nearest to bb center
|
||||||
|
|
|
@ -89,9 +89,9 @@ protected:
|
||||||
this->level = (char) level;
|
this->level = (char) level;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline virtual NodePointer &Son(int sonIndex) = 0;
|
virtual NodePointer &Son(int sonIndex) = 0;
|
||||||
|
|
||||||
inline virtual bool IsLeaf() = 0;
|
virtual bool IsLeaf() = 0;
|
||||||
|
|
||||||
// The position of the center of the node in integer coords in the 0..2^(2*sz) -1 range
|
// The position of the center of the node in integer coords in the 0..2^(2*sz) -1 range
|
||||||
// The root has position (lsz/2,lsz/2,lsz/2)
|
// The root has position (lsz/2,lsz/2,lsz/2)
|
||||||
|
|
Loading…
Reference in New Issue