minor tweaks
diff --git a/progs/demos/fire.c b/progs/demos/fire.c
index 6bf39a5..f4c4521 100644
--- a/progs/demos/fire.c
+++ b/progs/demos/fire.c
@@ -597,11 +597,12 @@
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 @@
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 6ffac28..aaafc6f 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 @@
" "
};
GLubyte table[256][4];
- int i;
if (!glutExtensionSupported("GL_EXT_paletted_texture")) {
printf("Sorry, GL_EXT_paletted_texture not supported\n");