X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fjigglypuff.c;h=63b832947e63328a2143ff1ddf4857de0f2602f7;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hp=2c1ed3309928cbfaa937490b790e04495187e38f;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver

diff --git a/hacks/glx/jigglypuff.c b/hacks/glx/jigglypuff.c
index 2c1ed330..63b83294 100644
--- a/hacks/glx/jigglypuff.c
+++ b/hacks/glx/jigglypuff.c
@@ -434,11 +434,10 @@ static vertex *vertex_split(hedge *h, vector v)
     hedge *h2, *hn1, *hn2;
     vertex *vtxn;
     edge *en;
-    face *f1, *f2;
+    face *f1;
 
     f1 = h->f;
     h2 = partner(h);
-    f2 = h2->f;
     
     vtxn = vertex_new(f1->s, v);
     hn1 = hedge_new(h, vtxn);
@@ -785,7 +784,6 @@ static void setup_opengl(ModeInfo *mi, jigglystruct *js)
     const GLfloat scolor[4]= {0.9f, 0.9f, 0.9f, 0.5f};
 
     glDrawBuffer(GL_BACK);
-    glClearColor(0, 0, 0, 0);
     glShadeModel(GL_SMOOTH);
     glEnable(GL_DEPTH_TEST);
 
@@ -840,10 +838,12 @@ static int parse_color(jigglystruct *js)
 	js->color_style = COLOR_STYLE_FLOWERBOX;
 	return 1;
     }
+# ifndef HAVE_JWZGLES  /* SPHERE_MAP unimplemented */
     else if(!strcmp(color, "chrome")) {
 	js->color_style = COLOR_STYLE_CHROME;
 	return 1;
     }
+# endif
     else if(!strcmp(color, "cycle")) {
 	js->color_style = COLOR_STYLE_CYCLE;
 	js->jiggly_color[0] = ((float)random()) / REAL_RAND_MAX * 0.7 + 0.3;
@@ -872,8 +872,14 @@ static int parse_color(jigglystruct *js)
 
 static void randomize_parameters(jigglystruct *js) {
     do_tetrahedron = random() & 1;
+# ifndef HAVE_JWZGLES
     js->do_wireframe = !(random() & 3);
+# endif
     js->color_style = random() % 5;
+# ifdef HAVE_JWZGLES  /* SPHERE_MAP unimplemented */
+    while (js->color_style == COLOR_STYLE_CHROME)
+      js->color_style = random() % 5;;
+# endif
     if(js->color_style == COLOR_STYLE_NORMAL
 	|| js->color_style == COLOR_STYLE_CYCLE) {
 	js->jiggly_color[0] = ((float)random()) / REAL_RAND_MAX * 0.5 + 0.5;
@@ -984,7 +990,11 @@ ENTRYPOINT void draw_jigglypuff(ModeInfo *mi)
 	    js->axis -= 2*M_PI;
 	}
     }
+
+    /* Do it twice because we don't track the device's orientation. */
+    glRotatef( current_device_rotation(), 0, 0, 1);
     gltrackball_rotate(js->trackball);
+    glRotatef(-current_device_rotation(), 0, 0, 1);
 
     if(js->color_style == COLOR_STYLE_CYCLE) {
 	int i;
@@ -1024,6 +1034,9 @@ ENTRYPOINT void init_jigglypuff(ModeInfo *mi)
     js = &jss[MI_SCREEN(mi)];
 
     js->do_wireframe = MI_IS_WIREFRAME(mi);
+# ifdef HAVE_JWZGLES
+    js->do_wireframe = 0; /* GL_LINE unimplemented */
+# endif
 
     js->shininess = shininess;