projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Removed genfonts/genstrokes code, updated configure.in and Makefile.in
[freeglut]
/
freeglut-1.3
/
freeglut_joystick.c
diff --git
a/freeglut-1.3/freeglut_joystick.c
b/freeglut-1.3/freeglut_joystick.c
index
fc2c8f6
..
a47d491
100644
(file)
--- a/
freeglut-1.3/freeglut_joystick.c
+++ b/
freeglut-1.3/freeglut_joystick.c
@@
-408,12
+408,12
@@
static void fghJoystickOpen( SFG_Joystick* joy )
return;
# ifdef __FreeBSD__
return;
# ifdef __FreeBSD__
- fghJoystickRawRead( buttons, axes );
+ fghJoystickRawRead(joy, buttons, axes );
joy->error = axes[ 0 ] < -1000000000.0f;
if( joy->error )
return ;
joy->error = axes[ 0 ] < -1000000000.0f;
if( joy->error )
return ;
- sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), id );
+ sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), joy->id );
joyfile = fopen( joyfname, "r" );
joy->error = (joyfile == NULL);
joyfile = fopen( joyfname, "r" );
joy->error = (joyfile == NULL);
@@
-434,8
+434,8
@@
static void fghJoystickOpen( SFG_Joystick* joy )
for( i=0 ; i<_JS_MAX_AXES ; i++ )
{
for( i=0 ; i<_JS_MAX_AXES ; i++ )
{
- dead_band[ i ] = 0.0f;
- saturate [ i ] = 1.0f;
+ joy->dead_band[ i ] = 0.0f;
+ joy->saturate [ i ] = 1.0f;
}
# else
}
# else
@@
-462,7
+462,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
do
{
do
{
- fghJoystickRawRead( joy, NULL, joy->center )
+ fghJoystickRawRead( joy, NULL, joy->center );
counter++;
} while( !joy->error && counter < 100 && joy->center[ 0 ] == 512.0f && joy->center[ 1 ] == 512.0f );
counter++;
} while( !joy->error && counter < 100 && joy->center[ 0 ] == 512.0f && joy->center[ 1 ] == 512.0f );