Commit 5505113a authored by Jan Möbius's avatar Jan Möbius
Browse files

More sizet fixes

parent 059f20e6
......@@ -385,7 +385,7 @@ private:
* @param _hh corresponding halfedge handle of this vertex
* @param _fh corresponding face handle of this vertex
*/
void readVertex(unsigned int _vertex,
void readVertex(size_t _vertex,
const typename Mesh::VertexHandle _vh,
const typename Mesh::HalfedgeHandle _hh,
const typename Mesh::FaceHandle _fh);
......@@ -1103,7 +1103,7 @@ private:
return normal;
}
typename Mesh::HalfedgeHandle mapToHalfedgeHandle(int _vertexId);
typename Mesh::HalfedgeHandle mapToHalfedgeHandle(size_t _vertexId);
};
......
......@@ -513,7 +513,7 @@ DrawMeshT<Mesh>::rebuild()
#pragma omp parallel for
#endif
#endif
for (unsigned int i = 0; i < numVerts_; ++i)
for (size_t i = 0; i < numVerts_; ++i)
{
// just pick one face, srews up face colors here so color updates need a full rebuild
const typename Mesh::HalfedgeHandle hh = mapToHalfedgeHandle(i);
......@@ -752,7 +752,7 @@ DrawMeshT<Mesh>::rebuild()
template <class Mesh>
void
DrawMeshT<Mesh>::readVertex(unsigned int _vertex,
DrawMeshT<Mesh>::readVertex(size_t _vertex,
const typename Mesh::VertexHandle _vh,
const typename Mesh::HalfedgeHandle _hh,
const typename Mesh::FaceHandle _fh)
......@@ -2452,7 +2452,7 @@ VertexDeclaration* ACG::DrawMeshT<Mesh>::getVertexDeclaration()
template<class Mesh>
typename Mesh::HalfedgeHandle ACG::DrawMeshT<Mesh>::mapToHalfedgeHandle(int _vertexId)
typename Mesh::HalfedgeHandle ACG::DrawMeshT<Mesh>::mapToHalfedgeHandle(size_t _vertexId)
{
int faceId = -1, cornerId = -1;
......
......@@ -3690,7 +3690,7 @@ const int* MeshCompiler::mapToOriginalFaceIDPtr() const
int MeshCompiler::mapToOriginalVertexID( const int _i, int& _faceID, int& _cornerID ) const
int MeshCompiler::mapToOriginalVertexID( const size_t _i, int& _faceID, int& _cornerID ) const
{
int positionID = -1;
......
......@@ -636,7 +636,7 @@ public:
* @param _cornerID [out] Corner of face corresponding to vertex.
* @return Position ID in input buffer
*/
int mapToOriginalVertexID(const int _i, int& _faceID, int& _cornerID) const;
int mapToOriginalVertexID(const size_t _i, int& _faceID, int& _cornerID) const;
/** Mapping from draw tri id -> input face id
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment