X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Frubikblocks.c;h=1dbde24c010353f15a23d76973df1709d4c8c017;hb=39809ded547bdbb08207d3e514950425215b4410;hp=12282771d750338cbbb21df91cd88eb4693ca333;hpb=f0261d8acab611f3433160e4f07367b870439739;p=xscreensaver diff --git a/hacks/glx/rubikblocks.c b/hacks/glx/rubikblocks.c index 12282771..1dbde24c 100644 --- a/hacks/glx/rubikblocks.c +++ b/hacks/glx/rubikblocks.c @@ -19,9 +19,11 @@ #define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ - "*wireframe: False \n" + "*wireframe: False \n" \ + "*suppressRotationAnimation: True\n" \ -# define refresh_rubikblocks 0 +# define free_rubikblocks 0 +# define release_rubikblocks 0 #include "xlockmore.h" #include "rotator.h" #include "gltrackball.h" @@ -87,7 +89,7 @@ ENTRYPOINT ModeSpecOpt rubikblocks_opts = {countof(opts), opts, countof(vars), v #ifdef USE_MODULES ModStruct rubikblocks_description = -{ "rubikblocks", "init_rubikblocks", "draw_rubikblocks", "release_rubikblocks", +{ "rubikblocks", "init_rubikblocks", "draw_rubikblocks", NULL, "draw_rubikblocks", "change_rubikblocks", NULL, &rubikblocks_opts, 25000, 1, 1, 1, 1.0, 4, "", "Shows randomly shuffling Rubik's Mirror Blocks puzzle", 0, NULL @@ -128,7 +130,6 @@ static const GLfloat lmodel_ambient[] = {0.1, 0.1, 0.1, 1.0}; static const GLfloat material_ambient[] = {0.7, 0.7, 0.7, 1.0}; static const GLfloat material_diffuse[] = {0.7, 0.7, 0.7, 1.0}; static const GLfloat material_specular[] = {0.2, 0.2, 0.2, 1.0}; -static const GLfloat zpos = -18.0; /*************************************************************************/ @@ -260,15 +261,27 @@ draw_main(ModeInfo *mi, rubikblocks_conf *cp) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glLoadIdentity(); + get_position(cp->rot, &x, &y, &z, !cp->button_down); glTranslatef((x-0.5)*6, (y-0.5)*6, -20); + gltrackball_rotate(cp->trackball); + get_rotation(cp->rot, &x, &y, &z, !cp->button_down); glRotatef(x*360, 1, 0, 0); glRotatef(y*360, 0, 1, 0); glRotatef(z*360, 0, 0, 1); glScalef(size, size, size); +# 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/h); + } +# endif + if(cp->wire) glColor3f(0.7, 0.7, 0.7); if(!cp->pause) for(i = 0; i < 27; i++) @@ -431,6 +444,11 @@ init_gl(ModeInfo *mi) int status; #endif cp->wire = MI_IS_WIREFRAME(mi); + +# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */ + cp->wire = 0; +# endif + if(MI_IS_MONO(mi)) tex = False; if(cp->wire) { @@ -439,7 +457,6 @@ init_gl(ModeInfo *mi) } glClearDepth(1.0); - glClearColor(0.0, 0.0, 0.0, 1.0); glDrawBuffer(GL_BACK); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glShadeModel(GL_FLAT); @@ -462,7 +479,7 @@ init_gl(ModeInfo *mi) glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, material_diffuse); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, material_specular); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess); - if(!tex) return; + if (!tex) return; glEnable(GL_TEXTURE_2D); #ifdef MIPMAP clear_gl_error(); @@ -514,7 +531,7 @@ init_cp(rubikblocks_conf *cp) cp->rot = make_rotator(spin?spinspeed:0, spin?spinspeed:0, spin?spinspeed:0, 0.1, wander?wspeed:0, True); - cp->trackball = gltrackball_init(); + cp->trackball = gltrackball_init(True); if(rndstart) randomize(cp); } @@ -525,9 +542,15 @@ ENTRYPOINT void reshape_rubikblocks(ModeInfo *mi, int width, int height) { rubikblocks_conf *cp = &rubikblocks[MI_SCREEN(mi)]; + int y = 0; + + if (width > height * 5) { /* tiny window: show middle */ + height = width; + y = -height/2; + } if(!height) height = 1; cp->ratio = (GLfloat)width/(GLfloat)height; - glViewport(0, 0, (GLint) width, (GLint) height); + glViewport(0, y, (GLint) width, (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); gluPerspective(30.0, cp->ratio, 1.0, 100.0); @@ -535,34 +558,11 @@ reshape_rubikblocks(ModeInfo *mi, int width, int height) glClear(GL_COLOR_BUFFER_BIT); } -ENTRYPOINT void -release_rubikblocks(ModeInfo *mi) -{ - if (rubikblocks != NULL) - { - int screen; - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) - { - rubikblocks_conf *cp = &rubikblocks[screen]; - if (cp->glx_context) { - cp->glx_context = NULL; - } - } - free((void *)rubikblocks); - rubikblocks = NULL; - } - FreeAllGL(mi); -} - ENTRYPOINT void init_rubikblocks(ModeInfo *mi) { rubikblocks_conf *cp; - if(!rubikblocks) - { - rubikblocks = (rubikblocks_conf *)calloc(MI_NUM_SCREENS(mi), sizeof(rubikblocks_conf)); - if(!rubikblocks) return; - } + MI_INIT(mi, rubikblocks); cp = &rubikblocks[MI_SCREEN(mi)]; if(tex) @@ -595,7 +595,7 @@ draw_rubikblocks(ModeInfo * mi) glXMakeCurrent(display, window, *(cp->glx_context)); if (!draw_main(mi, cp)) { - release_rubikblocks(mi); + MI_ABORT(mi); return; } if (MI_IS_FPS(mi)) do_fps (mi); @@ -618,32 +618,12 @@ ENTRYPOINT Bool rubikblocks_handle_event (ModeInfo *mi, XEvent *event) { rubikblocks_conf *cp = &rubikblocks[MI_SCREEN(mi)]; - if(event->xany.type == ButtonPress && event->xbutton.button == Button1) - { - cp->button_down = 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 = 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, 5, !!event->xbutton.state); - return True; - } - else if(event->xany.type == MotionNotify && cp->button_down) - { - gltrackball_track(cp->trackball, event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); + + if (gltrackball_event_handler (event, cp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &cp->button_down)) return True; - } + return False; }