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

Small type changes (size_t -> GLuint) to avoid warning

This commit is contained in:
Paolo Cignoni 2016-12-05 13:19:44 +01:00
parent 5e03df37b7
commit 8ff8d6bb41
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h
View File

@ -974,13 +974,13 @@ namespace vcg
_texindnumtriangles.resize(_chunkmap.size()); _texindnumtriangles.resize(_chunkmap.size());
} }
std::vector<size_t> vpatlas; std::vector<GLuint> vpatlas;
if (attributestobeupdated[INT_ATT_NAMES::ATT_EDGEINDICES]) if (attributestobeupdated[INT_ATT_NAMES::ATT_EDGEINDICES])
vpatlas.resize(_mesh.VN(),UINT_MAX); vpatlas.resize(_mesh.VN(),UINT_MAX);
int faceind = 0; int faceind = 0;
size_t chunkindex = faceind; size_t chunkindex = faceind;
size_t triangles = 0; GLuint triangles = 0;
for(ChunkMap::const_iterator mit = _chunkmap.begin();mit != _chunkmap.end();++mit) for(ChunkMap::const_iterator mit = _chunkmap.begin();mit != _chunkmap.end();++mit)
@ -1681,7 +1681,7 @@ namespace vcg
if ((glopts != NULL) && (glopts->_perpoint_dot_enabled)) if ((glopts != NULL) && (glopts->_perpoint_dot_enabled))
{ {
float psize = 0.0001; float psize = 0.0001f;
if ((glopts->_perpoint_pointsize - 1) > 0) if ((glopts->_perpoint_pointsize - 1) > 0)
psize = (glopts->_perpoint_pointsize - 1); psize = (glopts->_perpoint_pointsize - 1);
glPointSize(psize); glPointSize(psize);
@ -2187,8 +2187,8 @@ namespace vcg
assert(nz>=0); assert(nz>=0);
assert(nz<pf->VN()); assert(nz<pf->VN());
_v[0] = size_t(vcg::tri::Index(m,pf->V(nz)));; _v[0] = GLuint(vcg::tri::Index(m,pf->V(nz)));;
_v[1] = size_t(vcg::tri::Index(m,pf->V(pf->Next(nz)))); _v[1] = GLuint(vcg::tri::Index(m,pf->V(pf->Next(nz))));
assert(_v[0] != _v[1]); // The face pointed by 'f' is Degenerate (two coincident vertexes) assert(_v[0] != _v[1]); // The face pointed by 'f' is Degenerate (two coincident vertexes)
if( _v[0] > _v[1] ) if( _v[0] > _v[1] )