X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ftopblock.c;h=eed2fd54f775fa0522bbb19a2fcf54ed88613b02;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=7acd30a63597ce149fc81e5400e38eb738b9a76a;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver diff --git a/hacks/glx/topblock.c b/hacks/glx/topblock.c index 7acd30a6..eed2fd54 100644 --- a/hacks/glx/topblock.c +++ b/hacks/glx/topblock.c @@ -1,5 +1,4 @@ -/* topblock, Copyright (c) 2006-2009 - * rednuht +/* topblock, Copyright (c) 2006-2012 rednuht * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -42,14 +41,13 @@ History #include "xlockmore.h" #include "topblock.h" #include "sphere.h" +#include "tube.h" #include "gltrackball.h" #include #ifdef USE_GL /* whole file */ -#ifdef HAVE_COCOA -# include -#else +#ifndef HAVE_JWXYZ # include #endif @@ -74,22 +72,22 @@ typedef struct } topBlockSTATE; /* parameter vars */ -Bool override; -Bool rotate; -Bool follow; -Bool drawCarpet; -Bool drawBlob; -Bool drawNipples; -GLfloat rotateSpeed; -GLfloat camX; -GLfloat camY; -GLfloat camZ; -GLfloat dropSpeed; -int maxFalling; -int maxColors; -int size; -int spawn; -int resolution; +static Bool override; +static Bool rotate; +static Bool follow; +static Bool drawCarpet; +static Bool drawBlob; +static Bool drawNipples; +static GLfloat rotateSpeed; +static GLfloat camX; +static GLfloat camY; +static GLfloat camZ; +static GLfloat dropSpeed; +static int maxFalling; +static int maxColors; +static int size; +static int spawn; +static int resolution; static XrmOptionDescRec opts[] = { { "-size", ".size", XrmoptionSepArg, 0 }, @@ -149,7 +147,7 @@ static argtype vars[] = { static topBlockSTATE *tbs = NULL; -ModeSpecOpt topBlock_opts = {countof(opts), opts, countof(vars), vars, NULL}; +static ModeSpecOpt topBlock_opts = {countof(opts), opts, countof(vars), vars, NULL}; /* Window management, etc */ ENTRYPOINT void @@ -198,7 +196,7 @@ init_topBlock (ModeInfo *mi) reshape_topBlock (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); - if (wire) { drawNipples=False; } +/* if (wire) { drawNipples=False; }*/ tb->numFallingBlocks=0; if (size>10) { size = 10; } @@ -281,7 +279,7 @@ init_topBlock (ModeInfo *mi) tb->eyeY=20; tb->eyeZ=0; } - tb->trackball = gltrackball_init (); + tb->trackball = gltrackball_init (False); } /* provides the per frame entertainment */ @@ -310,6 +308,8 @@ draw_topBlock (ModeInfo *mi) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); /* clear current */ glLoadIdentity(); /* resets directions, do it every time ! */ + glRotatef(current_device_rotation(), 0, 0, 1); + if (!follow) { if (tb->highest>tb->eyeLine) { tb->eyeLine+=((tb->highest-tb->eyeLine)/100); } /* creates a smooth camera transition */ gluLookAt(camX, camY+tb->eyeLine, camZ, tb->eyeX, tb->eyeY+tb->eyeLine, tb->eyeZ, 0.0, 1.0, 0.0); /* setup viewer, xyz cam, xyz looking at and where is up normaly 0,1,0 */ @@ -318,13 +318,24 @@ draw_topBlock (ModeInfo *mi) glRotatef(90, 0.0, 0.0, 1.0); /* z axis */ followBlock(mi); } - glRotatef(-90, 1.0, 0.0, 0.0); - gltrackball_rotate (tb->trackball); - glRotatef(90, 1.0, 0.0, 0.0); + + /* Rotate the scene around a point that's a little higher up. */ + glTranslatef (0, 0, -5); + gltrackball_rotate (tb->trackball); + glTranslatef (0, 0, 5); /* rotate the world */ glRotatef(tb->rotation, 0.0, 0.0, 1.0); +# 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 + llCurrent = tb->blockNodeRoot; if (drawCarpet) { /* center carpet */ @@ -629,7 +640,6 @@ static void buildCarpet(ModeInfo *mi) GLfloat color[4]; int wire = MI_IS_WIREFRAME(mi); topBlockSTATE *tb = &tbs[MI_SCREEN(mi)]; - GLUquadricObj *quadratic; color[0] = 0.0f; color[1] = 1.0f; color[2] = 0.0f; @@ -651,8 +661,7 @@ static void buildCarpet(ModeInfo *mi) glVertex3f(x,y,0.0); glVertex3f(0.0,y,0.0); tb->carpet_polys++; - if (wire) { glEnd(); } - else { + if (!wire) { /* add edge pieces */ /* side 1 */ glNormal3f( 0, -1, 0 ); @@ -686,20 +695,18 @@ static void buildCarpet(ModeInfo *mi) glEnd(); /* nipples */ if (drawNipples) { - quadratic=gluNewQuadric(); /* Create A Pointer To The Quadric Object */ - gluQuadricNormals(quadratic, GLU_SMOOTH); /* Create Smooth Normals */ - gluQuadricTexture(quadratic, GL_TRUE); /* Create Texture Coords */ glTranslatef(0.5f,0.5f,-.25); /* move to the cylinder center */ for (c=0;ccarpet_polys += resolution*resolution; - glRotatef(180, 0.0f, 1.0f, 0.0f); /* they are upside down */ - gluDisk(quadratic, 0.0f, cylSize, resolution, resolution ); /* inner size (cd hole), outer size (radius), subdivisions radial, subdivisions circular */ - tb->carpet_polys += resolution*resolution; - glRotatef(180, 0.0f, 1.0f, 0.0f); /* recover */ - glTranslatef(0.0f,1.0f,0.0f); /* move to the next cylinder center (backward) */ + tb->carpet_polys += tube(0, 0, -0.1, + 0, 0, 0.26, + cylSize, 0, + resolution, True, True, + wire); + glRotatef(180, 0.0f, 1.0f, 0.0f); /* they are upside down */ + glRotatef(180, 0.0f, 1.0f, 0.0f); /* recover */ + glTranslatef(0.0f,1.0f,0.0f); /* move to the next cylinder center (backward) */ } glPopMatrix(); /* save state */ glTranslatef(1.0f,0.0f,0.0f); /* reset */ @@ -730,7 +737,6 @@ static void buildBlock(ModeInfo *mi) int i,c; int wire = MI_IS_WIREFRAME(mi); topBlockSTATE *tb = &tbs[MI_SCREEN(mi)]; - GLUquadricObj *quadratic; tb->block=glGenLists(1); /* only one */ glNewList(tb->block,GL_COMPILE); tb->block_polys=0; @@ -745,17 +751,16 @@ static void buildBlock(ModeInfo *mi) if (drawNipples) { /* nipples */ /* draw 8 cylinders each with a disk cap */ - quadratic=gluNewQuadric(); /* Create A Pointer To The Quadric Object */ - gluQuadricNormals(quadratic, GLU_SMOOTH); /* Create Smooth Normals */ glRotatef(90, 0.0f, 1.0f, 0.0f); /* 'aim' the pointer ready for the cylinder */ glTranslatef(0.5f,0.5f,0.99f); /* move to the cylinder center */ for (c=0;c<2;c++) { for (i=0;i<4;i++) { - gluCylinder(quadratic, cylSize, cylSize, 0.25f, resolution, resolution); /* quad, radius(bottom, radius(top), height, subdivisions (around Z), subdevisions (along Z) */ - tb->block_polys += resolution*resolution; + tb->block_polys += tube(0, 0, 0, + 0, 0, 0.25, + cylSize, 0, + resolution, True, True, + wire); glTranslatef(0.0f,0.0f,0.25f); /* move to the cylinder cap */ - gluDisk(quadratic, 0.0f, cylSize, resolution, resolution ); /* inner size (cd hole), outer size (radius), subdivisions radial, subdivisions circular */ - tb->block_polys += resolution*resolution; glTranslatef(0.0f,0.0f,-0.25f); /* move back from the cylinder cap */ if (c==0) { glTranslatef(0.0f,-1.0f,0.0f); /* move to the next cylinder center (forward) */ @@ -768,10 +773,13 @@ static void buildBlock(ModeInfo *mi) /* udders */ /* 3 cylinders on the underside */ glTranslatef(1.5f,-2.5f,-1.5f); /* move to the center, under the top of the brick */ + if (! wire) for (c=0;c<3;c++) { - gluCylinder(quadratic, uddSize, uddSize, 1.5f, resolution, resolution); /* quad, radius(bottom, radius(top), height, subdivisions (around Z), subdevisions (along Z) */ - tb->block_polys += resolution*resolution; - glTranslatef(0.0f,-1.0f,0.0f); /* move to the center */ + tb->block_polys += tube(0, 0, 0.1, + 0, 0, 1.4, + uddSize, 0, + resolution, True, True, wire); + glTranslatef(0.0f,-1.0f,0.0f); /* move to the center */ } } glPopMatrix(); /* restore state */ @@ -804,7 +812,12 @@ ENTRYPOINT Bool topBlock_handle_event (ModeInfo *mi, XEvent *event) { topBlockSTATE *tb = &tbs[MI_SCREEN(mi)]; - if (event->xany.type == KeyPress) { + + if (gltrackball_event_handler (event, tb->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &tb->button_down_p)) + return True; + else if (event->xany.type == KeyPress) { KeySym keysym; char c = 0; XLookupString (&event->xkey, &c, 1, &keysym, 0); @@ -849,40 +862,8 @@ topBlock_handle_event (ModeInfo *mi, XEvent *event) return True; } } - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) - { - tb->button_down_p = True; - gltrackball_start (tb->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) - { - tb->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 (tb->trackball, event->xbutton.button, 10, - !!event->xbutton.state); - return True; - } - else if (event->xany.type == MotionNotify && - tb->button_down_p) - { - gltrackball_track (tb->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } - return False; + + return False; } /* this is tha main change for v5 compatability and acompanying ENTRYPOINTS */