From f0fa306fbd7cb7a61d5b9229c808ff66c858331f Mon Sep 17 00:00:00 2001 From: Sven Panne Date: Fri, 8 Jul 2005 13:20:12 +0000 Subject: [PATCH] Made all the "glutJoystickXXX" functions part of the freeglut extensions. If this is not what we want, we can easily #ifdef this away again... git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@672 7f0cb862-5218-0410-a997-914c9d46530a --- ChangeLog | 3 +++ include/GL/freeglut_ext.h | 22 +++++++++++++++++++--- src/freeglut_ext.c | 13 +++++++++++++ src/freeglut_internal.h | 5 ----- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 388bfed..8b297e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1115,3 +1115,6 @@ to 100% CPU load. only externally visible symbols should either be from the GLUT API ("glutXXX") or internal freeglut entities ("fgYYY"). Reformatted things a bit on the way. + +(290) Made all the "glutJoystickXXX" functions part of the freeglut +extensions. diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h index 3bcb2c9..e6ede70 100644 --- a/include/GL/freeglut_ext.h +++ b/include/GL/freeglut_ext.h @@ -94,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); @@ -114,8 +114,8 @@ FGAPI void FGAPIENTRY glutStrokeString( void* font, const unsigned char *stri */ 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); @@ -125,6 +125,22 @@ FGAPI void FGAPIENTRY glutSolidCylinder( GLdouble radius, GLdouble height, GL 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 } diff --git a/src/freeglut_ext.c b/src/freeglut_ext.c index cb28d4e..875945e 100644 --- a/src/freeglut_ext.c +++ b/src/freeglut_ext.c @@ -177,6 +177,19 @@ static GLUTproc fghGetProcAddress( const char* procName ) CHECK_NAME(glutSolidCylinder); CHECK_NAME(glutGetProcAddress); CHECK_NAME(glutMouseWheelFunc); + CHECK_NAME(glutJoystickGetNumAxes); + CHECK_NAME(glutJoystickGetNumButtons); + CHECK_NAME(glutJoystickNotWorking); + CHECK_NAME(glutJoystickGetDeadBand); + CHECK_NAME(glutJoystickSetDeadBand); + CHECK_NAME(glutJoystickGetSaturation); + CHECK_NAME(glutJoystickSetSaturation); + CHECK_NAME(glutJoystickSetMinRange); + CHECK_NAME(glutJoystickSetMaxRange); + CHECK_NAME(glutJoystickSetCenter); + CHECK_NAME(glutJoystickGetMinRange); + CHECK_NAME(glutJoystickGetMaxRange); + CHECK_NAME(glutJoystickGetCenter); #undef CHECK_NAME return NULL; diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index 8182f36..24f4641 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -781,11 +781,6 @@ void fgInitialiseJoysticks( void ); void fgJoystickClose( void ); void fgJoystickPollWindow( SFG_Window* window ); -/* More joystick functions. Should these go into the API? */ -int glutJoystickGetNumAxes( int ident ); -int glutJoystickGetNumButtons( int ident ); -int glutJoystickNotWorking( int ident ); - /* InputDevice Initialisation and Closure */ int fgInputDeviceDetect( void ); void fgInitialiseInputDevices( void ); -- 1.7.10.4