X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=include%2FGL%2Ffreeglut_ext.h;h=0597c0f9ed9ae6072093792fd13b564db87d195f;hb=12b5b4f2497902c06c175b88d90cab8a91457739;hp=9353d22d99c277fe323808ad61a9810484c95b84;hpb=aa2b6e6509639152662dce4ea66bc16c4ca9fd9f;p=freeglut

diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h
index 9353d22..0597c0f 100644
--- a/include/GL/freeglut_ext.h
+++ b/include/GL/freeglut_ext.h
@@ -83,6 +83,8 @@
 
 #define  GLUT_FULL_SCREEN                   0x01FF
 
+#define  GLUT_SKIP_STALE_MOTION_EVENTS      0x0204
+
 /*
  * New tokens for glutInitDisplayMode.
  * Only one GLUT_AUXn bit may be used at a time.
@@ -163,18 +165,10 @@ FGAPI void    FGAPIENTRY glutStrokeString( void* font, const unsigned char *stri
  */
 FGAPI void    FGAPIENTRY glutWireRhombicDodecahedron( void );
 FGAPI void    FGAPIENTRY glutSolidRhombicDodecahedron( void );
-
-#ifdef EGL_VERSION_1_0
-/* TODO: temporary work-around for missing GLdouble in GLES */
-#   define GLdouble     GLfloat
-#endif
-FGAPI void    FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale );
-FGAPI void    FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale );
-FGAPI void    FGAPIENTRY glutWireCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks);
-FGAPI void    FGAPIENTRY glutSolidCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks);
-#ifdef EGL_VERSION_1_0
-#   undef GLdouble
-#endif
+FGAPI void    FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, double offset[3], double scale );
+FGAPI void    FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, double offset[3], double scale );
+FGAPI void    FGAPIENTRY glutWireCylinder( double radius, double height, GLint slices, GLint stacks);
+FGAPI void    FGAPIENTRY glutSolidCylinder( double radius, double height, GLint slices, GLint stacks);
 
 /*
  * Extension functions, see freeglut_ext.c
@@ -188,6 +182,8 @@ FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName );
 
 #define GLUT_HAS_MULTI 1
 
+/* TODO: add device_id paramater,
+   cf. http://sourceforge.net/mailarchive/forum.php?thread_name=20120518071314.GA28061%40perso.beuc.net&forum_name=freeglut-developer */
 FGAPI void FGAPIENTRY glutMultiEntryFunc( void (* callback)( int, int ) );
 FGAPI void FGAPIENTRY glutMultiButtonFunc( void (* callback)( int, int, int, int, int ) );
 FGAPI void FGAPIENTRY glutMultiMotionFunc( void (* callback)( int, int, int ) );
@@ -229,6 +225,15 @@ FGAPI void    FGAPIENTRY glutInitContextProfile( int profile );
 FGAPI void    FGAPIENTRY glutInitErrorFunc( void (* vError)( const char *fmt, va_list ap ) );
 FGAPI void    FGAPIENTRY glutInitWarningFunc( void (* vWarning)( const char *fmt, va_list ap ) );
 
+/* OpenGL >= 2.0 support */
+FGAPI void    FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib);
+FGAPI void    FGAPIENTRY glutSetVertexAttribNormal(GLint attrib);
+
+/* Mobile platforms lifecycle */
+FGAPI void    FGAPIENTRY glutInitContextFunc(void (* callback)());
+FGAPI void    FGAPIENTRY glutPauseFunc(void (* callback)());
+FGAPI void    FGAPIENTRY glutResumeFunc(void (* callback)());
+
 /*
  * GLUT API macro definitions -- the display mode definitions
  */