diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-27 17:12:10 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-06-27 17:12:10 +0000 |
| commit | f7688171c48980b23c351a2391513c8b825ae991 (patch) | |
| tree | e91cab06d2572365aa5d36ab01b8c3b3f2a88133 /progs | |
| parent | d88f8e9cacac544c5524731f54090d5c3a6076e4 (diff) | |
minor tweaks
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/demos/fire.c | 10 | ||||
| -rw-r--r-- | progs/demos/paltex.c | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/progs/demos/fire.c b/progs/demos/fire.c index 6bf39a57b7..f4c45219d0 100644 --- a/progs/demos/fire.c +++ b/progs/demos/fire.c @@ -597,11 +597,12 @@ inittextures(void) glGenTextures(1, &treeid); glBindTexture(GL_TEXTURE_2D, treeid); + if (1) { int w, h; GLenum format; int x, y; - GLubyte *image = LoadRGBImage("../images/tree2.rgb", &w, &h, &format); + GLubyte *image = LoadRGBImage("../images/tree3.rgb", &w, &h, &format); if (!image) { fprintf(stderr, "Error reading a texture.\n"); @@ -626,7 +627,12 @@ inittextures(void) exit(-1); } } - + else { + if (!LoadRGBMipmaps("../images/tree2.rgba", GL_RGBA)) { + fprintf(stderr, "Error reading a texture.\n"); + exit(-1); + } + } glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); diff --git a/progs/demos/paltex.c b/progs/demos/paltex.c index 6ffac28c1e..aaafc6fabf 100644 --- a/progs/demos/paltex.c +++ b/progs/demos/paltex.c @@ -1,4 +1,4 @@ -/* $Id: paltex.c,v 1.3 2000/06/27 17:04:43 brianp Exp $ */ +/* $Id: paltex.c,v 1.4 2000/06/27 17:12:10 brianp Exp $ */ /* * Paletted texture demo. Written by Brian Paul. @@ -82,7 +82,6 @@ static void Init( void ) " " }; GLubyte table[256][4]; - int i; if (!glutExtensionSupported("GL_EXT_paletted_texture")) { printf("Sorry, GL_EXT_paletted_texture not supported\n"); |