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

Changed a few GL_TYPE -> GL_TYPE_NM to remove ambiguity

This commit is contained in:
Paolo Cignoni 2014-11-12 00:22:24 +00:00
parent 63e67d5131
commit fb2ad3f323
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wrap/gl/pick.h
View File

@ -212,7 +212,7 @@ public:
int screenH = (int)(vp[3]-vp[1]); int screenH = (int)(vp[3]-vp[1]);
GL_TYPE_NM<Scalarm>::ScalarType *buffer = new GL_TYPE_NM<Scalarm>::ScalarType[screenW*screenH]; GL_TYPE_NM<Scalarm>::ScalarType *buffer = new GL_TYPE_NM<Scalarm>::ScalarType[screenW*screenH];
//I'm not sure glReadPixels can accept GL_DOUBLE tag //I'm not sure glReadPixels can accept GL_DOUBLE tag
//GLenum err = glGetError(); //GLenum err = glGetError();
glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE_NM<Scalarm>::SCALAR(),buffer); glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE_NM<Scalarm>::SCALAR(),buffer);
@ -254,11 +254,11 @@ public:
int screenH = vp[3]-vp[1]; int screenH = vp[3]-vp[1];
GL_TYPE<Scalarm>::ScalarType *buffer = new GL_TYPE<Scalarm>::ScalarType[screenW*screenH]; GL_TYPE_NM<Scalarm>::ScalarType *buffer = new GL_TYPE_NM<Scalarm>::ScalarType[screenW*screenH];
//I'm not sure glReadPixels can accept GL_DOUBLE tag //I'm not sure glReadPixels can accept GL_DOUBLE tag
//GLenum err = glGetError(); //GLenum err = glGetError();
glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE<Scalarm>::SCALAR(),buffer); glReadPixels(vp[0],vp[1],vp[2],vp[3],GL_DEPTH_COMPONENT,GL_TYPE_NM<Scalarm>::SCALAR(),buffer);
//err = glGetError(); //err = glGetError();
std::vector<FacePointer> result; std::vector<FacePointer> result;