Cleaned up the comments a bit in the callbacks.c file (mostly removed some
of the kill-4-lines-to-translate-one-line-of-C-into-English comments). git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@227 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
1d59d1a43c
commit
20373fe203
@ -52,12 +52,7 @@ void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
|
|||||||
fgError ("Fatal error in program. NULL display callback not "
|
fgError ("Fatal error in program. NULL display callback not "
|
||||||
"permitted in GLUT 3.0+ or freeglut 2.0.1+\n");
|
"permitted in GLUT 3.0+ or freeglut 2.0.1+\n");
|
||||||
SET_CALLBACK( Display );
|
SET_CALLBACK( Display );
|
||||||
|
|
||||||
/*
|
|
||||||
* Force a redisplay with the new callback
|
|
||||||
*/
|
|
||||||
fgStructure.Window->State.Redisplay = TRUE;
|
fgStructure.Window->State.Redisplay = TRUE;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -90,10 +85,6 @@ void FGAPIENTRY glutSpecialFunc( void (* callback)( int, int, int ) )
|
|||||||
void FGAPIENTRY glutIdleFunc( void (* callback)( void ) )
|
void FGAPIENTRY glutIdleFunc( void (* callback)( void ) )
|
||||||
{
|
{
|
||||||
freeglut_assert_ready;
|
freeglut_assert_ready;
|
||||||
|
|
||||||
/*
|
|
||||||
* The global idle callback pointer is stored in fgState structure
|
|
||||||
*/
|
|
||||||
fgState.IdleCallback = callback;
|
fgState.IdleCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -106,28 +97,14 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ), i
|
|||||||
|
|
||||||
freeglut_assert_ready;
|
freeglut_assert_ready;
|
||||||
|
|
||||||
/*
|
|
||||||
* Create a new freeglut timer hook structure
|
|
||||||
*/
|
|
||||||
timer = (SFG_Timer *)calloc( sizeof(SFG_Timer), 1 );
|
timer = (SFG_Timer *)calloc( sizeof(SFG_Timer), 1 );
|
||||||
if (!timer)
|
if (!timer)
|
||||||
fgError ("Fatal error: "
|
fgError ("Fatal error: "
|
||||||
"Memory allocation failure in glutTimerFunc()\n");
|
"Memory allocation failure in glutTimerFunc()\n");
|
||||||
|
|
||||||
/*
|
|
||||||
* Remember the callback address and timer hook's ID
|
|
||||||
*/
|
|
||||||
timer->Callback = callback;
|
timer->Callback = callback;
|
||||||
timer->ID = timerID;
|
timer->ID = timerID;
|
||||||
|
|
||||||
/*
|
|
||||||
* When will the time out happen (in terms of window's timer)
|
|
||||||
*/
|
|
||||||
timer->TriggerTime = fgElapsedTime() + timeOut;
|
timer->TriggerTime = fgElapsedTime() + timeOut;
|
||||||
|
|
||||||
/*
|
|
||||||
* Have the new hook attached to the current window
|
|
||||||
*/
|
|
||||||
fgListAppend( &fgState.Timers, &timer->Node );
|
fgListAppend( &fgState.Timers, &timer->Node );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,14 +155,8 @@ void FGAPIENTRY glutSpecialUpFunc( void (* callback)( int, int, int ) )
|
|||||||
void FGAPIENTRY glutJoystickFunc( void (* callback)( unsigned int, int, int, int ), int pollInterval )
|
void FGAPIENTRY glutJoystickFunc( void (* callback)( unsigned int, int, int, int ), int pollInterval )
|
||||||
{
|
{
|
||||||
SET_CALLBACK( Joystick );
|
SET_CALLBACK( Joystick );
|
||||||
/*
|
|
||||||
* Do not forget setting the joystick poll rate
|
|
||||||
*/
|
|
||||||
fgStructure.Window->State.JoystickPollRate = pollInterval;
|
fgStructure.Window->State.JoystickPollRate = pollInterval;
|
||||||
|
|
||||||
/*
|
|
||||||
* Make sure the joystick polling routine gets called as early as possible:
|
|
||||||
*/
|
|
||||||
fgStructure.Window->State.JoystickLastPoll =
|
fgStructure.Window->State.JoystickLastPoll =
|
||||||
fgElapsedTime() - fgStructure.Window->State.JoystickPollRate;
|
fgElapsedTime() - fgStructure.Window->State.JoystickPollRate;
|
||||||
|
|
||||||
@ -202,7 +173,8 @@ void FGAPIENTRY glutMouseFunc( void (* callback)( int, int, int, int ) )
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sets the mouse motion callback for the current window (one or more buttons are pressed)
|
* Sets the mouse motion callback for the current window (one or more buttons
|
||||||
|
* are pressed)
|
||||||
*/
|
*/
|
||||||
void FGAPIENTRY glutMotionFunc( void (* callback)( int, int ) )
|
void FGAPIENTRY glutMotionFunc( void (* callback)( int, int ) )
|
||||||
{
|
{
|
||||||
@ -210,7 +182,8 @@ void FGAPIENTRY glutMotionFunc( void (* callback)( int, int ) )
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sets the passive mouse motion callback for the current window (no mouse buttons are pressed)
|
* Sets the passive mouse motion callback for the current window (no mouse
|
||||||
|
* buttons are pressed)
|
||||||
*/
|
*/
|
||||||
void FGAPIENTRY glutPassiveMotionFunc( void (* callback)( int, int ) )
|
void FGAPIENTRY glutPassiveMotionFunc( void (* callback)( int, int ) )
|
||||||
{
|
{
|
||||||
@ -252,7 +225,6 @@ void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) )
|
|||||||
void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
|
void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
|
||||||
{
|
{
|
||||||
freeglut_assert_ready;
|
freeglut_assert_ready;
|
||||||
|
|
||||||
fgState.MenuStateCallback = callback;
|
fgState.MenuStateCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,7 +234,6 @@ void FGAPIENTRY glutMenuStateFunc( void (* callback)( int ) )
|
|||||||
void FGAPIENTRY glutMenuStatusFunc( void (* callback)( int, int, int ) )
|
void FGAPIENTRY glutMenuStatusFunc( void (* callback)( int, int, int ) )
|
||||||
{
|
{
|
||||||
freeglut_assert_ready;
|
freeglut_assert_ready;
|
||||||
|
|
||||||
fgState.MenuStatusCallback = callback;
|
fgState.MenuStatusCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user