X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fskytentacles.c;h=c140fc37cc5c0a35f0e2768b80f9f37f5af3749d;hb=b81f521c5ad7022ac12db18ca8fcdd9fb063831e;hp=7fa84b4c4d0c74f49b609c178d573173362628c4;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/glx/skytentacles.c b/hacks/glx/skytentacles.c
index 7fa84b4c..c140fc37 100644
--- a/hacks/glx/skytentacles.c
+++ b/hacks/glx/skytentacles.c
@@ -1,4 +1,4 @@
-/* Sky Tentacles, Copyright (c) 2008 Jamie Zawinski <jwz@jwz.org>
+/* Sky Tentacles, Copyright (c) 2008-2012 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -850,8 +850,6 @@ init_tentacles (ModeInfo *mi)
       fprintf(stderr, "%s: out of memory\n", progname);
       exit(1);
     }
-
-    tc = &tcs[MI_SCREEN(mi)];
   }
 
   tc = &tcs[MI_SCREEN(mi)];
@@ -904,6 +902,10 @@ init_tentacles (ModeInfo *mi)
   for (i = 0; i < MI_COUNT(mi); i++)
     move_tentacle (make_tentacle (mi, i, MI_COUNT(mi)));
 
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+  cel_p = 0;
+# endif
+
   if (wire) texture_p = cel_p = False;
   if (cel_p) texture_p = False;
 
@@ -964,7 +966,7 @@ init_tentacles (ModeInfo *mi)
     glEnable (GL_BLEND);
 
     /* Dark gray instead of black, so the outlines show up */
-    glClearColor (0.08, 0.08, 0.08, 1.0);
+    glClearColor (0.13, 0.13, 0.13, 1.0);
   }
 
   compute_unit_torus (mi, 0.5, 
@@ -995,7 +997,7 @@ draw_tentacles (ModeInfo *mi)
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
   glPushMatrix ();
-
+  glRotatef(current_device_rotation(), 0, 0, 1);
 
 # if 1
   glScalef (3, 3, 3);