X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fflipscreen3d.c;h=7217de969353a13599215bb93abf148199a81392;hp=6d5844a99fe5753227dfcbb5081440aa8d5414ec;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823 diff --git a/hacks/glx/flipscreen3d.c b/hacks/glx/flipscreen3d.c index 6d5844a9..7217de96 100644 --- a/hacks/glx/flipscreen3d.c +++ b/hacks/glx/flipscreen3d.c @@ -322,12 +322,21 @@ static void drawgrid(void) static void display(Screenflip *c, int wire) { int frozen; + 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)) + { + GLfloat s = c->winw / (GLfloat) c->winh; + glScalef (s, 1/s, 1); + } + if (inposition(c)) { frozen = 0; glTranslatef(5 * sin(c->theta), 5 * sin(c->rho), 10 * cos(c->gamma) - 10); @@ -340,7 +349,9 @@ static void display(Screenflip *c, int wire) if (random() % 2) c->dgamma = 1/60 - (float)(random() % 100)/3000; } + glRotatef(-rot, 0, 0, 1); gltrackball_rotate (c->trackball); + 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) {