Commit 34031f90 authored by Jan Möbius's avatar Jan Möbius
Browse files

More size_t

parent dc85108c
Pipeline #3280 passed with stage
in 37 minutes and 18 seconds
......@@ -559,7 +559,7 @@ public:
* @param _mvp model view projection transformation
* @param _pickOffset base picking id of the first edge
*/
void drawPickingEdges_opt(const GLMatrixf& _mvp, int _pickOffset);
void drawPickingEdges_opt(const GLMatrixf& _mvp, size_t _pickOffset);
/** \brief Check if optimized face picking is supported
......@@ -628,7 +628,7 @@ public:
* @param _mvp model view projection transformation
* @param _pickOffset base picking id of the first face
*/
void drawPickingFaces_opt(const GLMatrixf& _mvp, int _pickOffset);
void drawPickingFaces_opt(const GLMatrixf& _mvp, size_t _pickOffset);
/** \brief Check if optimized face picking is supported
......@@ -734,7 +734,7 @@ public:
* @param _mvp model view projection transformation
* @param _pickOffset base picking id of the first element
*/
void drawPickingAny_opt(const GLMatrixf& _mvp, int _pickOffset);
void drawPickingAny_opt(const GLMatrixf& _mvp, size_t _pickOffset);
/** \brief Check if optimized any picking is supported
*
......
......@@ -454,7 +454,7 @@ DrawMeshT<Mesh>::rebuild()
// read all vertices
for (size_t i = 0; i < numVerts_; ++i)
readVertex(i,
mesh_.vertex_handle(i),
mesh_.vertex_handle(static_cast<unsigned int>(i)),
(typename Mesh::HalfedgeHandle)(-1),
(typename Mesh::FaceHandle)(-1));
......@@ -1724,7 +1724,7 @@ void ACG::DrawMeshT<Mesh>::drawPickingVertices_opt( const GLMatrixf& _mvp, int _
pickVertexShader_->use();
getVertexDeclaration()->activateShaderPipeline(pickVertexShader_);
pickVertexShader_->setUniform("pickVertexOffset", _pickOffset);
pickVertexShader_->setUniform("pickVertexOffset", static_cast<GLint>(_pickOffset) );
if (pickVertexMethod_ == 0)
{
......@@ -1960,7 +1960,7 @@ bool ACG::DrawMeshT<Mesh>::supportsPickingEdges_opt()
template <class Mesh>
void ACG::DrawMeshT<Mesh>::drawPickingEdges_opt( const GLMatrixf& _mvp, int _pickOffset )
void ACG::DrawMeshT<Mesh>::drawPickingEdges_opt( const GLMatrixf& _mvp, size_t _pickOffset )
{
// optimized version which computes picking ids in the shader
......@@ -1988,7 +1988,7 @@ void ACG::DrawMeshT<Mesh>::drawPickingEdges_opt( const GLMatrixf& _mvp, int _pic
pickEdgeShader_->use();
getVertexDeclaration()->activateShaderPipeline(pickEdgeShader_);
pickEdgeShader_->setUniform("pickVertexOffset", _pickOffset);
pickEdgeShader_->setUniform("pickVertexOffset", static_cast<GLint>(_pickOffset) );
pickEdgeShader_->setUniform("mWVP", _mvp);
// draw call
......@@ -2091,7 +2091,7 @@ bool ACG::DrawMeshT<Mesh>::supportsPickingFaces_opt()
template <class Mesh>
void ACG::DrawMeshT<Mesh>::drawPickingFaces_opt( const GLMatrixf& _mvp, int _pickOffset )
void ACG::DrawMeshT<Mesh>::drawPickingFaces_opt( const GLMatrixf& _mvp, size_t _pickOffset )
{
// optimized version which computes picking ids in the shader
......@@ -2137,7 +2137,7 @@ void ACG::DrawMeshT<Mesh>::drawPickingFaces_opt( const GLMatrixf& _mvp, int _pic
pickFaceShader_->use();
getVertexDeclaration()->activateShaderPipeline(pickFaceShader_);
pickFaceShader_->setUniform("pickFaceOffset", _pickOffset);
pickFaceShader_->setUniform("pickFaceOffset", static_cast<GLint>(_pickOffset));
pickFaceShader_->setUniform("triToFaceMap", 0);
#ifdef GL_ARB_texture_buffer_object
......@@ -2255,7 +2255,7 @@ bool ACG::DrawMeshT<Mesh>::supportsPickingAny_opt()
template <class Mesh>
void ACG::DrawMeshT<Mesh>::drawPickingAny_opt( const GLMatrixf& _mvp, int _pickOffset )
void ACG::DrawMeshT<Mesh>::drawPickingAny_opt( const GLMatrixf& _mvp, size_t _pickOffset )
{
// optimized version which computes picking ids in the shader
......
Supports Markdown
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