X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Frubik.c;h=0cc99019ebc19ab8dc4970a6f2ee9e127117f28e;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=f57b5328387a0dc1a501df0dd487d6c3798cb300;hpb=3f9592851ce4ed76a9979bfdd6ec7dc5c457e183;p=xscreensaver diff --git a/hacks/glx/rubik.c b/hacks/glx/rubik.c index f57b5328..0cc99019 100644 --- a/hacks/glx/rubik.c +++ b/hacks/glx/rubik.c @@ -1,9 +1,8 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* rubik --- Shows an auto-solving Rubik's cube */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)rubik.c 5.01 2001/03/01 xlockmore"; - #endif /*- @@ -104,32 +103,24 @@ static const char sccsid[] = "@(#)rubik.c 5.01 2001/03/01 xlockmore"; * BOTTOM => X, Z */ -#ifdef VMS -/*- - * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock. - * otherwise caddr_t is not defined correctly - */ -#include -#endif - #ifdef STANDALONE # define MODE_rubik -# define PROGCLASS "Rubik" -# define HACK_INIT init_rubik -# define HACK_DRAW draw_rubik -# define HACK_RESHAPE reshape -# define rubik_opts xlockmore_opts -# 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 # 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" @@ -144,30 +135,30 @@ static Bool hideshuffling; static XrmOptionDescRec opts[] = { - {(char *) "-sizex", (char *) ".rubik.sizex", XrmoptionSepArg, (caddr_t) NULL}, - {(char *) "-sizey", (char *) ".rubik.sizey", XrmoptionSepArg, (caddr_t) NULL}, - {(char *) "-sizez", (char *) ".rubik.sizez", XrmoptionSepArg, (caddr_t) NULL}, - {(char *) "-hideshuffling", (char *) ".rubik.hideshuffling", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+hideshuffling", (char *) ".rubik.hideshuffling", XrmoptionNoArg, (caddr_t) "off"} + {"-sizex", ".rubik.sizex", XrmoptionSepArg, 0}, + {"-sizey", ".rubik.sizey", XrmoptionSepArg, 0}, + {"-sizez", ".rubik.sizez", XrmoptionSepArg, 0}, + {"-hideshuffling", ".rubik.hideshuffling", XrmoptionNoArg, "on"}, + {"+hideshuffling", ".rubik.hideshuffling", XrmoptionNoArg, "off"} }; static argtype vars[] = { - {(caddr_t *) & sizex, (char *) "sizex", (char *) "SizeX", (char *) DEF_SIZEX, t_Int}, - {(caddr_t *) & sizey, (char *) "sizey", (char *) "SizeY", (char *) DEF_SIZEY, t_Int}, - {(caddr_t *) & sizez, (char *) "sizez", (char *) "SizeZ", (char *) DEF_SIZEZ, t_Int}, - {(caddr_t *) & hideshuffling, (char *) "hideshuffling", (char *) "Hideshuffling", (char *) DEF_HIDESHUFFLING, t_Bool} + {&sizex, "sizex", "SizeX", DEF_SIZEX, t_Int}, + {&sizey, "sizey", "SizeY", DEF_SIZEY, t_Int}, + {&sizez, "sizez", "SizeZ", DEF_SIZEZ, t_Int}, + {&hideshuffling, "hideshuffling", "Hideshuffling", DEF_HIDESHUFFLING, t_Bool} }; static OptionStruct desc[] = { - {(char *) "-sizex num", (char *) "number of cubies along x axis (overrides size)"}, - {(char *) "-sizey num", (char *) "number of cubies along y axis (overrides size)"}, - {(char *) "-sizez num", (char *) "number of cubies along z axis (overrides size)"}, - {(char *) "-/+hideshuffling", (char *) "turn on/off hidden shuffle phase"} + {"-sizex num", "number of cubies along x axis (overrides size)"}, + {"-sizey num", "number of cubies along y axis (overrides size)"}, + {"-sizez num", "number of cubies along z axis (overrides size)"}, + {"-/+hideshuffling", "turn on/off hidden shuffle phase"} }; -ModeSpecOpt rubik_opts = +ENTRYPOINT ModeSpecOpt rubik_opts = {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES @@ -272,7 +263,7 @@ typedef struct _RubikSlice { * Pick a face and a direction on face the next face and orientation * is then known. */ -static RubikLoc slideNextRow[MAXFACES][MAXORIENT] = +static const RubikLoc slideNextRow[MAXFACES][MAXORIENT] = { { {5, TOP}, @@ -311,7 +302,7 @@ static RubikLoc slideNextRow[MAXFACES][MAXORIENT] = * other 2 will be opposites) and translate it into slice movements). * CW = DEEP Depth CCW == SHALLOW Depth with reference to faces 0, 1, and 2 */ -static RubikLoc rotateSlice[MAXFACES][MAXORIENT / 2] = +static const RubikLoc rotateSlice[MAXFACES][MAXORIENT / 2] = { { {1, CCW}, @@ -343,7 +334,7 @@ static RubikLoc rotateSlice[MAXFACES][MAXORIENT / 2] = * Rotate face clockwise by a number of orients, then the top of the * face then points to this face */ -static int rowToRotate[MAXFACES][MAXORIENT] = +static const int rowToRotate[MAXFACES][MAXORIENT] = { {3, 2, 1, 5}, {2, 4, 5, 0}, @@ -356,7 +347,7 @@ static int rowToRotate[MAXFACES][MAXORIENT] = /* * This translates a clockwise move to something more manageable */ -static RubikRowNext rotateToRow[MAXFACES] = /*CW to min face */ +static const RubikRowNext rotateToRow[MAXFACES] = /*CW to min face */ { {1, LEFT, TOP}, {0, BOTTOM, RIGHT}, @@ -384,57 +375,37 @@ typedef struct { GLfloat rotatestep; GLfloat PX, PY, VX, VY; GLXContext *glx_context; + Bool button_down_p; + trackball_state *trackball; } rubikstruct; -static float front_shininess[] = -{60.0}; -static float front_specular[] = -{0.7, 0.7, 0.7, 1.0}; -static float ambient[] = -{0.0, 0.0, 0.0, 1.0}; -static float diffuse[] = -{1.0, 1.0, 1.0, 1.0}; -static float position0[] = -{1.0, 1.0, 1.0, 0.0}; -static float position1[] = -{-1.0, -1.0, 1.0, 0.0}; -static float lmodel_ambient[] = -{0.5, 0.5, 0.5, 1.0}; -static float lmodel_twoside[] = -{GL_TRUE}; - -static float MaterialRed[] = -{0.5, 0.0, 0.0, 1.0}; -static float MaterialGreen[] = -{0.0, 0.5, 0.0, 1.0}; -static float MaterialBlue[] = -{0.0, 0.0, 0.5, 1.0}; -static float MaterialYellow[] = -{0.7, 0.7, 0.0, 1.0}; -static float MaterialOrange[] = -{0.9, 0.45, 0.36, 1.0}; +static const float front_shininess[] = {60.0}; +static const float front_specular[] = {0.7, 0.7, 0.7, 1.0}; +static const float ambient[] = {0.0, 0.0, 0.0, 1.0}; +static const float diffuse[] = {1.0, 1.0, 1.0, 1.0}; +static const float position0[] = {1.0, 1.0, 1.0, 0.0}; +static const float position1[] = {-1.0, -1.0, 1.0, 0.0}; +static const float lmodel_ambient[] = {0.5, 0.5, 0.5, 1.0}; +static const float lmodel_twoside[] = {GL_TRUE}; + +static const float MaterialRed[] = {0.5, 0.0, 0.0, 1.0}; +static const float MaterialGreen[] = {0.0, 0.5, 0.0, 1.0}; +static const float MaterialBlue[] = {0.0, 0.0, 0.5, 1.0}; +static const float MaterialYellow[] = {0.7, 0.7, 0.0, 1.0}; +static const float MaterialOrange[] = {0.9, 0.45, 0.36, 1.0}; #if 0 -static float MaterialMagenta[] = -{0.7, 0.0, 0.7, 1.0}; -static float MaterialCyan[] = -{0.0, 0.7, 0.7, 1.0}; +static float MaterialMagenta[] = {0.7, 0.0, 0.7, 1.0}; +static float MaterialCyan[] = {0.0, 0.7, 0.7, 1.0}; #endif -static float MaterialWhite[] = -{0.8, 0.8, 0.8, 1.0}; -static float MaterialGray[] = -{0.2, 0.2, 0.2, 1.0}; -static float MaterialGray3[] = -{0.3, 0.3, 0.3, 1.0}; -static float MaterialGray4[] = -{0.4, 0.4, 0.4, 1.0}; -static float MaterialGray5[] = -{0.5, 0.5, 0.5, 1.0}; -static float MaterialGray6[] = -{0.6, 0.6, 0.6, 1.0}; -static float MaterialGray7[] = -{0.7, 0.7, 0.7, 1.0}; +static const float MaterialWhite[] = {0.8, 0.8, 0.8, 1.0}; +static const float MaterialGray[] = {0.2, 0.2, 0.2, 1.0}; +static const float MaterialGray3[] = {0.3, 0.3, 0.3, 1.0}; +static const float MaterialGray4[] = {0.4, 0.4, 0.4, 1.0}; +static const float MaterialGray5[] = {0.5, 0.5, 0.5, 1.0}; +static const float MaterialGray6[] = {0.6, 0.6, 0.6, 1.0}; +static const float MaterialGray7[] = {0.7, 0.7, 0.7, 1.0}; static rubikstruct *rubik = (rubikstruct *) NULL; @@ -502,6 +473,7 @@ faceSizes(rubikstruct * rp, int face, int * sizeOfRow, int * sizeOfColumn) *sizeOfRow = MAXSIZEX; *sizeOfColumn = MAXSIZEY; break; + default: abort(); } } @@ -544,7 +516,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); @@ -554,31 +526,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); @@ -586,61 +564,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); @@ -649,46 +639,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); @@ -702,6 +701,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERSHORT, -STICKERLONG, -STICKERDEPTH); glVertex3f(-STICKERLONG, -STICKERSHORT, -STICKERDEPTH); glVertex3f(-STICKERLONG, STICKERSHORT, -STICKERDEPTH); + (*polysP)++; glEnd(); } if (front != NO_FACE) { @@ -716,6 +716,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERSHORT, STICKERLONG, STICKERDEPTH); glVertex3f(-STICKERLONG, STICKERSHORT, STICKERDEPTH); glVertex3f(-STICKERLONG, -STICKERSHORT, STICKERDEPTH); + (*polysP)++; glEnd(); } if (left != NO_FACE) { @@ -730,6 +731,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERDEPTH, -STICKERSHORT, -STICKERLONG); glVertex3f(-STICKERDEPTH, -STICKERLONG, -STICKERSHORT); glVertex3f(-STICKERDEPTH, -STICKERLONG, STICKERSHORT); + (*polysP)++; glEnd(); } if (right != NO_FACE) { @@ -744,6 +746,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(STICKERDEPTH, -STICKERSHORT, STICKERLONG); glVertex3f(STICKERDEPTH, -STICKERLONG, STICKERSHORT); glVertex3f(STICKERDEPTH, -STICKERLONG, -STICKERSHORT); + (*polysP)++; glEnd(); } if (bottom != NO_FACE) { @@ -758,6 +761,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(-STICKERLONG, -STICKERDEPTH, -STICKERSHORT); glVertex3f(-STICKERSHORT, -STICKERDEPTH, -STICKERLONG); glVertex3f(STICKERSHORT, -STICKERDEPTH, -STICKERLONG); + (*polysP)++; glEnd(); } if (top != NO_FACE) { @@ -772,6 +776,7 @@ draw_cubit(ModeInfo * mi, glVertex3f(STICKERLONG, STICKERDEPTH, -STICKERSHORT); glVertex3f(STICKERSHORT, STICKERDEPTH, -STICKERLONG); glVertex3f(-STICKERSHORT, STICKERDEPTH, -STICKERLONG); + (*polysP)++; glEnd(); } return True; @@ -823,7 +828,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; @@ -1622,7 +1627,7 @@ moveRubik(rubikstruct * rp, int face, int direction, int position) } #ifdef DEBUG -void +static void printCube(rubikstruct * rp) { int face, position, sizeOfRow, sizeOfColumn; @@ -1790,10 +1795,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; @@ -1804,8 +1809,8 @@ shuffle(ModeInfo * mi) return True; } -void -reshape(ModeInfo * mi, int width, int height) +ENTRYPOINT void +reshape_rubik(ModeInfo * mi, int width, int height) { rubikstruct *rp = &rubik[MI_SCREEN(mi)]; @@ -1814,14 +1819,31 @@ reshape(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); @@ -1867,7 +1889,7 @@ free_rubik(rubikstruct *rp) } } -void +ENTRYPOINT void release_rubik(ModeInfo * mi) { if (rubik != NULL) { @@ -1884,7 +1906,7 @@ release_rubik(ModeInfo * mi) FreeAllGL(mi); } -void +ENTRYPOINT void init_rubik(ModeInfo * mi) { rubikstruct *rp; @@ -1899,9 +1921,11 @@ init_rubik(ModeInfo * mi) 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(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + reshape_rubik(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); glDrawBuffer(GL_BACK); if (!pinit(mi)) { free_rubik(rp); @@ -1916,7 +1940,7 @@ init_rubik(ModeInfo * mi) } } -void +ENTRYPOINT void draw_rubik(ModeInfo * mi) { Bool bounced = False; @@ -1934,6 +1958,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); @@ -1966,16 +1991,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); @@ -1984,6 +2009,20 @@ 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); @@ -2084,10 +2123,11 @@ draw_rubik(ModeInfo * mi) glFlush(); - rp->step += 0.05; + rp->step += 0.002; } -void +#ifndef STANDALONE +ENTRYPOINT void change_rubik(ModeInfo * mi) { rubikstruct *rp; @@ -2107,5 +2147,8 @@ change_rubik(ModeInfo * mi) return; } } +#endif /* !STANDALONE */ #endif + +XSCREENSAVER_MODULE ("Rubik", rubik)