Style normalizations: Removed CRs and hard TABs mostly.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@337 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-11 11:18:16 +00:00
parent 864ea93df3
commit 48f65ac54d

View File

@ -44,8 +44,8 @@ void PrintText( int nX, int nY, char* pszText )
* Have an orthogonal projection matrix set * Have an orthogonal projection matrix set
*/ */
glOrtho( 0, glutGet( GLUT_WINDOW_WIDTH ), glOrtho( 0, glutGet( GLUT_WINDOW_WIDTH ),
0, glutGet( GLUT_WINDOW_HEIGHT ), 0, glutGet( GLUT_WINDOW_HEIGHT ),
-1, +1 -1, +1
); );
/* /*
@ -63,13 +63,13 @@ void PrintText( int nX, int nY, char* pszText )
for( p=pszText, lines=0; *p; p++ ) for( p=pszText, lines=0; *p; p++ )
{ {
if( *p == '\n' ) if( *p == '\n' )
{ {
lines++; lines++;
glRasterPos2i( nX, nY-(lines*18) ); glRasterPos2i( nX, nY-(lines*18) );
} }
glutBitmapCharacter( GLUT_BITMAP_HELVETICA_18, *p ); glutBitmapCharacter( GLUT_BITMAP_HELVETICA_18, *p );
} }
/* /*
@ -115,8 +115,8 @@ void SampleDisplay( void )
* And then drawn... * And then drawn...
*/ */
glColor3f( 1, 1, 0 ); glColor3f( 1, 1, 0 );
//glutWireCube( 20.0 ); //glutWireCube( 20.0 );
glutWireTeapot( 20.0 ); glutWireTeapot( 20.0 );
//glutWireSpher( 15.0, 15, 15 ); //glutWireSpher( 15.0, 15, 15 );
//glColor3f( 0, 1, 0 ); //glColor3f( 0, 1, 0 );
//glutWireCube( 30.0 ); //glutWireCube( 30.0 );
@ -125,20 +125,20 @@ void SampleDisplay( void )
/* /*
* Don't forget about the model-view matrix * Don't forget about the model-view matrix
*/ */
glPopMatrix(); glPopMatrix( );
/* /*
* Draw a silly text * Draw a silly text
*/ */
if( g_InGameMode == 0 ) if( g_InGameMode == 0 )
PrintText( 20, 20, "Hello there cruel world!" ); PrintText( 20, 20, "Hello there cruel world!" );
else 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 * And swap this context's buffers
*/ */
glutSwapBuffers(); glutSwapBuffers( );
} }
/* /*
@ -150,9 +150,9 @@ void SampleIdle( void )
if( g_LeaveGameMode == 1 ) if( g_LeaveGameMode == 1 )
{ {
glutLeaveGameMode(); glutLeaveGameMode( );
g_LeaveGameMode = 0; g_LeaveGameMode = 0;
g_InGameMode = 0; g_InGameMode = 0;
} }
} }
@ -181,7 +181,7 @@ void SampleReshape( int nWidth, int nHeight )
* Move back the camera a bit * Move back the camera a bit
*/ */
glMatrixMode( GL_MODELVIEW ); glMatrixMode( GL_MODELVIEW );
glLoadIdentity(); glLoadIdentity( );
glTranslatef( 0.0, 0.0, -40.0f ); glTranslatef( 0.0, 0.0, -40.0f );
/* /*
@ -209,7 +209,8 @@ void SampleReshape( int nWidth, int nHeight )
*/ */
void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY ) void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
{ {
printf( "SampleKeyboard(): keypress '%c' at (%i,%i)\n", cChar, nMouseX, nMouseY ); printf( "SampleKeyboard(): keypress '%c' at (%i,%i)\n",
cChar, nMouseX, nMouseY );
} }
/* /*
@ -218,7 +219,7 @@ void SampleKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
void SampleGameModeKeyboard( unsigned char cChar, int nMouseX, int nMouseY ) void SampleGameModeKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
{ {
if( cChar == 27 ) if( cChar == 27 )
g_LeaveGameMode = 1; g_LeaveGameMode = 1;
} }
@ -227,7 +228,8 @@ void SampleGameModeKeyboard( unsigned char cChar, int nMouseX, int nMouseY )
*/ */
void SampleSpecial( int nSpecial, int nMouseX, int nMouseY ) void SampleSpecial( int nSpecial, int nMouseX, int nMouseY )
{ {
printf( "SampleSpecial(): special keypress %i at (%i,%i)\n", nSpecial, nMouseX, nMouseY ); printf( "SampleSpecial(): special keypress %i at (%i,%i)\n",
nSpecial, nMouseX, nMouseY );
} }
/* /*
@ -307,8 +309,8 @@ int main( int argc, char** argv )
glutAttachMenu( GLUT_LEFT_BUTTON ); glutAttachMenu( GLUT_LEFT_BUTTON );
printf( "current window is %ix%i+%i+%i", printf( "current window is %ix%i+%i+%i",
glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y ), glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y ),
glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT ) glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT )
); );
/* /*
@ -321,7 +323,7 @@ int main( int argc, char** argv )
/* /*
* This is never reached in FreeGLUT. Is that good? * This is never reached in FreeGLUT. Is that good?
*/ */
return( EXIT_SUCCESS ); return EXIT_SUCCESS;
} }
/*** END OF FILE ***/ /*** END OF FILE ***/