X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Flavalite.c;h=f80847f9ac35ea415e8e8a932f3d1c7461cad9c9;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hp=1efe40cf408dc96ba1662135bb90d5ebb104c062;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;p=xscreensaver

diff --git a/hacks/glx/lavalite.c b/hacks/glx/lavalite.c
index 1efe40cf..f80847f9 100644
--- a/hacks/glx/lavalite.c
+++ b/hacks/glx/lavalite.c
@@ -611,7 +611,6 @@ generate_bottle (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   int faces = resolution * 1.5;
   Bool smooth = do_smooth;
-  Bool have_texture = False;
 
   const lamp_geometry *top_slice = bp->model;
   const char *current_texture = 0;
@@ -660,11 +659,10 @@ generate_bottle (ModeInfo *mi)
           break;
         }
 
-      have_texture = False;
       if (!wire && texture && texture != current_texture)
         {
           current_texture = texture;
-          have_texture = load_texture (mi, current_texture);
+          load_texture (mi, current_texture);
         }
         
       /* Color the discs darker than the tube walls. */
@@ -736,7 +734,7 @@ generate_bottle (ModeInfo *mi)
     }
 
 
-  have_texture = !wire && load_texture (mi, table_tex);
+  if (!wire) load_texture (mi, table_tex);
   glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, table_color);
   bp->bottle_poly_count += draw_table (top_slice->elevation, wire);
 
@@ -1311,8 +1309,6 @@ init_lavalite (ModeInfo *mi)
       fprintf(stderr, "%s: out of memory\n", progname);
       exit(1);
     }
-
-    bp = &bps[MI_SCREEN(mi)];
   }
 
   bp = &bps[MI_SCREEN(mi)];
@@ -1413,7 +1409,7 @@ init_lavalite (ModeInfo *mi)
     gltrackball_track (bp->trackball, 50,  5, 100, 100);
 
     /* Oh, but if it's the "Giant" model, tilt the scene away: make it
-       look like we're looking up at it instead of odwn at it! */
+       look like we're looking up at it instead of down at it! */
     if (bp->style == GIANT)
       gltrackball_track (bp->trackball, 50, -12, 100, 100);
     else if (bp->style == ROCKET)  /* same for rocket, but not as much */
@@ -1518,6 +1514,7 @@ draw_lavalite (ModeInfo *mi)
 #endif  /* 0 */
 
     glLoadIdentity();
+    glRotatef(current_device_rotation(), 0, 0, 1);
 
     gluLookAt ((cx - 0.5) * 8,		/* Position the camera */
                (cy - 0.5) * 8,
@@ -1527,7 +1524,6 @@ draw_lavalite (ModeInfo *mi)
 
     gltrackball_rotate (bp->trackball);	/* Apply mouse-based camera position */
 
-
     /* Place the lights relative to the object, before the object has
        been rotated or wandered within the scene. */
     glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);