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

Merge remote-tracking branch 'svn/trunk' into git_master

Browse Source
This commit is contained in:
Diederick C. Niehorster 2017-05-26 12:25:30 +02:00
commit 40a20ed2b1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/src/fg_joystick.c
View File

@ -324,7 +324,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
if( joy->error ) if( joy->error )
return; return;
fgPlatformJoystickRawRead ( joy, buttons, axes ); fgPlatformJoystickRawRead ( joy, buttons, axes );
} }
/* /*

10
freeglut/freeglut/src/fg_main.c
View File

@ -154,7 +154,7 @@ static void fghcbProcessWork( SFG_Window *window,
SFG_Enumerator *enumerator ) SFG_Enumerator *enumerator )
{ {
if( window->State.WorkMask ) if( window->State.WorkMask )
fgProcessWork ( window ); fgProcessWork ( window );
fgEnumSubWindows( window, fghcbProcessWork, enumerator ); fgEnumSubWindows( window, fghcbProcessWork, enumerator );
} }
@ -379,7 +379,7 @@ static void fghSleepForEvents( void )
if( fgState.NumActiveJoysticks>0 && ( msec > 10 ) ) if( fgState.NumActiveJoysticks>0 && ( msec > 10 ) )
msec = 10; msec = 10;
fgPlatformSleepForEvents ( msec ); fgPlatformSleepForEvents ( msec );
} }
@ -479,14 +479,16 @@ void FGAPIENTRY glutMainLoop( void )
if (!fgStructure.Windows.First) if (!fgStructure.Windows.First)
fgError(" ERROR: glutMainLoop called with no windows created."); fgError(" ERROR: glutMainLoop called with no windows created.");
fgPlatformMainLoopPreliminaryWork (); fgPlatformMainLoopPreliminaryWork ();
fgState.ExecState = GLUT_EXEC_STATE_RUNNING ; fgState.ExecState = GLUT_EXEC_STATE_RUNNING ;
while( fgState.ExecState == GLUT_EXEC_STATE_RUNNING ) for(;;)
{ {
SFG_Window *window; SFG_Window *window;
glutMainLoopEvent( ); glutMainLoopEvent( );
if( fgState.ExecState != GLUT_EXEC_STATE_RUNNING )
break;
/* /*
* Step through the list of windows, seeing if there are any * Step through the list of windows, seeing if there are any
* that are not menus * that are not menus