Removed annoying unsigned vs signed warnings.
Thanks to Alain Boyer for the kind bug submission!
This commit is contained in:
parent
ab71949274
commit
700b8cd26e
|
@ -438,7 +438,7 @@ namespace vcg {
|
||||||
static void CompactVertexVector( MeshType &m )
|
static void CompactVertexVector( MeshType &m )
|
||||||
{
|
{
|
||||||
// If already compacted fast return please!
|
// If already compacted fast return please!
|
||||||
if(m.vn==m.vert.size()) return;
|
if(m.vn==(int)m.vert.size()) return;
|
||||||
|
|
||||||
// newVertIndex [ <old_vert_position> ] gives you the new position of the vertex in the vector;
|
// newVertIndex [ <old_vert_position> ] gives you the new position of the vertex in the vector;
|
||||||
std::vector<size_t> newVertIndex(m.vert.size(),std::numeric_limits<size_t>::max() );
|
std::vector<size_t> newVertIndex(m.vert.size(),std::numeric_limits<size_t>::max() );
|
||||||
|
@ -456,7 +456,7 @@ namespace vcg {
|
||||||
++pos;
|
++pos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assert(pos==m.vn);
|
assert((int)pos==m.vn);
|
||||||
|
|
||||||
// call a templated reordering function that manage any additional data internally stored by the vector
|
// call a templated reordering function that manage any additional data internally stored by the vector
|
||||||
// for the default std::vector no work is needed (some work is typically needed for the OCF stuff)
|
// for the default std::vector no work is needed (some work is typically needed for the OCF stuff)
|
||||||
|
@ -492,7 +492,7 @@ namespace vcg {
|
||||||
static void CompactFaceVector( MeshType &m )
|
static void CompactFaceVector( MeshType &m )
|
||||||
{
|
{
|
||||||
// If already compacted fast return please!
|
// If already compacted fast return please!
|
||||||
if(m.fn==m.face.size()) return;
|
if(m.fn==(int)m.face.size()) return;
|
||||||
|
|
||||||
// newFaceIndex [ <old_face_position> ] gives you the new position of the face in the vector;
|
// newFaceIndex [ <old_face_position> ] gives you the new position of the face in the vector;
|
||||||
std::vector<size_t> newFaceIndex(m.face.size(),std::numeric_limits<size_t>::max() );
|
std::vector<size_t> newFaceIndex(m.face.size(),std::numeric_limits<size_t>::max() );
|
||||||
|
@ -510,7 +510,7 @@ namespace vcg {
|
||||||
++pos;
|
++pos;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assert(pos==m.fn);
|
assert((int)pos==m.fn);
|
||||||
|
|
||||||
// call a templated reordering function that manage any additional data internally stored by the vector
|
// call a templated reordering function that manage any additional data internally stored by the vector
|
||||||
// for the default std::vector no work is needed (some work is typically needed for the OCF stuff)
|
// for the default std::vector no work is needed (some work is typically needed for the OCF stuff)
|
||||||
|
|
|
@ -640,7 +640,7 @@ void DrawPoints()
|
||||||
glPointParameterf( GL_POINT_SIZE_MAX, 16.0f );
|
glPointParameterf( GL_POINT_SIZE_MAX, 16.0f );
|
||||||
glPointParameterf( GL_POINT_SIZE_MIN, 1.0f );
|
glPointParameterf( GL_POINT_SIZE_MIN, 1.0f );
|
||||||
|
|
||||||
if(m->vn!=m->vert.size())
|
if(m->vn!=(int)m->vert.size())
|
||||||
{
|
{
|
||||||
DrawPointsBase<nm,cm>();
|
DrawPointsBase<nm,cm>();
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -249,7 +249,7 @@ namespace io {
|
||||||
{
|
{
|
||||||
int index = Materials<SaveMeshType>::CreateNewMaterial(m,materialVec,material_num,fi);
|
int index = Materials<SaveMeshType>::CreateNewMaterial(m,materialVec,material_num,fi);
|
||||||
|
|
||||||
if(index == materialVec.size())//inserts a new element material
|
if(index == (int)materialVec.size())//inserts a new element material
|
||||||
{
|
{
|
||||||
material_num++;
|
material_num++;
|
||||||
fprintf(fp,"\nusemtl material_%d\n",materialVec[index-1].index);
|
fprintf(fp,"\nusemtl material_%d\n",materialVec[index-1].index);
|
||||||
|
|
Loading…
Reference in New Issue