summaryrefslogtreecommitdiff
path: root/progs/demos
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-11-10 23:16:22 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-11-10 23:16:22 +0000
commitb271ce8eda2fe3c349f03d7c7774f58672cf2cc4 (patch)
tree55f9f9c6171f1a1c53a0520c8b69563dfc7ecd73 /progs/demos
parent60909388ab136d849d99eab49e782a53772a618f (diff)
allow specifying image file on command line
Diffstat (limited to 'progs/demos')
-rw-r--r--progs/demos/drawpix.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/progs/demos/drawpix.c b/progs/demos/drawpix.c
index e25cb3374a..faa98ee2fb 100644
--- a/progs/demos/drawpix.c
+++ b/progs/demos/drawpix.c
@@ -241,16 +241,16 @@ static void SpecialKey( int key, int x, int y )
}
-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);
}
@@ -320,9 +320,15 @@ static void Usage(void)
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 );
@@ -336,7 +342,7 @@ int main( int argc, char *argv[] )
glutCreateWindow(argv[0]);
- Init(ciMode);
+ Init(ciMode, filename);
Usage();
glutReshapeFunc( Reshape );