-/* $Id: drawpix.c,v 1.6 2002/01/26 17:49:30 brianp Exp $ */
/*
* glDrawPixels demo/test/benchmark
* Brian Paul September 25, 1997 This file is in the public domain.
*/
-/*
- * $Log: drawpix.c,v $
- * Revision 1.6 2002/01/26 17:49:30 brianp
- * added fog and raster Z position controls
- *
- * Revision 1.5 2000/12/24 22:53:54 pesco
- * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
- * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
- * Essentially the same.
- * Program files updated to include "readtex.c", not "../util/readtex.c".
- * * demos/reflect.c: Likewise for "showbuffer.c".
- *
- *
- * * Makefile.am (EXTRA_DIST): Added top-level regular files.
- *
- * * include/GL/Makefile.am (INC_X11): Added glxext.h.
- *
- *
- * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
- * Mesa GGI headers in dist even if HAVE_GGI is not given.
- *
- * * configure.in: Look for GLUT and demo source dirs in $srcdir.
- *
- * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
- * More source list updates in various Makefile.am's.
- *
- * * Makefile.am (dist-hook): Remove CVS directory from distribution.
- * (DIST_SUBDIRS): List all possible subdirs here.
- * (SUBDIRS): Only list subdirs selected for build again.
- * The above two applied to all subdir Makefile.am's also.
- *
- * Revision 1.4 2000/09/08 21:45:21 brianp
- * added dither key option
- *
- * Revision 1.3 1999/10/28 18:23:29 brianp
- * minor changes to Usage() function
- *
- * Revision 1.2 1999/10/21 22:13:58 brianp
- * added f key to toggle front/back drawing
- *
- * Revision 1.1.1.1 1999/08/19 00:55:40 jtg
- * Imported sources
- *
- * Revision 3.3 1999/03/28 18:18:33 brianp
- * minor clean-up
- *
- * Revision 3.2 1998/11/05 04:34:04 brianp
- * moved image files to ../images/ directory
- *
- * Revision 3.1 1998/02/22 16:43:17 brianp
- * added a few casts to silence compiler warnings
- *
- * Revision 3.0 1998/02/14 18:42:29 brianp
- * initial rev
- *
- */
-
-
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
+#include <string.h>
#include <GL/glut.h>
-#include "readtex.c"
+#include "readtex.h"
#define IMAGE_FILE "../images/girl.rgb"
}
-static void Init( GLboolean ciMode )
+static void Init( GLboolean ciMode, const char *filename )
{
static const GLfloat fogColor[4] = {0, 1, 0, 0};
printf("GL_VERSION = %s\n", (char *) glGetString(GL_VERSION));
printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
- Image = LoadRGBImage( IMAGE_FILE, &ImgWidth, &ImgHeight, &ImgFormat );
+ Image = LoadRGBImage( filename, &ImgWidth, &ImgHeight, &ImgFormat );
if (!Image) {
- printf("Couldn't read %s\n", IMAGE_FILE);
+ printf("Couldn't read %s\n", filename);
exit(0);
}
if (ciMode) {
/* Convert RGB image to grayscale */
- GLubyte *indexImage = malloc( ImgWidth * ImgHeight );
+ GLubyte *indexImage = (GLubyte *) malloc( ImgWidth * ImgHeight );
GLint i;
for (i=0; i<ImgWidth*ImgHeight; i++) {
int gray = Image[i*3] + Image[i*3+1] + Image[i*3+2];
int main( int argc, char *argv[] )
{
GLboolean ciMode = GL_FALSE;
+ const char *filename = IMAGE_FILE;
+ int i = 1;
- if (argc > 1 && strcmp(argv[1], "-ci")==0) {
+ if (argc > i && strcmp(argv[i], "-ci")==0) {
ciMode = GL_TRUE;
+ i++;
+ }
+ if (argc > i) {
+ filename = argv[i];
}
glutInit( &argc, argv );
glutCreateWindow(argv[0]);
- Init(ciMode);
+ Init(ciMode, filename);
Usage();
glutReshapeFunc( Reshape );