X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fskytentacles.c;h=c140fc37cc5c0a35f0e2768b80f9f37f5af3749d;hb=b81f521c5ad7022ac12db18ca8fcdd9fb063831e;hp=a676951d0ac195703bda0e084cb7354f6e4d3522;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver diff --git a/hacks/glx/skytentacles.c b/hacks/glx/skytentacles.c index a676951d..c140fc37 100644 --- a/hacks/glx/skytentacles.c +++ b/hacks/glx/skytentacles.c @@ -1,4 +1,4 @@ -/* Sky Tentacles, Copyright (c) 2008 Jamie Zawinski +/* Sky Tentacles, Copyright (c) 2008-2012 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -902,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; @@ -993,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);