X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fsierpinski3d.c;h=0317299ab25d24dcdbefeb4bfdd08369fadd6022;hb=39809ded547bdbb08207d3e514950425215b4410;hp=7bcefcf2c4a447837af5dcd5ce62389033292ecc;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver diff --git a/hacks/glx/sierpinski3d.c b/hacks/glx/sierpinski3d.c index 7bcefcf2..0317299a 100644 --- a/hacks/glx/sierpinski3d.c +++ b/hacks/glx/sierpinski3d.c @@ -30,8 +30,9 @@ static const char sccsid[] = "@(#)sierpinski3D.c 00.01 99/11/04 xlockmore"; # define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ + "*suppressRotationAnimation: True\n" \ -# define refresh_gasket 0 +# define release_gasket 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -76,8 +77,8 @@ ENTRYPOINT ModeSpecOpt gasket_opts = {countof(opts), opts, countof(vars), vars, #ifdef USE_MODULES ModStruct gasket_description = -{"gasket", "init_gasket", "draw_gasket", "release_gasket", - "draw_gasket", "init_gasket", NULL, &gasket_opts, +{"gasket", "init_gasket", "draw_gasket", NULL, + "draw_gasket", "init_gasket", "free_gasket", &gasket_opts, 1000, 1, 2, 1, 4, 1.0, "", "Shows GL's Sierpinski gasket", 0, NULL}; @@ -327,10 +328,7 @@ draw(ModeInfo *mi) (y - 0.5) * 10, (z - 0.5) * 20); - /* Do it twice because we don't track the device's orientation. */ - glRotatef( current_device_rotation(), 0, 0, 1); gltrackball_rotate (gp->trackball); - glRotatef(-current_device_rotation(), 0, 0, 1); get_rotation (gp->rot, &x, &y, &z, !gp->button_down_p); glRotatef (x * 360, 1.0, 0.0, 0.0); @@ -387,8 +385,15 @@ ENTRYPOINT void reshape_gasket(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(); gluPerspective (30.0, 1/h, 1.0, 100.0); @@ -399,6 +404,14 @@ reshape_gasket(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); } @@ -421,37 +434,38 @@ gasket_handle_event (ModeInfo *mi, XEvent *event) { gasketstruct *gp = &gasket[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) - { - gp->button_down_p = True; - gltrackball_start (gp->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) - { - gp->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)) + if (gltrackball_event_handler (event, gp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &gp->button_down_p)) + return True; + else if (event->xany.type == KeyPress) { - gltrackball_mousewheel (gp->trackball, event->xbutton.button, 10, - !!event->xbutton.state); - return True; + KeySym keysym; + char c = 0; + XLookupString (&event->xkey, &c, 1, &keysym, 0); + if (c == '+' || c == '=' || + keysym == XK_Up || keysym == XK_Right || keysym == XK_Next) + { + gp->tick = speed; + gp->current_depth += (gp->current_depth > 0 ? 1 : -1); + gp->current_depth--; + return True; + } + else if (c == '-' || c == '_' || + keysym == XK_Down || keysym == XK_Left || keysym == XK_Prior) + { + gp->tick = speed; + gp->current_depth -= (gp->current_depth > 0 ? 1 : -1); + gp->current_depth--; + return True; + } + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + goto DEF; } - else if (event->xany.type == MotionNotify && - gp->button_down_p) + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) { - gltrackball_track (gp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); + DEF: + gp->tick = speed; return True; } @@ -465,12 +479,7 @@ init_gasket(ModeInfo *mi) int screen = MI_SCREEN(mi); gasketstruct *gp; - if (gasket == NULL) - { - if ((gasket = (gasketstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (gasketstruct))) == NULL) - return; - } + MI_INIT (mi, gasket); gp = &gasket[screen]; gp->window = MI_WINDOW(mi); @@ -484,7 +493,7 @@ init_gasket(ModeInfo *mi) 1.0, do_wander ? wander_speed : 0, True); - gp->trackball = gltrackball_init (); + gp->trackball = gltrackball_init (True); } gp->ncolors = 255; @@ -549,31 +558,20 @@ draw_gasket(ModeInfo * mi) } ENTRYPOINT void -release_gasket(ModeInfo * mi) +free_gasket(ModeInfo * mi) { - if (gasket != NULL) - { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) - { - gasketstruct *gp = &gasket[screen]; + gasketstruct *gp = &gasket[MI_SCREEN(mi)]; - if (gp->glx_context) - { + if (gp->glx_context) + { /* Display lists MUST be freed while their glXContext is current. */ - glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context)); + glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context)); - if (glIsList(gp->gasket0)) glDeleteLists(gp->gasket0, 1); - if (glIsList(gp->gasket1)) glDeleteLists(gp->gasket1, 1); - if (glIsList(gp->gasket2)) glDeleteLists(gp->gasket2, 1); - if (glIsList(gp->gasket3)) glDeleteLists(gp->gasket3, 1); - } - } - (void) free((void *) gasket); - gasket = NULL; + if (glIsList(gp->gasket0)) glDeleteLists(gp->gasket0, 1); + if (glIsList(gp->gasket1)) glDeleteLists(gp->gasket1, 1); + if (glIsList(gp->gasket2)) glDeleteLists(gp->gasket2, 1); + if (glIsList(gp->gasket3)) glDeleteLists(gp->gasket3, 1); } - FreeAllGL(mi); } XSCREENSAVER_MODULE_2 ("Sierpinski3D", sierpinski3d, gasket)