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

Eero Pajarre's GLUT_ICON code for Windows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@68 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
sandalle 2003-06-17 20:08:09 +00:00
parent c7d0266c6e
commit 0b4484514d
1 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
freeglut/freeglut/freeglut-1.3/freeglut_init.c
View File

@ -55,33 +55,14 @@ SFG_Display fgDisplay;
/* /*
* The settings for the current freeglut session * The settings for the current freeglut session
*/ */
SFG_State fgState = { { -1, -1, FALSE }, /* Position */ SFG_State fgState = { { -1, -1, FALSE }, { 300, 300, TRUE }, GLUT_RGBA | GLUT_SINGLE | GLUT_DEPTH,
{ 300, 300, TRUE }, /* Size */ FALSE, TRUE, FALSE, FALSE, FALSE, TRUE,
GLUT_RGBA | GLUT_SINGLE | GLUT_DEPTH, /* DisplayMode */
FALSE, /* ForceDirectContext */
TRUE, /* TryDirectContext */
FALSE, /* ForceIconic */
FALSE, /* GLDebugSwitch */
FALSE, /* XSyncSwitch */
TRUE, /* IgnoreKeyRepeat */
0, /* FPSInterval */
0, /* SwapCount */
0, /* SwapTime */
#ifdef TARGET_HOST_WIN32 #ifdef TARGET_HOST_WIN32
{ 0, FALSE }, /* Time */ { 0, FALSE },
#else #else
{ { 0, 0 }, FALSE }, { { 0, 0 }, FALSE },
#endif #endif
{ NULL, NULL }, /* Timers */ { NULL, NULL }, NULL, NULL, NULL, { 640, 480, TRUE }, 16, 72, GLUT_ACTION_EXIT, GLUT_EXEC_STATE_INIT } ;
NULL, /* IdleCallback */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
{ 640, 480, TRUE }, /* GameModeSize */
16, /* GameModeDepth */
72, /* GameModeRefresh */
GLUT_ACTION_EXIT, /* ActionOnWindowClose */
GLUT_EXEC_STATE_INIT /* ExecState */
};
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
@ -331,14 +312,6 @@ void fgDeinitialize( void )
fgState.MenuStateCallback = (FGCBmenuState)NULL ; fgState.MenuStateCallback = (FGCBmenuState)NULL ;
fgState.MenuStatusCallback = (FGCBmenuStatus)NULL ; fgState.MenuStatusCallback = (FGCBmenuStatus)NULL ;
/*
* FPS display
*/
fgState.SwapCount = 0;
fgState.SwapTime = 0;
fgState.FPSInterval = 0;
#if TARGET_HOST_UNIX_X11 #if TARGET_HOST_UNIX_X11
/* /*
@ -392,17 +365,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
#endif #endif
fgState.Time.Set = TRUE; fgState.Time.Set = TRUE;
/* check if GLUT_FPS env var is set */
{
const char *fps = getenv("GLUT_FPS");
if (fps) {
sscanf(fps, "%d", &fgState.FPSInterval);
if (fgState.FPSInterval <= 0)
fgState.FPSInterval = 5000; /* 5000 milliseconds */
}
}
/* /*
* Grab the environment variable indicating the X display to use. * Grab the environment variable indicating the X display to use.
* This is harmless under Win32, so let's let it stay here... * This is harmless under Win32, so let's let it stay here...