diff --git a/.gitattributes b/.gitattributes index ec6daf5..9efff03 100644 --- a/.gitattributes +++ b/.gitattributes @@ -53,8 +53,6 @@ freeglut/freeglut/progs/demos/One/Makefile.am svn_keywords=Author+Date+Id+Revisi freeglut/freeglut/progs/demos/One/one.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/One/one.dsp svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/demos.dsw svn_keywords=Author+Date+Id+Revision -freeglut/freeglut/progs/demos/offscreen/Makefile.am svn_keywords=Author+Date+Id+Revision -freeglut/freeglut/progs/demos/offscreen/offscreen.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/shapes/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/shapes/shapes.c svn_keywords=Author+Date+Id+Revision freeglut/freeglut/progs/demos/shapes/shapes.dsp svn_keywords=Author+Date+Id+Revision diff --git a/freeglut/freeglut/progs/demos/One/one.c b/freeglut/freeglut/progs/demos/One/one.c index 627630e..93e5144 100644 --- a/freeglut/freeglut/progs/demos/One/one.c +++ b/freeglut/freeglut/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 @@ -31,16 +31,16 @@ void PrintText( int nX, int nY, char* pszText ) { int lines; char *p; - + /* * Prepare the OpenGL state */ glDisable( GL_LIGHTING ); - glDisable( GL_DEPTH_TEST ); + glDisable( GL_DEPTH_TEST ); glMatrixMode( GL_PROJECTION ); glPushMatrix(); glLoadIdentity(); - + /* * Have an orthogonal projection matrix set */ @@ -55,12 +55,12 @@ 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++ ) { @@ -69,26 +69,26 @@ void PrintText( int nX, int nY, char* pszText ) 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 @@ -132,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 @@ -156,7 +156,7 @@ void SampleIdle( void ) g_LeaveGameMode = 0; g_InGameMode = 0; } -} +} /* * The reshape function @@ -242,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 ); } /* @@ -262,7 +262,7 @@ int main( int argc, char** argv ) 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 ); @@ -300,7 +300,7 @@ int main( int argc, char** argv ) glutGameModeString( "640x480:16@72" ); glutGameModeString( "1024x768" ); glutGameModeString( ":32@120" ); - glutGameModeString( "Toudi glupcze, Danwin bedzie moj!" ); + glutGameModeString( "Toudi glupcze, Danwin bedzie moj!" ); glutGameModeString( "640x480:16@72" ); glutEnterGameMode(); @@ -313,7 +313,7 @@ int main( int argc, char** argv ) printf( "current window is %ix%i+%i+%i", glutGet( GLUT_WINDOW_X ), glutGet( GLUT_WINDOW_Y ), glutGet( GLUT_WINDOW_WIDTH ), glutGet( GLUT_WINDOW_HEIGHT ) - ); + ); /* * Enter the main FreeGLUT processing loop diff --git a/freeglut/freeglut/progs/demos/offscreen/Makefile.am b/freeglut/freeglut/progs/demos/offscreen/Makefile.am deleted file mode 100644 index 9354c1c..0000000 --- a/freeglut/freeglut/progs/demos/offscreen/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = unmanaged.c unmanaged.dsp -noinst_PROGRAMS = offscreen -offscreen_SOURCES = offscreen.c -offscreen_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la -offscreen_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff --git a/freeglut/freeglut/progs/demos/offscreen/offscreen.c b/freeglut/freeglut/progs/demos/offscreen/offscreen.c deleted file mode 100644 index f94f59f..0000000 --- a/freeglut/freeglut/progs/demos/offscreen/offscreen.c +++ /dev/null @@ -1,172 +0,0 @@ -/* - * freeglut offscreen rendering demo. - * - * Usage: - * - * offscreen [standard GLUT options] [filename] - * - * The filename is used to say where to write a PNM image file - * that is the sole way to verify that this program is doing what - * it should (i.e., rendering offscreen). - * - * You can view the PNM file in image viewers and editors such as - * the GIMP. (Everyone doing any kind of graphics has at least one - * multi-format-reading image manipulation program, right?) - * - * If no filename is specified, the chosen filename is "offscreen.pnm". - * - * Some suggested uses for GLUT_OFFSCREEN: - * - * * Implementation of a graphics language that writes bitmapped image files. - * * Capture GLUT bitmapped fonts to a texture at runtime to make scalable - * bitmapped fonts. - * * Using OpenGL to create special-effect textures at run-time. - * * Making stencils. - * * Getting the depth-buffer for a height-field. - * * Using OpenGL to create a poster texture (e.g., for pasting onto a a - * video screen in a virtual world). - * * Using OpenGL to prescale an image to a power-of-2 dimension (including - * OpenGL antialiasing). There's no reason that you couldn't do this - * yourself, but OpenGL can do it for you, so why not? - * * Rendering to a bitmap larger than the display has been suggested - * as well. This is a cheap way to produce arbitrarily high resolution - * images for printing. - * - * In every case, there are at least cases where you would want to do this - * without actually rendering to a visible window. - * - */ -#include -#include - -#define OFFSCREEN_W 500 -#define OFFSCREEN_H 250 - - -int offscreen_id; -int onscreen_id; -const char *save_file_name = "offscreen.pnm"; - - -void cb_onscreen_display( void ) -{ - glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT ); - glColor3d( 1.0, 0.0, 0.0 ); - glBegin( GL_LINE_LOOP ); - glVertex2d( 0.0, 0.0 ); - glVertex2d( 0.5, 0.0 ); - glVertex2d( 0.5, 0.5 ); - glVertex2d( 0.0, 0.5 ); - glVertex2d( 0.0, 0.0 ); - glEnd( ); - glColor3d( 1.0, 1.0, 1.0 ); - glRasterPos2d( -1.0, 0.8 ); - glutBitmapString( - GLUT_BITMAP_TIMES_ROMAN_24, "Press `s' or `S' to Send to" - ); - glRasterPos2d( -.8, 0.6 ); - glutBitmapString( - GLUT_BITMAP_TIMES_ROMAN_24, "'offscreen.pnm'" - ); - glRasterPos2d( -1.0, 0.3 ); - glutBitmapString( - GLUT_BITMAP_TIMES_ROMAN_24, "Press `q', `Q', or Esc to quit." - ); - - glutSwapBuffers( ); -} - -void write_raw_pnm( char *fname, char *pixels, int w, int h) -{ - FILE *f; - - printf( "Trying to create: %s\n", fname ); - f = fopen( fname, "wb" ); - if( !f ) - printf( "Ouch! Cannot create file.\n" ); - else - { - int row; - - printf( "Opened file.\n" ); - fprintf( f, "P6\n" ); - fprintf( f, "# CREATOR: offscreen freeglut demo\n" ); - fprintf( f, "%d %d\n", w, h ); - fprintf( f, "255\n" ); - - /* - * Write the rows in reverse order because OpenGL's 0th row - * is at the bottom. - */ - for( row = h; row; --row ) - fwrite( pixels + ((row - 1)*w*3), 1, 3 * w, f ); - - fclose( f ); - } -} - - -void cb_offscreen_display( void ) -{ - static char pixels [OFFSCREEN_W * OFFSCREEN_H * 3]; - int i; - - cb_onscreen_display( ); - glColor3d( 0.0, 1.0, 0.0 ); - glBegin( GL_LINES ); - for( i = 0; i < 100; ++i) - { - glVertex2d( +1 - (i/50.0), +1 ); - glVertex2d( -1 + (i/50.0), -1 ); - } - glEnd( ); - glFinish( ); - - glPixelStorei( GL_PACK_ALIGNMENT, 1 ); - glReadPixels( - 0, 0, OFFSCREEN_W, OFFSCREEN_H, - GL_RGB, GL_UNSIGNED_BYTE, (GLvoid *)pixels - ); - write_raw_pnm( save_file_name, pixels, OFFSCREEN_W, OFFSCREEN_H ); -} - - -void cb_onscreen_keyboard( unsigned char key, int x, int y ) -{ - switch( key ) - { - case 's': - case 'S': - glutSetWindow( offscreen_id ); - glutPostRedisplay( ); - break; - - case '\x1b': - case 'q': - case 'Q': - exit( 0 ); - break; - - default: - break; - } -} - -int main( int argc, char **argv ) -{ - glutInit( &argc, argv ); - if( argv[ 1 ] ) - save_file_name = argv[ 1 ]; - - glutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE ); - onscreen_id = glutCreateWindow( "Offscreen demo" ); - glutDisplayFunc( cb_onscreen_display ); - glutKeyboardFunc( cb_onscreen_keyboard ); - - glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_OFFSCREEN ); - glutInitWindowSize( OFFSCREEN_W, OFFSCREEN_H ); - offscreen_id = glutCreateWindow( "" ); - glutDisplayFunc( cb_offscreen_display ); - - glutMainLoop( ); -}