From 7d5d2271e6f5113c698a23320b2751638c945742 Mon Sep 17 00:00:00 2001 From: Luigi Malomo Date: Fri, 11 Jun 2021 16:40:48 +0200 Subject: [PATCH] fixed gl picking --- wrap/gl/pick.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wrap/gl/pick.h b/wrap/gl/pick.h index bb4ea942..33461bb5 100644 --- a/wrap/gl/pick.h +++ b/wrap/gl/pick.h @@ -26,7 +26,8 @@ #include #include -#include "gl_type_name.h" + +#include namespace vcg{ @@ -218,11 +219,11 @@ public: int screenW = (int)(vp[2]-vp[0]); int screenH = (int)(vp[3]-vp[1]); - GL_TYPE_NM::ScalarType *buffer = new GL_TYPE_NM::ScalarType[screenW*screenH]; + GLfloat *buffer = new GLfloat[screenW*screenH]; - //I'm not sure glReadPixels can accept GL_DOUBLE tag + //glReadPixels does NOT accept GL_DOUBLE //GLenum err = glGetError(); - glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE_NM::SCALAR(),buffer); + glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_FLOAT,buffer); //err = glGetError(); std::vector result; PickFace(x,y,m,result,width,height); @@ -261,11 +262,10 @@ public: int screenH = vp[3]-vp[1]; - GL_TYPE_NM::ScalarType *buffer = new GL_TYPE_NM::ScalarType[screenW*screenH]; + GLfloat *buffer = new GLfloat[screenW*screenH]; - //I'm not sure glReadPixels can accept GL_DOUBLE tag //GLenum err = glGetError(); - glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE_NM::SCALAR(),buffer); + glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_FLOAT,buffer); //err = glGetError(); std::vector result;