X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_ext.h;h=e6ede70aab761729ced7432088b2b4e71e0e9fe2;hb=f0fa306fbd7cb7a61d5b9229c808ff66c858331f;hp=81946387fa9be8655939ce830d3a6aa9db108eef;hpb=8e06738e2a2879e125fa166f6f7817727d898beb;p=freeglut

diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h
index 8194638..e6ede70 100644
--- a/include/GL/freeglut_ext.h
+++ b/include/GL/freeglut_ext.h
@@ -46,6 +46,14 @@
 #define GLUT_USE_CURRENT_CONTEXT                 1
 
 /*
+ * Direct/Indirect rendering context options (has meaning only in Unix/X11)
+ */
+#define GLUT_FORCE_INDIRECT_CONTEXT              0
+#define GLUT_ALLOW_DIRECT_CONTEXT                1
+#define GLUT_TRY_DIRECT_CONTEXT                  2
+#define GLUT_FORCE_DIRECT_CONTEXT                3
+
+/*
  * GLUT API Extension macro definitions -- the glutGet parameters
  */
 #define  GLUT_ACTION_ON_WINDOW_CLOSE        0x01F9
@@ -56,6 +64,17 @@
 #define  GLUT_VERSION                       0x01FC
 
 #define  GLUT_RENDERING_CONTEXT             0x01FD
+#define  GLUT_DIRECT_RENDERING              0x01FE
+
+/*
+ * New tokens for glutInitDisplayMode.
+ * Only one GLUT_AUXn bit may be used at a time.
+ * Value 0x0400 is defined in OpenGLUT.
+ */
+#define  GLUT_AUX1                          0x1000
+#define  GLUT_AUX2                          0x2000
+#define  GLUT_AUX3                          0x4000
+#define  GLUT_AUX4                          0x8000
 
 /*
  * Process loop function, see freeglut_main.c
@@ -66,6 +85,7 @@ FGAPI void    FGAPIENTRY glutLeaveMainLoop( void );
 /*
  * Window-specific callback functions, see freeglut_callbacks.c
  */
+FGAPI void    FGAPIENTRY glutMouseWheelFunc( void (* callback)( int, int, int, int ) );
 FGAPI void    FGAPIENTRY glutCloseFunc( void (* callback)( void ) );
 FGAPI void    FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) );
 /* A. Donev: Also a destruction callback for menus */
@@ -74,7 +94,7 @@ FGAPI void    FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) );
 /*
  * State setting and retrieval functions, see freeglut_state.c
  */
-FGAPI void    FGAPIENTRY glutSetOption ( GLenum option_flag, int value ) ;
+FGAPI void    FGAPIENTRY glutSetOption ( GLenum option_flag, int value );
 /* A.Donev: User-data manipulation */
 FGAPI void*   FGAPIENTRY glutGetWindowData( void );
 FGAPI void    FGAPIENTRY glutSetWindowData(void* data);
@@ -86,22 +106,41 @@ FGAPI void    FGAPIENTRY glutSetMenuData(void* data);
  */
 FGAPI int     FGAPIENTRY glutBitmapHeight( void* font );
 FGAPI GLfloat FGAPIENTRY glutStrokeHeight( void* font );
-FGAPI void    FGAPIENTRY glutBitmapString( void* font, const char *string );
-FGAPI void    FGAPIENTRY glutStrokeString( void* font, const char *string );
+FGAPI void    FGAPIENTRY glutBitmapString( void* font, const unsigned char *string );
+FGAPI void    FGAPIENTRY glutStrokeString( void* font, const unsigned char *string );
 
 /*
  * Geometry functions, see freeglut_geometry.c
  */
 FGAPI void    FGAPIENTRY glutWireRhombicDodecahedron( void );
 FGAPI void    FGAPIENTRY glutSolidRhombicDodecahedron( void );
-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 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);
 
 /*
  * Extension functions, see freeglut_ext.c
  */
-FGAPI void * FGAPIENTRY glutGetProcAddress( const char *procName );
+typedef void (*GLUTproc)();
+FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName );
 
+/*
+ * Joystick functions, see freeglut_joystick.c
+ */
+FGAPI int     FGAPIENTRY glutJoystickGetNumAxes( int ident );
+FGAPI int     FGAPIENTRY glutJoystickGetNumButtons( int ident );
+FGAPI int     FGAPIENTRY glutJoystickNotWorking( int ident );
+FGAPI float   FGAPIENTRY glutJoystickGetDeadBand( int ident, int axis );
+FGAPI void    FGAPIENTRY glutJoystickSetDeadBand( int ident, int axis, float db );
+FGAPI float   FGAPIENTRY glutJoystickGetSaturation( int ident, int axis );
+FGAPI void    FGAPIENTRY glutJoystickSetSaturation( int ident, int axis, float st );
+FGAPI void    FGAPIENTRY glutJoystickSetMinRange( int ident, float *axes );
+FGAPI void    FGAPIENTRY glutJoystickSetMaxRange( int ident, float *axes );
+FGAPI void    FGAPIENTRY glutJoystickSetCenter( int ident, float *axes );
+FGAPI void    FGAPIENTRY glutJoystickGetMinRange( int ident, float *axes );
+FGAPI void    FGAPIENTRY glutJoystickGetMaxRange( int ident, float *axes );
+FGAPI void    FGAPIENTRY glutJoystickGetCenter( int ident, float *axes );
 
 #ifdef __cplusplus
     }