Include freeglut header via <GL/freeglut.h> rather than "../include/GL/freeglut.h"

[freeglut] / src / freeglut_display.c

diff --git a/src/freeglut_display.c b/src/freeglut_display.c
index ca3b151..eeac0ac 100644 (file)
--- a/src/freeglut_display.c
+++ b/src/freeglut_display.c
@@ -29,9 +29,7 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-display"
-
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 
@@ -42,15 +40,9 @@
  */
 void FGAPIENTRY glutPostRedisplay( void )
 {
-    /*
-     * Is there a current window set?
-     */
-    freeglut_assert_ready; freeglut_assert_window;
-
-    /*
-     * Just mark the window as one that we need to redisplay...
-     */
-    fgStructure.Window->State.Redisplay = TRUE;
+    freeglut_assert_ready;
+    freeglut_assert_window;
+    fgStructure.Window->State.Redisplay = GL_TRUE;
 }
 
 /*
@@ -58,51 +50,33 @@ void FGAPIENTRY glutPostRedisplay( void )
  */
 void FGAPIENTRY glutSwapBuffers( void )
 {
-    /*
-     * As long as we've got a current window set...
-     */
-    freeglut_assert_ready; freeglut_assert_window;
-
-    /*
-     * Have the mouse cursor drawn for the current window
-     */
-    fgDisplayCursor();
-
-    /*
-     * Make sure the current context is flushed
-     */
-    glFlush();
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
-    /*
-     * If it's single-buffered, we shouldn't be here.
-     */
-    if ( ! fgStructure.Window->Window.DoubleBuffered ) return ;
+    glFlush( );
+    if( ! fgStructure.Window->Window.DoubleBuffered )
+        return;
 
 #if TARGET_HOST_UNIX_X11
-    /*
-     * Issue the glXSwapBuffers call and be done with it
-     */
     glXSwapBuffers( fgDisplay.Display, fgStructure.Window->Window.Handle );
-
 #elif TARGET_HOST_WIN32
-    /*
-     * Swap the window's buffers
-     */
     SwapBuffers( fgStructure.Window->Window.Device );
-
 #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;
         }
@@ -117,21 +91,9 @@ void FGAPIENTRY glutPostWindowRedisplay( int windowID )
     SFG_Window* window;
 
     freeglut_assert_ready;
-
-    /*
-     * Try looking for the window
-     */
     window = fgWindowByID( windowID );
-
-    /*
-     * If failed, return
-     */
-    freeglut_return_if_fail( window != NULL );
-
-    /*
-     * Otherwise mark the window for being redisplayed
-     */
-    window->State.Redisplay = TRUE;
+    freeglut_return_if_fail( window );
+    window->State.Redisplay = GL_TRUE;
 }
 
 /*** END OF FILE ***/