diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-27 17:04:43 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-27 17:04:43 +0000 |
| commit | 02e8a035934a7400d0194687061107bdaa1bba77 (patch) | |
| tree | ab0b06c533e6f6fb2d409995f5b01423f29db105 /progs/demos/gloss.c | |
| parent | 9e7f9b3e99cf4963e3bc684b5f9fc095be059a82 (diff) | |
fixed compiler warnings
Diffstat (limited to 'progs/demos/gloss.c')
| -rw-r--r-- | progs/demos/gloss.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/progs/demos/gloss.c b/progs/demos/gloss.c index 1c59484f54..ab0e25800b 100644 --- a/progs/demos/gloss.c +++ b/progs/demos/gloss.c @@ -1,4 +1,4 @@ -/* $Id: gloss.c,v 1.3 1999/10/26 17:08:31 brianp Exp $ */ +/* $Id: gloss.c,v 1.4 2000/06/27 17:04:43 brianp Exp $ */ /* * Specular reflection demo. The specular highlight is modulated by @@ -245,7 +245,7 @@ static void Init( int argc, char *argv[] ) glMatrixMode(GL_TEXTURE); glLoadIdentity(); - glScalef(8.0, 4.0, 2.0); + /*glScalef(8.0, 4.0, 2.0);*/ glMatrixMode(GL_MODELVIEW); /* cylinder */ @@ -322,8 +322,14 @@ static void Init( int argc, char *argv[] ) glBindTexture(GL_TEXTURE_2D, SpecularTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); +#if 1 glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); +#else + glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); + glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); + glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_NV); +#endif if (!LoadRGBMipmaps(SPECULAR_TEXTURE_FILE, GL_RGB)) { printf("Error: couldn't load texture image file %s\n", SPECULAR_TEXTURE_FILE); exit(1); |