X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=8c92ff7f073844886c58459ccb657752de1efc8c;hp=feb1a488233c2be68ecf5b40925db43589119329;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hpb=88cfe534a698a0562e81345957a50714af1453bc diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c index feb1a488..8c92ff7f 100644 --- a/hacks/glx/moebius.c +++ b/hacks/glx/moebius.c @@ -81,14 +81,15 @@ static const char sccsid[] = "@(#)moebius.c 5.01 2001/03/01 xlockmore"; # define MODE_moebius # define refresh_moebius 0 # define DEFAULTS "*delay: 20000 \n" \ - "*showFPS: False \n" + "*showFPS: False \n" \ + "*suppressRotationAnimation: True\n" \ # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ #endif /* !STANDALONE */ -#ifdef HAVE_COCOA +#ifdef HAVE_JWXYZ # include "jwxyz.h" #else # include @@ -730,6 +731,7 @@ draw_moebius (ModeInfo * mi) glPushMatrix(); + glTranslatef(0.0, 0.0, -10.0); gltrackball_rotate (mp->trackball); @@ -740,6 +742,18 @@ draw_moebius (ModeInfo * mi) glScalef(Scale4Iconic * mp->WindH / mp->WindW, Scale4Iconic, Scale4Iconic); } +# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */ + { + GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi); + int o = (int) current_device_rotation(); + if (o != 0 && o != 180 && o != -180) { + glScalef (1/h, h, 1); /* #### not quite right */ + h = 1.7; + glScalef (h, h, h); + } + } +# endif + { double x, y, z; get_rotation (mp->rot, &x, &y, &z, !mp->button_down_p);