commit f7688171c48980b23c351a2391513c8b825ae991
author Brian Paul <brian.paul@tungstengraphics.com> Tue Jun 27 17:12:10 2000 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Tue Jun 27 17:12:10 2000 +0000
tree e91cab06d2572365aa5d36ab01b8c3b3f2a88133
parent d88f8e9cacac544c5524731f54090d5c3a6076e4

minor tweaks

progs/demos/fire.c

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);