X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fcubicgrid.c;h=262b4e41bd418bba999eb7eebcbceae5d565cbbd;hp=a7238b8244054d995c95adbfb210e8afdbc09195;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b diff --git a/hacks/glx/cubicgrid.c b/hacks/glx/cubicgrid.c index a7238b82..262b4e41 100644 --- a/hacks/glx/cubicgrid.c +++ b/hacks/glx/cubicgrid.c @@ -21,16 +21,18 @@ #define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ - "*wireframe: False \n" + "*wireframe: False \n" \ + "*suppressRotationAnimation: True\n" \ # define refresh_cubicgrid 0 +# define release_cubicgrid 0 #include "xlockmore.h" #ifdef USE_GL #define DEF_SPEED "1.0" #define DEF_DIV "30" -#define DEF_SIZE "20.0" +#define DEF_ZOOM "20" #define DEF_BIGDOTS "True" #undef countof @@ -48,7 +50,7 @@ static Bool bigdots; static argtype vars[] = { { &speed, "speed", "Speed", DEF_SPEED, t_Float }, - { &size, "zoom", "Zoom", DEF_SIZE, t_Float }, + { &size, "zoom", "Zoom", DEF_ZOOM, t_Float }, { &ticks, "ticks", "Ticks", DEF_DIV, t_Int }, { &bigdots, "bigdots", "BigDots", DEF_BIGDOTS, t_Bool }, }; @@ -65,7 +67,7 @@ ENTRYPOINT ModeSpecOpt cubicgrid_opts = {countof(opts), opts, countof(vars), var #ifdef USE_MODULES ModStruct cubicgrid_description = -{ "cubicgrid", "init_cubicgrid", "draw_cubicgrid", "release_cubicgrid", +{ "cubicgrid", "init_cubicgrid", "draw_cubicgrid", NULL, "draw_cubicgrid", "change_cubicgrid", NULL, &cubicgrid_opts, 25000, 1, 1, 1, 1.0, 4, "", "Shows a rotating 3D lattice from inside", 0, NULL @@ -80,6 +82,7 @@ typedef struct { rotator *rot; trackball_state *trackball; Bool button_down_p; + int npoints; } cubicgrid_conf; static cubicgrid_conf *cubicgrid = NULL; @@ -93,62 +96,49 @@ cubicgrid_handle_event (ModeInfo *mi, XEvent *event) { cubicgrid_conf *cp = &cubicgrid[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) - { - cp->button_down_p = True; - gltrackball_start (cp->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) - { - cp->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 (cp->trackball, event->xbutton.button, 2, - !!event->xbutton.state); - return True; - } - else if (event->xany.type == MotionNotify && - cp->button_down_p) - { - gltrackball_track (cp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } + if (gltrackball_event_handler (event, cp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &cp->button_down_p)) + return True; return False; } -static Bool draw_main(cubicgrid_conf *cp) +static Bool draw_main(ModeInfo *mi) { + cubicgrid_conf *cp = &cubicgrid[MI_SCREEN(mi)]; double x, y, z; glClear(GL_COLOR_BUFFER_BIT); glLoadIdentity(); + + glRotatef (180, 1, 0, 0); /* Make trackball track the right way */ + glRotatef (180, 0, 1, 0); + glTranslatef(0, 0, zpos); glScalef(size/ticks, size/ticks, size/ticks); + + +# 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, 1/h, 1); + } +# endif + gltrackball_rotate (cp->trackball); + get_rotation (cp->rot, &x, &y, &z, !cp->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 (-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(-ticks/2.0, -ticks/2.0, -ticks/2.0); glCallList(cp->list); - return True; } @@ -158,7 +148,6 @@ static void init_gl(ModeInfo *mi) int x, y, z; float tf = ticks; - glClearColor(0.0, 0.0, 0.0, 1.0); glDrawBuffer(GL_BACK); if(bigdots) { glPointSize(2.0); @@ -175,6 +164,7 @@ static void init_gl(ModeInfo *mi) for(y = 0; y < ticks; y++) { for(z = 0; z < ticks; z++) { glVertex3f(x, y, z); + cp->npoints++; } } } @@ -188,6 +178,7 @@ static void init_gl(ModeInfo *mi) for(z = 0; z < ticks; z++) { glColor3f(x/tf, y/tf, z/tf); glVertex3f(x, y, z); + cp->npoints++; } } } @@ -211,29 +202,10 @@ ENTRYPOINT void reshape_cubicgrid(ModeInfo *mi, int width, int height) glClear(GL_COLOR_BUFFER_BIT); } -ENTRYPOINT void release_cubicgrid(ModeInfo *mi) -{ - if (cubicgrid != NULL) { - int screen; - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - cubicgrid_conf *cp = &cubicgrid[screen]; - if (cp->glx_context) { - cp->glx_context = NULL; - } - } - free((void *)cubicgrid); - cubicgrid = NULL; - } - FreeAllGL(mi); -} - ENTRYPOINT void init_cubicgrid(ModeInfo *mi) { cubicgrid_conf *cp; - if(!cubicgrid) { - cubicgrid = (cubicgrid_conf *)calloc(MI_NUM_SCREENS(mi), sizeof(cubicgrid_conf)); - if(!cubicgrid) return; - } + MI_INIT(mi, cubicgrid, NULL); cp = &cubicgrid[MI_SCREEN(mi)]; if ((cp->glx_context = init_GL(mi)) != NULL) { @@ -249,7 +221,7 @@ ENTRYPOINT void init_cubicgrid(ModeInfo *mi) cp->rot = make_rotator (spin_speed, spin_speed, spin_speed, spin_accel, 0, True); - cp->trackball = gltrackball_init (); + cp->trackball = gltrackball_init (True); } } @@ -263,10 +235,11 @@ ENTRYPOINT void draw_cubicgrid(ModeInfo * mi) MI_IS_DRAWN(mi) = True; if (!cp->glx_context) return; glXMakeCurrent(display, window, *(cp->glx_context)); - if (!draw_main(cp)) { - release_cubicgrid(mi); + if (!draw_main(mi)) { + MI_ABORT(mi); return; } + mi->polygon_count = cp->npoints; if (MI_IS_FPS(mi)) do_fps (mi); glFlush(); glXSwapBuffers(display, window);