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

- renamed GL_TYPE with GL_TYPE_NM in order to avoid names conflict

This commit is contained in:
granzuglia 2014-08-28 08:59:24 +00:00
parent c08ca27367
commit 5c809dc701
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wrap/gl/pick.h
View File

@ -211,11 +211,11 @@ public:
int screenW = (int)(vp[2]-vp[0]); int screenW = (int)(vp[2]-vp[0]);
int screenH = (int)(vp[3]-vp[1]); int screenH = (int)(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;
PickFace(x,y,m,result,width,height); PickFace(x,y,m,result,width,height);

22
wrap/gl/trimesh.h
View File

@ -35,16 +35,16 @@
namespace vcg { namespace vcg {
template <typename T> template <typename T>
class GL_TYPE class GL_TYPE_NM
{public: {public:
static GLenum SCALAR() { assert(0); return 0;} static GLenum SCALAR() { assert(0); return 0;}
}; };
template <> class GL_TYPE<float> template <> class GL_TYPE_NM<float>
{ public: { public:
typedef GLfloat ScalarType; typedef GLfloat ScalarType;
static GLenum SCALAR() { return GL_FLOAT; } static GLenum SCALAR() { return GL_FLOAT; }
}; };
template <> class GL_TYPE<double> template <> class GL_TYPE_NM<double>
{public: {public:
typedef GLdouble ScalarType; typedef GLdouble ScalarType;
static GLenum SCALAR() { return GL_DOUBLE; } static GLenum SCALAR() { return GL_DOUBLE; }
@ -234,8 +234,8 @@ void Update(/*Change c=CHAll*/)
(char *)&(m->vert[0].N()), GL_STATIC_DRAW_ARB); (char *)&(m->vert[0].N()), GL_STATIC_DRAW_ARB);
} }
glVertexPointer(3,GL_TYPE<ScalarType>::SCALAR(),sizeof(VertexType),0); glVertexPointer(3,GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(VertexType),0);
glNormalPointer(GL_TYPE<ScalarType>::SCALAR(),sizeof(VertexType),0); glNormalPointer(GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(VertexType),0);
} }
//int C=c; //int C=c;
@ -377,10 +377,10 @@ void DrawFill()
if (nm==NMPerVert) if (nm==NMPerVert)
{ {
glBindBuffer(GL_ARRAY_BUFFER,array_buffers[1]); glBindBuffer(GL_ARRAY_BUFFER,array_buffers[1]);
glNormalPointer(GL_TYPE<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),0); glNormalPointer(GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),0);
} }
glBindBuffer(GL_ARRAY_BUFFER,array_buffers[0]); glBindBuffer(GL_ARRAY_BUFFER,array_buffers[0]);
glVertexPointer(3,GL_TYPE<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),0); glVertexPointer(3,GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),0);
glDrawElements(GL_TRIANGLES ,m->fn*3,GL_UNSIGNED_INT, &(*indices.begin()) ); glDrawElements(GL_TRIANGLES ,m->fn*3,GL_UNSIGNED_INT, &(*indices.begin()) );
glDisableClientState (GL_VERTEX_ARRAY); glDisableClientState (GL_VERTEX_ARRAY);
@ -403,8 +403,8 @@ void DrawFill()
glEnableClientState (GL_VERTEX_ARRAY); glEnableClientState (GL_VERTEX_ARRAY);
if (nm==NMPerVert) if (nm==NMPerVert)
glNormalPointer(GL_TYPE<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),&(m->vert.begin()->N()[0])); glNormalPointer(GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),&(m->vert.begin()->N()[0]));
glVertexPointer(3,GL_TYPE<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),&(m->vert.begin()->P()[0])); glVertexPointer(3,GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(typename MeshType::VertexType),&(m->vert.begin()->P()[0]));
glDrawElements(GL_TRIANGLES ,m->fn*3,GL_UNSIGNED_INT, &(*indices.begin()) ); glDrawElements(GL_TRIANGLES ,m->fn*3,GL_UNSIGNED_INT, &(*indices.begin()) );
glDisableClientState (GL_VERTEX_ARRAY); glDisableClientState (GL_VERTEX_ARRAY);
@ -686,7 +686,7 @@ void DrawPoints()
if (nm==NMPerVert) if (nm==NMPerVert)
{ {
glEnableClientState (GL_NORMAL_ARRAY); glEnableClientState (GL_NORMAL_ARRAY);
glNormalPointer(GL_TYPE<ScalarType>::SCALAR(),sizeof(VertexType),&(m->vert.begin()->N()[0])); glNormalPointer(GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(VertexType),&(m->vert.begin()->N()[0]));
} }
if (cm==CMPerVert) if (cm==CMPerVert)
{ {
@ -695,7 +695,7 @@ void DrawPoints()
} }
glEnableClientState (GL_VERTEX_ARRAY); glEnableClientState (GL_VERTEX_ARRAY);
glVertexPointer(3,GL_TYPE<ScalarType>::SCALAR(),sizeof(VertexType),&(m->vert.begin()->P()[0])); glVertexPointer(3,GL_TYPE_NM<ScalarType>::SCALAR(),sizeof(VertexType),&(m->vert.begin()->P()[0]));
glDrawArrays(GL_POINTS,0,m->vn); glDrawArrays(GL_POINTS,0,m->vn);