X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=8bdae356a040b73652c99eaa4dcec6ff13a8b158;hb=71c0aa1b0c139a5555d9c07eb23edb410697c185;hp=2669006bddfaa65240570fcf289113235cc5e3ac;hpb=070b372862c6154d36b1c8dc3f0c3684e571a4ed;p=freeglut diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index 2669006..8bdae35 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -527,15 +527,10 @@ 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 ); FGAPI void FGAPIENTRY glutWireDodecahedron( void ); @@ -549,6 +544,7 @@ FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); /* * Teapot rendering functions, found in freeglut_teapot.c + * NB: front facing polygons have clockwise winding, not counter clockwise */ /* TODO: doesn't work with GLES1 yet */ #ifndef EGL_VERSION_1_0