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

Fixes from freeglut_portable patch. Memory leak fix from John. Return_if_fail fix.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@30 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dheyse 2002-11-28 23:09:47 +00:00
parent bb9b5ee823
commit c00890a4b5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freeglut/freeglut/freeglut-1.3/freeglut_joystick.c
View File

@ -126,7 +126,7 @@ struct tagSFG_Joystick
int tmp_buttons; int tmp_buttons;
float tmp_axes[ _JS_MAX_AXES ]; float tmp_axes[ _JS_MAX_AXES ];
# else # else
JS_DATA_TYPE js; struct JS_DATA_TYPE js;
# endif # endif
char fname[ 128 ]; char fname[ 128 ];
@ -251,7 +251,7 @@ static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes )
if( status != JS_RETURN ) if( status != JS_RETURN )
{ {
g_warning( fname ); g_warning( joy->fname );
joy->error = TRUE; joy->error = TRUE;
return; return;
} }
@ -466,9 +466,9 @@ static void fghJoystickOpen( SFG_Joystick* joy )
do do
{ {
fghJoystickRawRead( joy, NULL, center ); fghJoystickRawRead( joy, NULL, joy->center )
counter++; counter++;
} while( !joy->error && counter < 100 && center[ 0 ] == 512.0f && center[ 1 ] == 512.0f ); } while( !joy->error && counter < 100 && joy->center[ 0 ] == 512.0f && joy->center[ 1 ] == 512.0f );
if( counter >= 100 ) if( counter >= 100 )
joy->error = TRUE; joy->error = TRUE;
@ -481,7 +481,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
joy->center[ i ] = 0.0f; joy->center[ i ] = 0.0f;
joy->min [ i ] = -32767.0f; joy->min [ i ] = -32767.0f;
# else # else
joy->max[ i ] = center[ i ] * 2.0f; joy->max[ i ] = joy->center[ i ] * 2.0f;
joy->min[ i ] = 0.0f; joy->min[ i ] = 0.0f;
# endif # endif
joy->dead_band[ i ] = 0.0f ; joy->dead_band[ i ] = 0.0f ;
@ -542,6 +542,8 @@ void fgJoystickClose( void )
if( fgJoystick->error != TRUE ) if( fgJoystick->error != TRUE )
close( fgJoystick->fd ); close( fgJoystick->fd );
#endif #endif
free ( fgJoystick ) ;
} }
/* /*
@ -557,8 +559,8 @@ void fgJoystickPollWindow( SFG_Window* window )
* Make sure the joystick device is initialized, the window seems valid * Make sure the joystick device is initialized, the window seems valid
* and that there is a joystick callback hooked to it: * and that there is a joystick callback hooked to it:
*/ */
freeglut_return_if_fail( fgJoystick == NULL || window == NULL ); freeglut_return_if_fail( fgJoystick != NULL && window != NULL );
freeglut_return_if_fail( window->Callbacks.Joystick == NULL ); freeglut_return_if_fail( window->Callbacks.Joystick != NULL );
/* /*
* Poll the joystick now: * Poll the joystick now: