X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Frubik.c;h=7d43bd856a1fe61d08ed1b8b097442974bc4dd58;hp=20ced9733cab4ca1d516fdee602e08f7e32cade0;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869 diff --git a/hacks/glx/rubik.c b/hacks/glx/rubik.c index 20ced973..7d43bd85 100644 --- a/hacks/glx/rubik.c +++ b/hacks/glx/rubik.c @@ -109,8 +109,11 @@ static const char sccsid[] = "@(#)rubik.c 5.01 2001/03/01 xlockmore"; "*count: -30 \n" \ "*showFPS: False \n" \ "*cycles: 20 \n" \ - "*size: -6 \n" + "*size: -6 \n" \ + "*suppressRotationAnimation: True\n" \ + # define refresh_rubik 0 +# define release_rubik 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -161,7 +164,7 @@ ENTRYPOINT ModeSpecOpt rubik_opts = #ifdef USE_MODULES ModStruct rubik_description = -{"rubik", "init_rubik", "draw_rubik", "release_rubik", +{"rubik", "init_rubik", "draw_rubik", (char *) NULL, "draw_rubik", "change_rubik", (char *) NULL, &rubik_opts, 10000, -30, 5, -6, 64, 1.0, "", "Shows an auto-solving Rubik's Cube", 0, NULL}; @@ -471,6 +474,7 @@ faceSizes(rubikstruct * rp, int face, int * sizeOfRow, int * sizeOfColumn) *sizeOfRow = MAXSIZEX; *sizeOfColumn = MAXSIZEY; break; + default: abort(); } } @@ -1624,7 +1628,7 @@ moveRubik(rubikstruct * rp, int face, int direction, int position) } #ifdef DEBUG -void +static void printCube(rubikstruct * rp) { int face, position, sizeOfRow, sizeOfColumn; @@ -1816,7 +1820,6 @@ reshape_rubik(ModeInfo * mi, int width, int height) glLoadIdentity(); glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0); glMatrixMode(GL_MODELVIEW); - } ENTRYPOINT Bool @@ -1824,37 +1827,13 @@ rubik_handle_event (ModeInfo *mi, XEvent *event) { rubikstruct *rp = &rubik[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) + if (gltrackball_event_handler (event, rp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &rp->button_down_p)) + return True; + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) { - rp->button_down_p = True; - gltrackball_start (rp->trackball, - event->xbutton.x, event->xbutton.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } - else if (event->xany.type == ButtonRelease && - event->xbutton.button == Button1) - { - rp->button_down_p = False; - return True; - } - else if (event->xany.type == ButtonPress && - (event->xbutton.button == Button4 || - event->xbutton.button == Button5 || - event->xbutton.button == Button6 || - event->xbutton.button == Button7)) - { - gltrackball_mousewheel (rp->trackball, event->xbutton.button, 10, - !!event->xbutton.state); - return True; - } - else if (event->xany.type == MotionNotify && - rp->button_down_p) - { - gltrackball_track (rp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); + rp->done = 1; return True; } @@ -1891,8 +1870,9 @@ pinit(ModeInfo * mi) } static void -free_rubik(rubikstruct *rp) +free_rubik(ModeInfo *mi) { + rubikstruct *rp = &rubik[MI_SCREEN(mi)]; int i; for (i = 0; i < MAXFACES; i++) @@ -1911,46 +1891,25 @@ free_rubik(rubikstruct *rp) } } -ENTRYPOINT void -release_rubik(ModeInfo * mi) -{ - if (rubik != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - rubikstruct *rp = &rubik[screen]; - - free_rubik(rp); - } - (void) free((void *) rubik); - rubik = (rubikstruct *) NULL; - } - FreeAllGL(mi); -} - ENTRYPOINT void init_rubik(ModeInfo * mi) { rubikstruct *rp; - if (rubik == NULL) { - if ((rubik = (rubikstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (rubikstruct))) == NULL) - return; - } + MI_INIT (mi, rubik, free_rubik); rp = &rubik[MI_SCREEN(mi)]; rp->step = NRAND(90); rp->PX = ((float) LRAND() / (float) MAXRAND) * 2.0 - 1.0; rp->PY = ((float) LRAND() / (float) MAXRAND) * 2.0 - 1.0; - rp->trackball = gltrackball_init (); + rp->trackball = gltrackball_init (True); if ((rp->glx_context = init_GL(mi)) != NULL) { reshape_rubik(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); glDrawBuffer(GL_BACK); if (!pinit(mi)) { - free_rubik(rp); + free_rubik(mi); if (MI_IS_VERBOSE(mi)) { (void) fprintf(stderr, "Could not allocate memory for rubik\n"); @@ -2031,17 +1990,26 @@ draw_rubik(ModeInfo * mi) glScalef(Scale4Iconic * rp->WindH / rp->WindW, Scale4Iconic, Scale4Iconic); } - /* Do it twice because we don't track the device's orientation. */ - glRotatef( current_device_rotation(), 0, 0, 1); +# 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.8; + glScalef (h, h, h); + } + } +# endif + gltrackball_rotate (rp->trackball); - glRotatef(-current_device_rotation(), 0, 0, 1); glRotatef(rp->step * 100, 1, 0, 0); glRotatef(rp->step * 95, 0, 1, 0); glRotatef(rp->step * 90, 0, 0, 1); if (!draw_cube(mi)) { - release_rubik(mi); + MI_ABORT(mi); return; } if (MI_IS_FPS(mi)) do_fps (mi); @@ -2074,7 +2042,7 @@ draw_rubik(ModeInfo * mi) rp->rotatestep += rp->anglestep; if (rp->rotatestep > rp->degreeTurn) { if (!evalmovement(mi, rp->movement)) { - free_rubik(rp); + free_rubik(mi); if (MI_IS_VERBOSE(mi)) { (void) fprintf(stderr, "Could not allocate memory for rubik\n"); @@ -2090,7 +2058,7 @@ draw_rubik(ModeInfo * mi) if (rp->done) { if (++rp->rotatestep > DELAY_AFTER_SOLVING) if (!shuffle(mi)) { - free_rubik(rp); + free_rubik(mi); if (MI_IS_VERBOSE(mi)) { (void) fprintf(stderr, "Could not allocate memory for rubik\n"); @@ -2118,7 +2086,7 @@ draw_rubik(ModeInfo * mi) rp->rotatestep += rp->anglestep; if (rp->rotatestep > rp->degreeTurn) { if (!evalmovement(mi, rp->movement)) { - free_rubik(rp); + free_rubik(mi); if (MI_IS_VERBOSE(mi)) { (void) fprintf(stderr, "Could not allocate memory for rubik\n"); @@ -2152,7 +2120,7 @@ change_rubik(ModeInfo * mi) if (!rp->glx_context) return; if (!pinit(mi)) { - free_rubik(rp); + free_rubik(mi); if (MI_IS_VERBOSE(mi)) { (void) fprintf(stderr, "Could not allocate memory for rubik\n");