X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcubestorm.c;h=cf973c9ae6dd69e3b548351981bc81111a48c66f;hb=c85f503f5793839a6be4c818332aca4a96927bb2;hp=cfc53c0e8158c802aa0f6ced126185c9e45007e2;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930;p=xscreensaver diff --git a/hacks/glx/cubestorm.c b/hacks/glx/cubestorm.c index cfc53c0e..cf973c9a 100644 --- a/hacks/glx/cubestorm.c +++ b/hacks/glx/cubestorm.c @@ -1,4 +1,4 @@ -/* cubestorm, Copyright (c) 2003 Jamie Zawinski +/* cubestorm, Copyright (c) 2003-2018 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -9,36 +9,16 @@ * implied warranty. */ -#include - -extern XtAppContext app; - -#define PROGCLASS "CubeStorm" -#define HACK_INIT init_cube -#define HACK_DRAW draw_cube -#define HACK_RESHAPE reshape_cube -#define HACK_HANDLE_EVENT cube_handle_event -#define EVENT_MASK PointerMotionMask -#define sws_opts xlockmore_opts - -#define DEF_SPIN "True" -#define DEF_WANDER "True" -#define DEF_SPEED "1.0" -#define DEF_THICKNESS "0.06" -#define DEF_COUNT "4" - #define DEFAULTS "*delay: 30000 \n" \ - "*count: 30 \n" \ + "*count: " DEF_COUNT "\n" \ "*showFPS: False \n" \ "*fpsSolid: True \n" \ "*wireframe: False \n" \ - "*speed: " DEF_SPEED " \n" \ - "*spin: " DEF_SPIN "\n" \ - "*wander: " DEF_WANDER "\n" \ - "*thickness: " DEF_THICKNESS "\n" \ - "*count: " DEF_COUNT "\n" \ + "*suppressRotationAnimation: True\n" \ +# define free_cube 0 +# define release_cube 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -50,7 +30,18 @@ extern XtAppContext app; #ifdef USE_GL /* whole file */ -#include +#define DEF_SPIN "True" +#define DEF_WANDER "True" +#define DEF_SPEED "1.0" +#define DEF_THICKNESS "0.06" +#define DEF_COUNT "4" +#define DEF_LENGTH "200" + +typedef struct { + GLfloat px, py, pz; + GLfloat rx, ry, rz; + int ccolor; +} histcube; typedef struct { rotator *rot; @@ -70,6 +61,9 @@ typedef struct { subcube *subcubes; + int hist_size, hist_count; + histcube *hist; + } cube_configuration; static cube_configuration *bps = NULL; @@ -78,6 +72,7 @@ static Bool do_spin; static Bool do_wander; static GLfloat speed; static GLfloat thickness; +static int max_length; static XrmOptionDescRec opts[] = { { "-spin", ".spin", XrmoptionNoArg, "True" }, @@ -85,17 +80,21 @@ static XrmOptionDescRec opts[] = { { "-wander", ".wander", XrmoptionNoArg, "True" }, { "+wander", ".wander", XrmoptionNoArg, "False" }, { "-speed", ".speed", XrmoptionSepArg, 0 }, - { "-thickness", ".thickness", XrmoptionSepArg, 0 }, + { "-db", ".doubleBuffer", XrmoptionNoArg, "True"}, + { "+db", ".doubleBuffer", XrmoptionNoArg, "False"}, + { "-thickness", ".thickness", XrmoptionSepArg, 0 }, + { "-length", ".length", XrmoptionSepArg, 0 }, }; static argtype vars[] = { - {(caddr_t *) &do_spin, "spin", "Spin", DEF_SPIN, t_Bool}, - {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, - {(caddr_t *) &speed, "speed", "Speed", DEF_SPEED, t_Float}, - {(caddr_t *) &thickness, "thickness", "Thickness", DEF_THICKNESS, t_Float}, + {&do_spin, "spin", "Spin", DEF_SPIN, t_Bool}, + {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, + {&speed, "speed", "Speed", DEF_SPEED, t_Float}, + {&thickness, "thickness", "Thickness", DEF_THICKNESS, t_Float}, + {&max_length, "length", "Length", DEF_LENGTH, t_Int}, }; -ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL}; +ENTRYPOINT ModeSpecOpt cube_opts = {countof(opts), opts, countof(vars), vars, NULL}; static void @@ -169,12 +168,19 @@ new_cube_colors (ModeInfo *mi) /* Window management, etc */ -void +ENTRYPOINT void reshape_cube (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; + int y = 0; - glViewport (0, 0, (GLint) width, (GLint) height); + if (width > height * 5) { /* tiny window: show middle */ + height = width * 9/16; + y = -height/2; + h = height / (GLfloat) width; + } + + glViewport (0, y, (GLint) width, (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -186,38 +192,27 @@ reshape_cube (ModeInfo *mi, int width, int height) 0.0, 0.0, 0.0, 0.0, 1.0, 0.0); +# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */ + { + int o = (int) current_device_rotation(); + if (o != 0 && o != 180 && o != -180) + glScalef (1/h, 1/h, 1/h); + } +# endif + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); } -Bool +ENTRYPOINT Bool cube_handle_event (ModeInfo *mi, XEvent *event) { cube_configuration *bp = &bps[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button & Button1) - { - bp->button_down_p = True; - gltrackball_start (bp->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) - { - bp->button_down_p = False; - return True; - } - else if (event->xany.type == MotionNotify && - bp->button_down_p) - { - gltrackball_track (bp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } + if (gltrackball_event_handler (event, bp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &bp->button_down_p)) + return True; else if (event->xany.type == KeyPress) { KeySym keysym; @@ -228,33 +223,27 @@ cube_handle_event (ModeInfo *mi, XEvent *event) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); return True; } - else if (c == '\r' || c == '\n') - { - new_cube_colors (mi); - return True; - } + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + goto DEF; + } + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + { + DEF: + new_cube_colors (mi); + return True; } return False; } -void +ENTRYPOINT void init_cube (ModeInfo *mi) { cube_configuration *bp; int wire = MI_IS_WIREFRAME(mi); int i; - if (!bps) { - bps = (cube_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (cube_configuration)); - if (!bps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - - bp = &bps[MI_SCREEN(mi)]; - } + MI_INIT (mi, bps); bp = &bps[MI_SCREEN(mi)]; @@ -262,8 +251,13 @@ init_cube (ModeInfo *mi) if (MI_COUNT(mi) <= 0) MI_COUNT(mi) = 1; - bp->trackball = gltrackball_init (); + bp->trackball = gltrackball_init (True); bp->subcubes = (subcube *) calloc (MI_COUNT(mi), sizeof(subcube)); + + bp->hist_count = 0; + bp->hist_size = 100; + bp->hist = (histcube *) malloc (bp->hist_size * sizeof(*bp->hist)); + for (i = 0; i < MI_COUNT(mi); i++) { double wander_speed, spin_speed, spin_accel; @@ -321,7 +315,71 @@ init_cube (ModeInfo *mi) } -void +/* Originally, this program achieved the "accumulating cubes" effect by + simply not clearing the depth or color buffers between frames. That + doesn't work on modern systems, particularly mobile: you can no longer + rely on your buffers being unmolested once you have yielded. So now we + must save and re-render every polygon. Noof has the same problem and + solves it by taking a screenshot of the frame buffer into a texture, but + cubestorm needs to restore the depth buffer as well as the color buffer. + */ +static void +push_hist (ModeInfo *mi) +{ + cube_configuration *bp = &bps[MI_SCREEN(mi)]; + double px, py, pz; + double rx = 0, ry = 0, rz = 0; + int i; + + if (bp->hist_count > max_length && + bp->hist_count > MI_COUNT(mi) && + !bp->button_down_p) + { + /* Drop history off of the end. */ + memmove (bp->hist, + bp->hist + MI_COUNT(mi), + (bp->hist_count - MI_COUNT(mi)) * sizeof(*bp->hist)); + bp->hist_count -= MI_COUNT(mi); + } + + if (bp->hist_count + MI_COUNT(mi) >= bp->hist_size) + { + bp->hist_size = bp->hist_count + MI_COUNT(mi) + 100; + bp->hist = (histcube *) + realloc (bp->hist, bp->hist_size * sizeof(*bp->hist)); + } + + get_position (bp->subcubes[0].rot, &px, &py, &pz, !bp->button_down_p); + + for (i = 0; i < MI_COUNT(mi); i++) + { + subcube *sc = &bp->subcubes[i]; + histcube *hc = &bp->hist[bp->hist_count]; + double rx2, ry2, rz2; + + get_rotation (sc->rot, &rx2, &ry2, &rz2, !bp->button_down_p); + + if (i == 0) /* N+1 cubes rotate relative to cube 0 */ + rx = rx2, ry = ry2, rz = rz2; + else + rx2 += rx, ry2 += ry, rz2 += rz; + + hc->px = px; + hc->py = py; + hc->pz = pz; + hc->rx = rx2; + hc->ry = ry2; + hc->rz = rz2; + hc->ccolor = sc->ccolor; + sc->ccolor++; + if (sc->ccolor >= bp->ncolors) + sc->ccolor = 0; + bp->hist_count++; + } +} + + +ENTRYPOINT void draw_cube (ModeInfo *mi) { cube_configuration *bp = &bps[MI_SCREEN(mi)]; @@ -329,11 +387,13 @@ draw_cube (ModeInfo *mi) Window window = MI_WINDOW(mi); int wire = MI_IS_WIREFRAME(mi); int i; - double x, y, z; if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glShadeModel(GL_SMOOTH); glEnable(GL_DEPTH_TEST); @@ -342,7 +402,7 @@ draw_cube (ModeInfo *mi) if (bp->clear_p) /* we're in "no vapor trails" mode */ { - glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT); + bp->hist_count = 0; if (! (random() % (int) (25 / speed))) bp->clear_p = False; } @@ -355,47 +415,33 @@ draw_cube (ModeInfo *mi) } } - glPushMatrix (); - - glScalef(1.1, 1.1, 1.1); - + push_hist (mi); mi->polygon_count = 0; - - get_position (bp->subcubes[0].rot, &x, &y, &z, !bp->button_down_p); - glTranslatef((x - 0.5) * 15, - (y - 0.5) * 15, - (z - 0.5) * 30); - gltrackball_rotate (bp->trackball); - - glScalef (4.0, 4.0, 4.0); - - for (i = 0; i < MI_COUNT(mi); i++) + for (i = 0; i < bp->hist_count; i++) { - static GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0}; - static GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; - static GLfloat bshiny = 128.0; + GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0}; + GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; + GLfloat bshiny = 128.0; + + histcube *hc = &bp->hist[i]; glPushMatrix(); + glScalef (1.1, 1.1, 1.1); - if (i != 0) /* N+1 cubes rotate relative to cube 0 */ - { - get_rotation (bp->subcubes[0].rot, &x, &y, &z, False); - glRotatef (x * 360, 1.0, 0.0, 0.0); - glRotatef (y * 360, 0.0, 1.0, 0.0); - glRotatef (z * 360, 0.0, 0.0, 1.0); - } + glTranslatef((hc->px - 0.5) * 15, + (hc->py - 0.5) * 15, + (hc->pz - 0.5) * 30); + gltrackball_rotate (bp->trackball); + + glScalef (4.0, 4.0, 4.0); - get_rotation (bp->subcubes[i].rot, &x, &y, &z, !bp->button_down_p); - glRotatef (x * 360, 1.0, 0.0, 0.0); - glRotatef (y * 360, 0.0, 1.0, 0.0); - glRotatef (z * 360, 0.0, 0.0, 1.0); + glRotatef (hc->rx * 360, 1.0, 0.0, 0.0); + glRotatef (hc->ry * 360, 0.0, 1.0, 0.0); + glRotatef (hc->rz * 360, 0.0, 0.0, 1.0); - bcolor[0] = bp->colors[bp->subcubes[i].ccolor].red / 65536.0; - bcolor[1] = bp->colors[bp->subcubes[i].ccolor].green / 65536.0; - bcolor[2] = bp->colors[bp->subcubes[i].ccolor].blue / 65536.0; - bp->subcubes[i].ccolor++; - if (bp->subcubes[i].ccolor >= bp->ncolors) - bp->subcubes[i].ccolor = 0; + bcolor[0] = bp->colors[hc->ccolor].red / 65536.0; + bcolor[1] = bp->colors[hc->ccolor].green / 65536.0; + bcolor[2] = bp->colors[hc->ccolor].blue / 65536.0; if (wire) glColor3f (bcolor[0], bcolor[1], bcolor[2]); @@ -412,12 +458,12 @@ draw_cube (ModeInfo *mi) glPopMatrix(); } - glPopMatrix (); - if (mi->fps_p) do_fps (mi); glFinish(); glXSwapBuffers(dpy, window); } +XSCREENSAVER_MODULE_2 ("CubeStorm", cubestorm, cube) + #endif /* USE_GL */