X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Frubik.c;h=7d43bd856a1fe61d08ed1b8b097442974bc4dd58;hp=fdc4313be1ed4d577cfe48e273dc6cb9f78a709d;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439 diff --git a/hacks/glx/rubik.c b/hacks/glx/rubik.c index fdc4313b..7d43bd85 100644 --- a/hacks/glx/rubik.c +++ b/hacks/glx/rubik.c @@ -105,19 +105,23 @@ static const char sccsid[] = "@(#)rubik.c 5.01 2001/03/01 xlockmore"; #ifdef STANDALONE # define MODE_rubik -# define DEFAULTS "*delay: 40000 \n" \ +# define DEFAULTS "*delay: 20000 \n" \ "*count: -30 \n" \ "*showFPS: False \n" \ - "*cycles: 5 \n" \ - "*size: -6 \n" + "*cycles: 20 \n" \ + "*size: -6 \n" \ + "*suppressRotationAnimation: True\n" \ + # define refresh_rubik 0 -# define rubik_handle_event 0 +# define release_rubik 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ # include "vis.h" #endif /* !STANDALONE */ +#include "gltrackball.h" + #ifdef MODE_rubik #define DEF_SIZEX "0" @@ -160,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}; @@ -372,6 +376,8 @@ typedef struct { GLfloat rotatestep; GLfloat PX, PY, VX, VY; GLXContext *glx_context; + Bool button_down_p; + trackball_state *trackball; } rubikstruct; static const float front_shininess[] = {60.0}; @@ -468,6 +474,7 @@ faceSizes(rubikstruct * rp, int face, int * sizeOfRow, int * sizeOfColumn) *sizeOfRow = MAXSIZEX; *sizeOfColumn = MAXSIZEY; break; + default: abort(); } } @@ -510,7 +517,7 @@ sizeRow(rubikstruct * rp, int face) } static Bool -draw_stickerless_cubit(rubikstruct *rp) +draw_stickerless_cubit(rubikstruct *rp, unsigned long *polysP) { glBegin(GL_QUADS); glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); @@ -520,31 +527,37 @@ draw_stickerless_cubit(rubikstruct *rp) glVertex3f(CUBEROUND, -CUBEROUND, CUBELEN); glVertex3f(CUBEROUND, CUBEROUND, CUBELEN); glVertex3f(-CUBEROUND, CUBEROUND, CUBELEN); + (*polysP)++; glNormal3f(0.00, 0.00, -1.00); glVertex3f(-CUBEROUND, CUBEROUND, -CUBELEN); glVertex3f(CUBEROUND, CUBEROUND, -CUBELEN); glVertex3f(CUBEROUND, -CUBEROUND, -CUBELEN); glVertex3f(-CUBEROUND, -CUBEROUND, -CUBELEN); + (*polysP)++; glNormal3f(-1.00, 0.00, 0.00); glVertex3f(-CUBELEN, -CUBEROUND, CUBEROUND); glVertex3f(-CUBELEN, CUBEROUND, CUBEROUND); glVertex3f(-CUBELEN, CUBEROUND, -CUBEROUND); glVertex3f(-CUBELEN, -CUBEROUND, -CUBEROUND); + (*polysP)++; glNormal3f(1.00, 0.00, 0.00); glVertex3f(CUBELEN, -CUBEROUND, -CUBEROUND); glVertex3f(CUBELEN, CUBEROUND, -CUBEROUND); glVertex3f(CUBELEN, CUBEROUND, CUBEROUND); glVertex3f(CUBELEN, -CUBEROUND, CUBEROUND); + (*polysP)++; glNormal3f(0.00, -1.00, 0.00); glVertex3f(CUBEROUND, -CUBELEN, -CUBEROUND); glVertex3f(CUBEROUND, -CUBELEN, CUBEROUND); glVertex3f(-CUBEROUND, -CUBELEN, CUBEROUND); glVertex3f(-CUBEROUND, -CUBELEN, -CUBEROUND); + (*polysP)++; glNormal3f(0.00, 1.00, 0.00); glVertex3f(-CUBEROUND, CUBELEN, -CUBEROUND); glVertex3f(-CUBEROUND, CUBELEN, CUBEROUND); glVertex3f(CUBEROUND, CUBELEN, CUBEROUND); glVertex3f(CUBEROUND, CUBELEN, -CUBEROUND); + (*polysP)++; /* Edges of cubit */ glNormal3f(-1.00, -1.00, 0.00); @@ -552,61 +565,73 @@ draw_stickerless_cubit(rubikstruct *rp) glVertex3f(-CUBEROUND, -CUBELEN, CUBEROUND); glVertex3f(-CUBELEN, -CUBEROUND, CUBEROUND); glVertex3f(-CUBELEN, -CUBEROUND, -CUBEROUND); + (*polysP)++; glNormal3f(1.00, 1.00, 0.00); glVertex3f(CUBEROUND, CUBELEN, -CUBEROUND); glVertex3f(CUBEROUND, CUBELEN, CUBEROUND); glVertex3f(CUBELEN, CUBEROUND, CUBEROUND); glVertex3f(CUBELEN, CUBEROUND, -CUBEROUND); + (*polysP)++; glNormal3f(-1.00, 1.00, 0.00); glVertex3f(-CUBELEN, CUBEROUND, -CUBEROUND); glVertex3f(-CUBELEN, CUBEROUND, CUBEROUND); glVertex3f(-CUBEROUND, CUBELEN, CUBEROUND); glVertex3f(-CUBEROUND, CUBELEN, -CUBEROUND); + (*polysP)++; glNormal3f(1.00, -1.00, 0.00); glVertex3f(CUBELEN, -CUBEROUND, -CUBEROUND); glVertex3f(CUBELEN, -CUBEROUND, CUBEROUND); glVertex3f(CUBEROUND, -CUBELEN, CUBEROUND); glVertex3f(CUBEROUND, -CUBELEN, -CUBEROUND); + (*polysP)++; glNormal3f(0.00, -1.00, -1.00); glVertex3f(-CUBEROUND, -CUBEROUND, -CUBELEN); glVertex3f(CUBEROUND, -CUBEROUND, -CUBELEN); glVertex3f(CUBEROUND, -CUBELEN, -CUBEROUND); glVertex3f(-CUBEROUND, -CUBELEN, -CUBEROUND); + (*polysP)++; glNormal3f(0.00, 1.00, 1.00); glVertex3f(-CUBEROUND, CUBEROUND, CUBELEN); glVertex3f(CUBEROUND, CUBEROUND, CUBELEN); glVertex3f(CUBEROUND, CUBELEN, CUBEROUND); glVertex3f(-CUBEROUND, CUBELEN, CUBEROUND); + (*polysP)++; glNormal3f(0.00, -1.00, 1.00); glVertex3f(-CUBEROUND, -CUBELEN, CUBEROUND); glVertex3f(CUBEROUND, -CUBELEN, CUBEROUND); glVertex3f(CUBEROUND, -CUBEROUND, CUBELEN); glVertex3f(-CUBEROUND, -CUBEROUND, CUBELEN); + (*polysP)++; glNormal3f(0.00, 1.00, -1.00); glVertex3f(-CUBEROUND, CUBELEN, -CUBEROUND); glVertex3f(CUBEROUND, CUBELEN, -CUBEROUND); glVertex3f(CUBEROUND, CUBEROUND, -CUBELEN); glVertex3f(-CUBEROUND, CUBEROUND, -CUBELEN); + (*polysP)++; glNormal3f(-1.00, 0.00, -1.00); glVertex3f(-CUBELEN, -CUBEROUND, -CUBEROUND); glVertex3f(-CUBELEN, CUBEROUND, -CUBEROUND); glVertex3f(-CUBEROUND, CUBEROUND, -CUBELEN); glVertex3f(-CUBEROUND, -CUBEROUND, -CUBELEN); + (*polysP)++; glNormal3f(1.00, 0.00, 1.00); glVertex3f(CUBELEN, -CUBEROUND, CUBEROUND); glVertex3f(CUBELEN, CUBEROUND, CUBEROUND); glVertex3f(CUBEROUND, CUBEROUND, CUBELEN); glVertex3f(CUBEROUND, -CUBEROUND, CUBELEN); + (*polysP)++; glNormal3f(1.00, 0.00, -1.00); glVertex3f(CUBEROUND, -CUBEROUND, -CUBELEN); glVertex3f(CUBEROUND, CUBEROUND, -CUBELEN); glVertex3f(CUBELEN, CUBEROUND, -CUBEROUND); glVertex3f(CUBELEN, -CUBEROUND, -CUBEROUND); + (*polysP)++; glNormal3f(-1.00, 0.00, 1.00); glVertex3f(-CUBEROUND, -CUBEROUND, CUBELEN); glVertex3f(-CUBEROUND, CUBEROUND, CUBELEN); glVertex3f(-CUBELEN, CUBEROUND, CUBEROUND); glVertex3f(-CUBELEN, -CUBEROUND, CUBEROUND); + (*polysP)++; glEnd(); glBegin(GL_TRIANGLES); glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); @@ -615,46 +640,55 @@ draw_stickerless_cubit(rubikstruct *rp) glVertex3f(CUBEROUND, CUBEROUND, CUBELEN); glVertex3f(CUBELEN, CUBEROUND, CUBEROUND); glVertex3f(CUBEROUND, CUBELEN, CUBEROUND); + (*polysP)++; glNormal3f(-1.00, -1.00, -1.00); glVertex3f(-CUBEROUND, -CUBELEN, -CUBEROUND); glVertex3f(-CUBELEN, -CUBEROUND, -CUBEROUND); glVertex3f(-CUBEROUND, -CUBEROUND, -CUBELEN); + (*polysP)++; glNormal3f(-1.00, 1.00, 1.00); glVertex3f(-CUBEROUND, CUBEROUND, CUBELEN); glVertex3f(-CUBEROUND, CUBELEN, CUBEROUND); + (*polysP)++; glVertex3f(-CUBELEN, CUBEROUND, CUBEROUND); glNormal3f(1.00, -1.00, -1.00); glVertex3f(CUBELEN, -CUBEROUND, -CUBEROUND); glVertex3f(CUBEROUND, -CUBELEN, -CUBEROUND); glVertex3f(CUBEROUND, -CUBEROUND, -CUBELEN); + (*polysP)++; glNormal3f(1.00, -1.00, 1.00); glVertex3f(CUBEROUND, -CUBEROUND, CUBELEN); glVertex3f(CUBEROUND, -CUBELEN, CUBEROUND); glVertex3f(CUBELEN, -CUBEROUND, CUBEROUND); + (*polysP)++; glNormal3f(-1.00, 1.00, -1.00); glVertex3f(-CUBELEN, CUBEROUND, -CUBEROUND); glVertex3f(-CUBEROUND, CUBELEN, -CUBEROUND); glVertex3f(-CUBEROUND, CUBEROUND, -CUBELEN); + (*polysP)++; glNormal3f(-1.00, -1.00, 1.00); glVertex3f(-CUBEROUND, -CUBEROUND, CUBELEN); glVertex3f(-CUBELEN, -CUBEROUND, CUBEROUND); glVertex3f(-CUBEROUND, -CUBELEN, CUBEROUND); + (*polysP)++; glNormal3f(1.00, 1.00, -1.00); glVertex3f(CUBELEN, CUBEROUND, -CUBEROUND); glVertex3f(CUBEROUND, CUBEROUND, -CUBELEN); glVertex3f(CUBEROUND, CUBELEN, -CUBEROUND); + (*polysP)++; glEnd(); return True; } static Bool draw_cubit(ModeInfo * mi, - int back, int front, int left, int right, int bottom, int top) + int back, int front, int left, int right, int bottom, int top, + unsigned long *polysP) { rubikstruct *rp = &rubik[MI_SCREEN(mi)]; int mono = MI_IS_MONO(mi); - if (!draw_stickerless_cubit(rp)) + if (!draw_stickerless_cubit(rp, polysP)) return False; if (back != NO_FACE) { glBegin(GL_POLYGON); @@ -668,6 +702,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERSHORT, -STICKERLONG, -STICKERDEPTH); glVertex3f(-STICKERLONG, -STICKERSHORT, -STICKERDEPTH); glVertex3f(-STICKERLONG, STICKERSHORT, -STICKERDEPTH); + (*polysP)++; glEnd(); } if (front != NO_FACE) { @@ -682,6 +717,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERSHORT, STICKERLONG, STICKERDEPTH); glVertex3f(-STICKERLONG, STICKERSHORT, STICKERDEPTH); glVertex3f(-STICKERLONG, -STICKERSHORT, STICKERDEPTH); + (*polysP)++; glEnd(); } if (left != NO_FACE) { @@ -696,6 +732,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERDEPTH, -STICKERSHORT, -STICKERLONG); glVertex3f(-STICKERDEPTH, -STICKERLONG, -STICKERSHORT); glVertex3f(-STICKERDEPTH, -STICKERLONG, STICKERSHORT); + (*polysP)++; glEnd(); } if (right != NO_FACE) { @@ -710,6 +747,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(STICKERDEPTH, -STICKERSHORT, STICKERLONG); glVertex3f(STICKERDEPTH, -STICKERLONG, STICKERSHORT); glVertex3f(STICKERDEPTH, -STICKERLONG, -STICKERSHORT); + (*polysP)++; glEnd(); } if (bottom != NO_FACE) { @@ -724,6 +762,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERLONG, -STICKERDEPTH, -STICKERSHORT); glVertex3f(-STICKERSHORT, -STICKERDEPTH, -STICKERLONG); glVertex3f(STICKERSHORT, -STICKERDEPTH, -STICKERLONG); + (*polysP)++; glEnd(); } if (top != NO_FACE) { @@ -738,6 +777,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(STICKERLONG, STICKERDEPTH, -STICKERSHORT); glVertex3f(STICKERSHORT, STICKERDEPTH, -STICKERLONG); glVertex3f(-STICKERSHORT, STICKERDEPTH, -STICKERLONG); + (*polysP)++; glEnd(); } return True; @@ -789,7 +829,7 @@ draw_cube(ModeInfo * mi) #define MIDX(a) (((GLfloat)(2*a-MAXSIZEX+1))/2.0) #define MIDY(a) (((GLfloat)(2*a-MAXSIZEY+1))/2.0) #define MIDZ(a) (((GLfloat)(2*a-MAXSIZEZ+1))/2.0) -#define DRAW_CUBIT(mi,b,f,l,r,bm,t) if (!draw_cubit(mi,b,f,l,r,bm,t)) return False +#define DRAW_CUBIT(mi,b,f,l,r,bm,t) if (!draw_cubit(mi,b,f,l,r,bm,t,&mi->polygon_count)) return False rubikstruct *rp = &rubik[MI_SCREEN(mi)]; RubikSlice slice; GLfloat rotatestep; @@ -1588,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; @@ -1756,10 +1796,10 @@ shuffle(ModeInfo * mi) return False; rp->moves[i] = move; } - rp->VX = 0.05; + rp->VX = 0.005; if (NRAND(100) < 50) rp->VX *= -1; - rp->VY = 0.05; + rp->VY = 0.005; if (NRAND(100) < 50) rp->VY *= -1; rp->movement.face = NO_FACE; @@ -1780,14 +1820,31 @@ 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 +rubik_handle_event (ModeInfo *mi, XEvent *event) +{ + rubikstruct *rp = &rubik[MI_SCREEN(mi)]; + + 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->done = 1; + return True; + } + + return False; } + static Bool pinit(ModeInfo * mi) { glClearDepth(1.0); - glClearColor(0.0, 0.0, 0.0, 1.0); glColor3f(1.0, 1.0, 1.0); glLightfv(GL_LIGHT0, GL_AMBIENT, ambient); @@ -1813,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++) @@ -1833,44 +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 (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"); @@ -1900,6 +1939,7 @@ draw_rubik(ModeInfo * mi) if (!rp->glx_context) return; + mi->polygon_count = 0; glXMakeCurrent(display, window, *(rp->glx_context)); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -1932,16 +1972,16 @@ draw_rubik(ModeInfo * mi) bounced = True; } if (bounced) { - rp->VX += ((float) LRAND() / (float) MAXRAND) * 0.02 - 0.01; - rp->VX += ((float) LRAND() / (float) MAXRAND) * 0.02 - 0.01; - if (rp->VX > 0.06) - rp->VX = 0.06; - if (rp->VY > 0.06) - rp->VY = 0.06; - if (rp->VX < -0.06) - rp->VX = -0.06; - if (rp->VY < -0.06) - rp->VY = -0.06; + rp->VX += ((float) LRAND() / (float) MAXRAND) * 0.002 - 0.001; + rp->VY += ((float) LRAND() / (float) MAXRAND) * 0.002 - 0.001; + if (rp->VX > 0.006) + rp->VX = 0.006; + if (rp->VY > 0.006) + rp->VY = 0.006; + if (rp->VX < -0.006) + rp->VX = -0.006; + if (rp->VY < -0.006) + rp->VY = -0.006; } if (!MI_IS_ICONIC(mi)) { glTranslatef(rp->PX, rp->PY, 0); @@ -1950,12 +1990,26 @@ draw_rubik(ModeInfo * mi) glScalef(Scale4Iconic * rp->WindH / rp->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.8; + glScalef (h, h, h); + } + } +# endif + + gltrackball_rotate (rp->trackball); + 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); @@ -1988,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"); @@ -2004,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"); @@ -2032,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"); @@ -2050,7 +2104,7 @@ draw_rubik(ModeInfo * mi) glFlush(); - rp->step += 0.05; + rp->step += 0.002; } #ifndef STANDALONE @@ -2066,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");