X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=a658c7c5f2b4163659a5e95a0e0c6c643fe89fce;hb=99318ae110a3ddbf067e03b9f2426c2fb1e3c9e7;hp=8cac2dc76a18ed289a299511b5b26e34f9783db0;hpb=892b49cef181f7bc37e24f56fc7143f28abe2056;p=freeglut diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h index 8cac2dc..a658c7c 100644 --- a/include/GL/freeglut_std.h +++ b/include/GL/freeglut_std.h @@ -129,15 +129,13 @@ /* * Always include OpenGL and GLU headers */ -/* Note: FREEGLUT_GLES1 and FREEGLUT_GLES2 are only used to cleanly - bootstrap headers inclusion here; use GLES constants directly +/* Note: FREEGLUT_GLES is only used to cleanly bootstrap headers + inclusion here; use GLES constants directly (e.g. GL_ES_VERSION_2_0) for all other needs */ -#ifdef FREEGLUT_GLES2 -# include -# include -#elif FREEGLUT_GLES1 +#ifdef FREEGLUT_GLES # include # include +# include #elif __APPLE__ # include # include @@ -419,12 +417,12 @@ FGAPI void FGAPIENTRY glutInitDisplayMode( unsigned int displayMode ); FGAPI void FGAPIENTRY glutInitDisplayString( const char* displayMode ); /* - * Process loop function, see freeglut_main.c + * Process loop function, see fg_main.c */ FGAPI void FGAPIENTRY glutMainLoop( void ); /* - * Window management functions, see freeglut_window.c + * Window management functions, see fg_window.c */ FGAPI int FGAPIENTRY glutCreateWindow( const char* title ); FGAPI int FGAPIENTRY glutCreateSubWindow( int window, int x, int y, int width, int height ); @@ -443,20 +441,20 @@ FGAPI void FGAPIENTRY glutPopWindow( void ); FGAPI void FGAPIENTRY glutFullScreen( void ); /* - * Display-connected functions, see freeglut_display.c + * Display-related functions, see fg_display.c */ FGAPI void FGAPIENTRY glutPostWindowRedisplay( int window ); FGAPI void FGAPIENTRY glutPostRedisplay( void ); FGAPI void FGAPIENTRY glutSwapBuffers( void ); /* - * Mouse cursor functions, see freeglut_cursor.c + * Mouse cursor functions, see fg_cursor.c */ FGAPI void FGAPIENTRY glutWarpPointer( int x, int y ); FGAPI void FGAPIENTRY glutSetCursor( int cursor ); /* - * Overlay stuff, see freeglut_overlay.c + * Overlay stuff, see fg_overlay.c */ FGAPI void FGAPIENTRY glutEstablishOverlay( void ); FGAPI void FGAPIENTRY glutRemoveOverlay( void ); @@ -467,7 +465,7 @@ FGAPI void FGAPIENTRY glutShowOverlay( void ); FGAPI void FGAPIENTRY glutHideOverlay( void ); /* - * Menu stuff, see freeglut_menu.c + * Menu stuff, see fg_menu.c */ FGAPI int FGAPIENTRY glutCreateMenu( void (* callback)( int menu ) ); FGAPI void FGAPIENTRY glutDestroyMenu( int menu ); @@ -482,13 +480,13 @@ FGAPI void FGAPIENTRY glutAttachMenu( int button ); FGAPI void FGAPIENTRY glutDetachMenu( int button ); /* - * Global callback functions, see freeglut_callbacks.c + * Global callback functions, see fg_callbacks.c */ FGAPI void FGAPIENTRY glutTimerFunc( unsigned int time, void (* callback)( int ), int value ); FGAPI void FGAPIENTRY glutIdleFunc( void (* callback)( void ) ); /* - * Window-specific callback functions, see freeglut_callbacks.c + * Window-specific callback functions, see fg_callbacks.c */ FGAPI void FGAPIENTRY glutKeyboardFunc( void (* callback)( unsigned char, int, int ) ); FGAPI void FGAPIENTRY glutSpecialFunc( void (* callback)( int, int, int ) ); @@ -517,7 +515,7 @@ FGAPI void FGAPIENTRY glutTabletMotionFunc( void (* callback)( int, int ) ); FGAPI void FGAPIENTRY glutTabletButtonFunc( void (* callback)( int, int, int, int ) ); /* - * State setting and retrieval functions, see freeglut_state.c + * State setting and retrieval functions, see fg_state.c */ FGAPI int FGAPIENTRY glutGet( GLenum query ); FGAPI int FGAPIENTRY glutDeviceGet( GLenum query ); @@ -525,17 +523,19 @@ FGAPI int FGAPIENTRY glutGetModifiers( void ); FGAPI int FGAPIENTRY glutLayerGet( GLenum query ); /* - * Font stuff, see freeglut_font.c + * Font stuff, see fg_font.c */ FGAPI void FGAPIENTRY glutBitmapCharacter( void* font, int character ); FGAPI int FGAPIENTRY glutBitmapWidth( void* font, int character ); FGAPI void FGAPIENTRY glutStrokeCharacter( void* font, int character ); FGAPI int FGAPIENTRY glutStrokeWidth( void* font, int character ); +FGAPI GLfloat FGAPIENTRY glutStrokeWidthf( void* font, int character ); /* GLUT 3.8 */ FGAPI int FGAPIENTRY glutBitmapLength( void* font, const unsigned char* string ); FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* string ); +FGAPI GLfloat FGAPIENTRY glutStrokeLengthf( void* font, const unsigned char *string ); /* GLUT 3.8 */ /* - * Geometry functions, see freeglut_geometry.c + * Geometry functions, see fg_geometry.c */ FGAPI void FGAPIENTRY glutWireCube( double size ); @@ -556,17 +556,14 @@ FGAPI void FGAPIENTRY glutWireIcosahedron( void ); FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); /* - * Teapot rendering functions, found in freeglut_teapot.c + * Teapot rendering functions, found in fg_teapot.c * NB: front facing polygons have clockwise winding, not counter clockwise */ -/* 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 +FGAPI void FGAPIENTRY glutWireTeapot( double size ); +FGAPI void FGAPIENTRY glutSolidTeapot( double size ); /* - * Game mode functions, see freeglut_gamemode.c + * Game mode functions, see fg_gamemode.c */ FGAPI void FGAPIENTRY glutGameModeString( const char* string ); FGAPI int FGAPIENTRY glutEnterGameMode( void ); @@ -574,7 +571,7 @@ FGAPI void FGAPIENTRY glutLeaveGameMode( void ); FGAPI int FGAPIENTRY glutGameModeGet( GLenum query ); /* - * Video resize functions, see freeglut_videoresize.c + * Video resize functions, see fg_videoresize.c */ FGAPI int FGAPIENTRY glutVideoResizeGet( GLenum query ); FGAPI void FGAPIENTRY glutSetupVideoResizing( void ); @@ -583,21 +580,21 @@ FGAPI void FGAPIENTRY glutVideoResize( int x, int y, int width, int height ); FGAPI void FGAPIENTRY glutVideoPan( int x, int y, int width, int height ); /* - * Colormap functions, see freeglut_misc.c + * Colormap functions, see fg_misc.c */ FGAPI void FGAPIENTRY glutSetColor( int color, GLfloat red, GLfloat green, GLfloat blue ); FGAPI GLfloat FGAPIENTRY glutGetColor( int color, int component ); FGAPI void FGAPIENTRY glutCopyColormap( int window ); /* - * Misc keyboard and joystick functions, see freeglut_misc.c + * Misc keyboard and joystick functions, see fg_misc.c */ FGAPI void FGAPIENTRY glutIgnoreKeyRepeat( int ignore ); FGAPI void FGAPIENTRY glutSetKeyRepeat( int repeatMode ); FGAPI void FGAPIENTRY glutForceJoystickFunc( void ); /* - * Misc functions, see freeglut_misc.c + * Misc functions, see fg_misc.c */ FGAPI int FGAPIENTRY glutExtensionSupported( const char* extension ); FGAPI void FGAPIENTRY glutReportErrors( void );