X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_display.c;h=fe0ff137c75d04e858179556127cab63f7b75056;hb=427572de3a4312492506b29306ab7ca80a4816b5;hp=3db6cb55bcdcf5e7a714dd291b174dc99d5911f1;hpb=2e5dc871b7c1df472978af9811d0e97b6684707c;p=freeglut diff --git a/src/freeglut_display.c b/src/freeglut_display.c index 3db6cb5..fe0ff13 100644 --- a/src/freeglut_display.c +++ b/src/freeglut_display.c @@ -42,7 +42,7 @@ void FGAPIENTRY glutPostRedisplay( void ) { freeglut_assert_ready; freeglut_assert_window; - fgStructure.Window->State.Redisplay = TRUE; + fgStructure.Window->State.Redisplay = GL_TRUE; } /* @@ -53,8 +53,8 @@ void FGAPIENTRY glutSwapBuffers( void ) freeglut_assert_ready; freeglut_assert_window; - glFlush(); - if ( ! fgStructure.Window->Window.DoubleBuffered ) + glFlush( ); + if( ! fgStructure.Window->Window.DoubleBuffered ) return; #if TARGET_HOST_UNIX_X11 @@ -64,16 +64,19 @@ void FGAPIENTRY glutSwapBuffers( void ) #endif /* GLUT_FPS env var support */ - if (fgState.FPSInterval) { - GLint t = glutGet(GLUT_ELAPSED_TIME); + if( fgState.FPSInterval ) + { + GLint t = glutGet( GLUT_ELAPSED_TIME ); fgState.SwapCount++; - if (fgState.SwapTime == 0) + if( fgState.SwapTime == 0 ) fgState.SwapTime = t; - else if (t - fgState.SwapTime > fgState.FPSInterval) { - float time = 0.001f * (t - fgState.SwapTime); - float fps = (float) fgState.SwapCount / time; - fprintf(stderr, "freeglut: %d frames in %.2f seconds = %.2f FPS\n", - fgState.SwapCount, time, fps); + else if( t - fgState.SwapTime > fgState.FPSInterval ) + { + float time = 0.001f * ( t - fgState.SwapTime ); + float fps = ( float )fgState.SwapCount / time; + fprintf( stderr, + "freeglut: %d frames in %.2f seconds = %.2f FPS\n", + fgState.SwapCount, time, fps ); fgState.SwapTime = t; fgState.SwapCount = 0; } @@ -89,8 +92,8 @@ void FGAPIENTRY glutPostWindowRedisplay( int windowID ) freeglut_assert_ready; window = fgWindowByID( windowID ); - freeglut_return_if_fail( window != NULL ); - window->State.Redisplay = TRUE; + freeglut_return_if_fail( window ); + window->State.Redisplay = GL_TRUE; } /*** END OF FILE ***/