X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=2669006bddfaa65240570fcf289113235cc5e3ac;hb=070b372862c6154d36b1c8dc3f0c3684e571a4ed;hp=ce0ad2ab003a0107f8c280389ebbe8fa2a307f87;hpb=18b98d967eff786c89bfeed8e1f636f686bb1b10;p=freeglut diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index ce0ad2a..2669006 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -525,9 +525,9 @@ FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri * Geometry functions, see freeglut_geometry.c */ -#ifndef GL_ES_VERSION_2_0 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 @@ -536,7 +536,6 @@ FGAPI void FGAPIENTRY glutWireCone( double base, double height, GLint slices, FGAPI void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks ); #endif -#ifndef GL_ES_VERSION_2_0 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 ); @@ -547,7 +546,6 @@ FGAPI void FGAPIENTRY glutWireTetrahedron( void ); FGAPI void FGAPIENTRY glutSolidTetrahedron( void ); FGAPI void FGAPIENTRY glutWireIcosahedron( void ); FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); -#endif /* * Teapot rendering functions, found in freeglut_teapot.c