X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fflipscreen3d.c;h=8ae26becc842eb7c688f646c84aa3e4bca0f7c73;hp=4d6ff301d7292ca380afcebc4f18ef6495b5e367;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hpb=88cfe534a698a0562e81345957a50714af1453bc diff --git a/hacks/glx/flipscreen3d.c b/hacks/glx/flipscreen3d.c index 4d6ff301..8ae26bec 100644 --- a/hacks/glx/flipscreen3d.c +++ b/hacks/glx/flipscreen3d.c @@ -18,7 +18,8 @@ #define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ - "*useSHM: True \n" + "*useSHM: True \n" \ + "*suppressRotationAnimation: True\n" \ # define refresh_screenflip 0 # include "xlockmore.h" /* from the xscreensaver distribution */ @@ -304,13 +305,14 @@ static void drawgrid(void) static void display(Screenflip *c, int wire) { int frozen; - GLfloat rot = current_device_rotation(); +/* GLfloat rot = current_device_rotation();*/ glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); glLoadIdentity(); gluLookAt(viewer[0], viewer[1], viewer[2], 0.0, 0.0, 0.0, 0.0, 1.0, 0.0); glPushMatrix(); +/* glRotatef(rot, 0, 0, 1); if ((rot > 45 && rot < 135) || (rot < -45 && rot > -135)) @@ -318,6 +320,7 @@ static void display(Screenflip *c, int wire) GLfloat s = c->winw / (GLfloat) c->winh; glScalef (s, 1/s, 1); } +*/ if (inposition(c)) { frozen = 0; @@ -331,9 +334,9 @@ static void display(Screenflip *c, int wire) if (random() % 2) c->dgamma = 1/60 - (float)(random() % 100)/3000; } - glRotatef(-rot, 0, 0, 1); +/* glRotatef(-rot, 0, 0, 1);*/ gltrackball_rotate (c->trackball); - glRotatef(rot, 0, 0, 1); +/* glRotatef(rot, 0, 0, 1);*/ if (rotate) glRotatef(c->rot, c->rx, c->ry, c->rz); /* update variables with each frame */ if(!c->button_down_p && !c->fadetime) {