projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- changed the main INCLUDE_DIRECTORIES definition to place the main header
[freeglut]
/
src
/
fg_init.c
diff --git
a/src/fg_init.c
b/src/fg_init.c
index
816fc66
..
ed9f8d3
100644
(file)
--- a/
src/fg_init.c
+++ b/
src/fg_init.c
@@
-1,5
+1,5
@@
/*
/*
- * freeglut_init.c
+ * fg_init.c
*
* Various freeglut initialization functions.
*
*
* Various freeglut initialization functions.
*
@@
-73,6
+73,7
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* ActiveMenus */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
0, /* ActiveMenus */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
+ FREEGLUT_MENU_FONT,
{ -1, -1, GL_TRUE }, /* GameModeSize */
-1, /* GameModeDepth */
-1, /* GameModeRefresh */
{ -1, -1, GL_TRUE }, /* GameModeSize */
-1, /* GameModeDepth */
-1, /* GameModeRefresh */
@@
-85,10
+86,13
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* MouseWheelTicks */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
0, /* MouseWheelTicks */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
- 1, /* MajorVersion */
- 0, /* MinorVersion */
- 0, /* ContextFlags */
- 0, /* ContextProfile */
+ GL_FALSE, /* SkipStaleMotion */
+ GL_FALSE, /* StrokeFontDrawJoinDots */
+ 1, /* OpenGL context MajorVersion */
+ 0, /* OpenGL context MinorVersion */
+ 0, /* OpenGL ContextFlags */
+ 0, /* OpenGL ContextProfile */
+ 0, /* HasOpenGL20 */
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
@@
-101,14
+105,13
@@
extern void fgPlatformDeinitialiseInputDevices ( void );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
-
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
{
#ifndef _WIN32_WCE
int i, j, argc = *pargc;
{
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
{
#ifndef _WIN32_WCE
int i, j, argc = *pargc;
{
- /* check if GLUT_FPS env var is set */
+ /* check if GLUT_FPS env var is set */
const char *fps = getenv( "GLUT_FPS" );
if( fps )
const char *fps = getenv( "GLUT_FPS" );
if( fps )
@@
-227,7
+230,7
@@
void fgDeinitialize( void )
return;
}
return;
}
- /* If we're in game mode, we want to leave game mode */
+ /* If we're in game mode, we want to leave game mode */
if( fgStructure.GameModeWindow ) {
glutLeaveGameMode();
}
if( fgStructure.GameModeWindow ) {
glutLeaveGameMode();
}
@@
-235,7
+238,7
@@
void fgDeinitialize( void )
/* If there was a menu created, destroy the rendering context */
if( fgStructure.MenuContext )
{
/* If there was a menu created, destroy the rendering context */
if( fgStructure.MenuContext )
{
- fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext );
+ fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext );
free( fgStructure.MenuContext );
fgStructure.MenuContext = NULL;
}
free( fgStructure.MenuContext );
fgStructure.MenuContext = NULL;
}
@@
-254,9
+257,9
@@
void fgDeinitialize( void )
free( timer );
}
free( timer );
}
- fgPlatformDeinitialiseInputDevices ();
+ fgPlatformDeinitialiseInputDevices ();
- fgState.MouseWheelTicks = 0;
+ fgState.MouseWheelTicks = 0;
fgState.MajorVersion = 1;
fgState.MinorVersion = 0;
fgState.MajorVersion = 1;
fgState.MinorVersion = 0;
@@
-308,14
+311,14
@@
void fgDeinitialize( void )
fgState.ProgramName = NULL;
}
fgState.ProgramName = NULL;
}
- fgPlatformCloseDisplay ();
+ fgPlatformCloseDisplay ();
fgState.Initialised = GL_FALSE;
}
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
fgState.Initialised = GL_FALSE;
}
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-#if !TARGET_HOST_POSIX_X11
+#if defined(NEED_XPARSEGEOMETRY_IMPL)
# include "util/xparsegeometry_repl.h"
#endif
# include "util/xparsegeometry_repl.h"
#endif
@@
-340,10
+343,7
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
fgCreateStructure( );
fgCreateStructure( );
- /* Get start time */
- fgState.Time = fgSystemTime();
-
- fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
+ fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
/*
* Have the display created now. If there wasn't a "-display"
/*
* Have the display created now. If there wasn't a "-display"
@@
-667,19
+667,19
@@
void FGAPIENTRY glutInitContextProfile( int profile )
/*
* Sets the user error handler (note the use of va_list for the args to the fmt)
*/
/*
* Sets the user error handler (note the use of va_list for the args to the fmt)
*/
-void FGAPIENTRY glutInitErrorFunc( void (* vfgError) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitErrorFunc( FGError callback )
{
/* This allows user programs to handle freeglut errors */
{
/* This allows user programs to handle freeglut errors */
- fgState.ErrorFunc = vfgError;
+ fgState.ErrorFunc = callback;
}
/*
* Sets the user warning handler (note the use of va_list for the args to the fmt)
*/
}
/*
* Sets the user warning handler (note the use of va_list for the args to the fmt)
*/
-void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_list ap ) )
+void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
{
/* This allows user programs to handle freeglut warnings */
{
/* This allows user programs to handle freeglut warnings */
- fgState.WarningFunc = vfgWarning;
+ fgState.WarningFunc = callback;
}
}
-/*** END OF FILE ***/
\ No newline at end of file
+/*** END OF FILE ***/