that definition is FREEGLUT_GLES1, not FREEGLUT_GLES
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1171 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
da52865ab3
commit
b38c9bc3ee
@ -41,7 +41,7 @@
|
|||||||
*/
|
*/
|
||||||
static void fghDrawGeometry(GLdouble *vertices, GLdouble *normals, GLboolean *edgeFlags, GLsizei numVertices, GLsizei numFaces, GLsizei numEdgePerFace, GLboolean useWireMode)
|
static void fghDrawGeometry(GLdouble *vertices, GLdouble *normals, GLboolean *edgeFlags, GLsizei numVertices, GLsizei numFaces, GLsizei numEdgePerFace, GLboolean useWireMode)
|
||||||
{
|
{
|
||||||
# ifdef FREEGLUT_GLES
|
# ifdef FREEGLUT_GLES1
|
||||||
/* Solid drawing is the same for OpenGL 1.x and OpenGL ES 1.x, just
|
/* Solid drawing is the same for OpenGL 1.x and OpenGL ES 1.x, just
|
||||||
* no edge flags for ES.
|
* no edge flags for ES.
|
||||||
* WireFrame drawing will have to be done per face though, using
|
* WireFrame drawing will have to be done per face though, using
|
||||||
@ -113,14 +113,14 @@ static void fghDrawGeometry(GLdouble *vertices, GLdouble *normals, GLboolean *ed
|
|||||||
|
|
||||||
glEnableClientState(GL_VERTEX_ARRAY);
|
glEnableClientState(GL_VERTEX_ARRAY);
|
||||||
glEnableClientState(GL_NORMAL_ARRAY);
|
glEnableClientState(GL_NORMAL_ARRAY);
|
||||||
# ifndef FREEGLUT_GLES
|
# ifndef FREEGLUT_GLES1
|
||||||
if (edgeFlags)
|
if (edgeFlags)
|
||||||
glEnableClientState(GL_EDGE_FLAG_ARRAY);
|
glEnableClientState(GL_EDGE_FLAG_ARRAY);
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
glVertexPointer(3, GL_DOUBLE, 0, vertices);
|
glVertexPointer(3, GL_DOUBLE, 0, vertices);
|
||||||
glNormalPointer(GL_DOUBLE, 0, normals);
|
glNormalPointer(GL_DOUBLE, 0, normals);
|
||||||
# ifndef FREEGLUT_GLES
|
# ifndef FREEGLUT_GLES1
|
||||||
if (edgeFlags)
|
if (edgeFlags)
|
||||||
glEdgeFlagPointer(0,edgeFlags);
|
glEdgeFlagPointer(0,edgeFlags);
|
||||||
# endif
|
# endif
|
||||||
@ -128,7 +128,7 @@ static void fghDrawGeometry(GLdouble *vertices, GLdouble *normals, GLboolean *ed
|
|||||||
|
|
||||||
glDisableClientState(GL_VERTEX_ARRAY);
|
glDisableClientState(GL_VERTEX_ARRAY);
|
||||||
glDisableClientState(GL_NORMAL_ARRAY);
|
glDisableClientState(GL_NORMAL_ARRAY);
|
||||||
# ifndef FREEGLUT_GLES
|
# ifndef FREEGLUT_GLES1
|
||||||
if (edgeFlags)
|
if (edgeFlags)
|
||||||
glDisableClientState(GL_EDGE_FLAG_ARRAY);
|
glDisableClientState(GL_EDGE_FLAG_ARRAY);
|
||||||
# endif
|
# endif
|
||||||
|
Reference in New Issue
Block a user