FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made all the "glutJoystickXXX" functions part of the freeglut extensions.

Browse Source 
If this is not what we want, we can easily #ifdef this away again...


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@672 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2005-07-08 13:20:12 +00:00
parent 7648f784f3
commit c9d919e643
4 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freeglut/freeglut/ChangeLog
View File

@ -1115,3 +1115,6 @@ to 100% CPU load.
only externally visible symbols should either be from the GLUT API only externally visible symbols should either be from the GLUT API
("glutXXX") or internal freeglut entities ("fgYYY"). Reformatted things a ("glutXXX") or internal freeglut entities ("fgYYY"). Reformatted things a
bit on the way. bit on the way.
(290) Made all the "glutJoystickXXX" functions part of the freeglut
extensions.

22
freeglut/freeglut/include/GL/freeglut_ext.h
View File

@ -94,7 +94,7 @@ FGAPI void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) );
/* /*
* State setting and retrieval functions, see freeglut_state.c * 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 */ /* A.Donev: User-data manipulation */
FGAPI void* FGAPIENTRY glutGetWindowData( void ); FGAPI void* FGAPIENTRY glutGetWindowData( void );
FGAPI void FGAPIENTRY glutSetWindowData(void* data); 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 glutWireRhombicDodecahedron( void );
FGAPI void FGAPIENTRY glutSolidRhombicDodecahedron( void ); FGAPI void FGAPIENTRY glutSolidRhombicDodecahedron( void );
FGAPI void FGAPIENTRY glutWireSierpinskiSponge ( 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 glutSolidSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale );
FGAPI void FGAPIENTRY glutWireCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks); FGAPI void FGAPIENTRY glutWireCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks);
FGAPI void FGAPIENTRY glutSolidCylinder( 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)(); typedef void (*GLUTproc)();
FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName ); 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 #ifdef __cplusplus
} }

13
freeglut/freeglut/src/freeglut_ext.c
View File

@ -177,6 +177,19 @@ static GLUTproc fghGetProcAddress( const char* procName )
CHECK_NAME(glutSolidCylinder); CHECK_NAME(glutSolidCylinder);
CHECK_NAME(glutGetProcAddress); CHECK_NAME(glutGetProcAddress);
CHECK_NAME(glutMouseWheelFunc); 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 #undef CHECK_NAME
return NULL; return NULL;

5
freeglut/freeglut/src/freeglut_internal.h
View File

@ -781,11 +781,6 @@ void fgInitialiseJoysticks( void );
void fgJoystickClose( void ); void fgJoystickClose( void );
void fgJoystickPollWindow( SFG_Window* window ); 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 */ /* InputDevice Initialisation and Closure */
int fgInputDeviceDetect( void ); int fgInputDeviceDetect( void );
void fgInitialiseInputDevices( void ); void fgInitialiseInputDevices( void );