X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=2669006bddfaa65240570fcf289113235cc5e3ac;hb=49df0cf2fb8f84ff03fcfc91f4e2b4c4e5774854;hp=ab1be03a48c6a2d0237345384cc80286715c15ca;hpb=5e11d4bbb691aaee52ac0b5607a7e85b93d6659e;p=freeglut diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index ab1be03..2669006 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -527,10 +527,14 @@ FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri FGAPI void FGAPIENTRY glutWireCube( double size ); FGAPI void FGAPIENTRY glutSolidCube( double size ); +#ifndef GL_ES_VERSION_2_0 FGAPI void FGAPIENTRY glutWireSphere( double radius, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutSolidSphere( double radius, GLint slices, GLint stacks ); +#endif +#ifndef EGL_VERSION_1_0 FGAPI void FGAPIENTRY glutWireCone( double base, double height, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks ); +#endif FGAPI void FGAPIENTRY glutWireTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); FGAPI void FGAPIENTRY glutSolidTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); @@ -546,8 +550,11 @@ FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); /* * Teapot rendering functions, found in freeglut_teapot.c */ -FGAPI void FGAPIENTRY glutWireTeapot( double size ); -FGAPI void FGAPIENTRY glutSolidTeapot( double size ); +/* TODO: doesn't work with GLES1 yet */ +#ifndef EGL_VERSION_1_0 +FGAPI void FGAPIENTRY glutWireTeapot( GLdouble size ); +FGAPI void FGAPIENTRY glutSolidTeapot( GLdouble size ); +#endif /* * Game mode functions, see freeglut_gamemode.c