X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2FOne%2Fone.c;h=1b35f43b73c2e3cb525837d960490c4d34da8810;hb=08c51993b204bfe8d66dbf224151bbd0379b8a73;hp=7a714f4666720970643fda556f613387a381b843;hpb=0647e9f98125009ed8710eb9a9f32793a9a8f0b2;p=freeglut

diff --git a/progs/demos/One/one.c b/progs/demos/One/one.c
index 7a714f4..1b35f43 100644
--- a/progs/demos/One/one.c
+++ b/progs/demos/One/one.c
@@ -1,7 +1,7 @@
 /*
  * one.c
  *
- * Hey! This was the original file where freeglut development started. Just 
+ * Hey! This was the original file where freeglut development started. Just
  * note what I have written here at the time. And see the creation date :)
  *
  * : This is a wrapper. I still have to figure out
@@ -22,7 +22,7 @@
 #include <GL/freeglut.h>
 
 int g_LeaveGameMode = 0;
-int g_InGameMode = 1;
+int g_InGameMode = 0;
 
 /*
  * Call this function to have some text drawn at given coordinates
@@ -31,15 +31,16 @@ void PrintText( int nX, int nY, char* pszText )
 {
     int lines;
     char *p;
-    
+
     /*
      * Prepare the OpenGL state
      */
-    glDisable( GL_DEPTH_TEST );   
+    glDisable( GL_LIGHTING );
+    glDisable( GL_DEPTH_TEST );
     glMatrixMode( GL_PROJECTION );
     glPushMatrix();
     glLoadIdentity();
-    
+
     /*
      * Have an orthogonal projection matrix set
      */
@@ -54,39 +55,40 @@ void PrintText( int nX, int nY, char* pszText )
     glMatrixMode( GL_MODELVIEW );
     glPushMatrix();
     glLoadIdentity();
-    
+
     /*
-     * Now the main text	
+     * Now the main text
      */
-    glColor3ub( 0, 0, 0 ); 
-    glRasterPos2i( nX, nY ); 
+    glColor3ub( 0, 0, 0 );
+    glRasterPos2i( nX, nY );
 
     for( p=pszText, lines=0; *p; p++ )
     {
-	if( *p == '\n' )
+        if( *p == '\n' )
         {
             lines++;
             glRasterPos2i( nX, nY-(lines*18) );
         }
-        
+
         glutBitmapCharacter( GLUT_BITMAP_HELVETICA_18,  *p );
     }
-	
+
     /*
      * Revert to the old matrix modes
-     */   
+     */
     glMatrixMode( GL_PROJECTION );
     glPopMatrix();
-    
+
     glMatrixMode( GL_MODELVIEW );
     glPopMatrix();
-    
+
     /*
      * Restore the old OpenGL states
      */
     glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
     glEnable( GL_DEPTH_TEST );
-}     
+    glEnable( GL_LIGHTING );
+}
 
 /*
  * This is the display routine for our sample FreeGLUT windows
@@ -115,12 +117,12 @@ void SampleDisplay( void )
      * And then drawn...
      */
     glColor3f( 1, 1, 0 );
-    //glutWireCube( 20.0 );
+    /* glutWireCube( 20.0 ); */
     glutWireTeapot( 20.0 );
-    //glutWireSpher( 15.0, 15, 15 );
-    //glColor3f( 0, 1, 0 );
-    //glutWireCube( 30.0 );
-    //glutSolidCone( 10, 20, 10, 2 );
+    /* glutWireSpher( 15.0, 15, 15 ); */
+    /* glColor3f( 0, 1, 0 ); */
+    /* glutWireCube( 30.0 ); */
+    /* glutSolidCone( 10, 20, 10, 2 ); */
 
     /*
      * Don't forget about the model-view matrix
@@ -130,10 +132,10 @@ void SampleDisplay( void )
     /*
      * Draw a silly text
      */
-    if( g_InGameMode == 0 ) 
+    if( g_InGameMode == 0 )
         PrintText( 20, 20, "Hello there cruel world!" );
     else
-        PrintText( 20, 20, "Press ESC to leave the game mode!" ); 
+        PrintText( 20, 20, "Press ESC to leave the game mode!" );
 
     /*
      * And swap this context's buffers
@@ -154,7 +156,7 @@ void SampleIdle( void )
         g_LeaveGameMode = 0;
         g_InGameMode = 0;
     }
-}    
+}
 
 /*
  * The reshape function
@@ -240,7 +242,7 @@ void SampleMenu( int menuID )
     /*
      * Just print something funny
      */
-    printf( "SampleMenu() callback executed, menuID is %i\n", menuID ); 
+    printf( "SampleMenu() callback executed, menuID is %i\n", menuID );
 }
 
 /*
@@ -256,11 +258,13 @@ int main( int argc, char** argv )
 
     glutInit( &argc, argv );
 
+    glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_GLUTMAINLOOP_RETURNS);
+
     subMenuA = glutCreateMenu( SampleMenu );
     glutAddMenuEntry( "Sub menu A1 (01)", 1 );
     glutAddMenuEntry( "Sub menu A2 (02)", 2 );
     glutAddMenuEntry( "Sub menu A3 (03)", 3 );
-    
+
     subMenuB = glutCreateMenu( SampleMenu );
     glutAddMenuEntry( "Sub menu B1 (04)", 4 );
     glutAddMenuEntry( "Sub menu B2 (05)", 5 );
@@ -298,20 +302,26 @@ int main( int argc, char** argv )
     glutGameModeString( "640x480:16@72" );
     glutGameModeString( "1024x768" );
     glutGameModeString( ":32@120" );
-    glutGameModeString( "Toudi glupcze, Danwin bedzie moj!" ); 
-    glutGameModeString( "640x480:16@72" );
+    glutGameModeString( "Toudi glupcze, Danwin bedzie moj!" );
+    
+    glutGameModeString( "640x480:37@300" );    /* this one should fail */
+    glutEnterGameMode();
 
+    glutGameModeString( "800x600" );    /* this one is likely to succeed */
     glutEnterGameMode();
+
+    if (glutGameModeGet(GLUT_GAME_MODE_ACTIVE))
+        g_InGameMode = 1;
     glutDisplayFunc( SampleDisplay );
     glutReshapeFunc( SampleReshape );
     glutKeyboardFunc( SampleGameModeKeyboard );
     glutIdleFunc( SampleIdle );
     glutAttachMenu( GLUT_LEFT_BUTTON );
 
-    printf( "current window is %ix%i+%i+%i",
-            glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y ),
-            glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT )
-    );	
+    printf( "current window is %ix%i at (%i,%i)\n",
+        glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT ),
+        glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y )
+    );
 
     /*
      * Enter the main FreeGLUT processing loop
@@ -326,4 +336,4 @@ int main( int argc, char** argv )
     return EXIT_SUCCESS;
 }
 
-/*** END OF FILE ***/
+/*** END OF FILE ***/
\ No newline at end of file