X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fdangerball.c;h=ec39fbe34f0b59dfb9ea279453137c6481faae55;hp=746b7b2415edeef6909a2d8b2454b0d306ebe5f8;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=cccbddbc4140cf9a06d7d95cc5c0ca36eb5d6e28 diff --git a/hacks/glx/dangerball.c b/hacks/glx/dangerball.c index 746b7b24..ec39fbe3 100644 --- a/hacks/glx/dangerball.c +++ b/hacks/glx/dangerball.c @@ -1,4 +1,4 @@ -/* dangerball, Copyright (c) 2001, 2002 Jamie Zawinski +/* dangerball, Copyright (c) 2001-2017 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,35 +9,14 @@ * implied warranty. */ -#include - -extern XtAppContext app; - -#define PROGCLASS "DangerBall" -#define HACK_INIT init_ball -#define HACK_DRAW draw_ball -#define HACK_RESHAPE reshape_ball -#define sws_opts xlockmore_opts - -#define DEF_SPIN "True" -#define DEF_WANDER "True" -#define DEF_SPEED "0.05" - #define DEFAULTS "*delay: 30000 \n" \ "*count: 30 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ - "*speed: " DEF_SPEED " \n" \ - "*spin: " DEF_SPIN "\n" \ - "*wander: " DEF_WANDER "\n" \ - - -#define SPIKE_FACES 12 /* how densely to render spikes */ -#define SMOOTH_SPIKES True -#define SPHERE_SLICES 32 /* how densely to render spheres */ -#define SPHERE_STACKS 16 - + "*suppressRotationAnimation: True\n" \ +# define refresh_ball 0 +# define release_ball 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -45,19 +24,28 @@ extern XtAppContext app; #include "colors.h" #include "sphere.h" #include "tube.h" +#include "rotator.h" +#include "gltrackball.h" #include #ifdef USE_GL /* whole file */ -#include + +#define DEF_SPIN "True" +#define DEF_WANDER "True" +#define DEF_SPEED "0.05" + +#define SPIKE_FACES 12 /* how densely to render spikes */ +#define SMOOTH_SPIKES True +#define SPHERE_SLICES 32 /* how densely to render spheres */ +#define SPHERE_STACKS 16 + typedef struct { GLXContext *glx_context; - - GLfloat rotx, roty, rotz; /* current object rotation */ - GLfloat dx, dy, dz; /* current rotational velocity */ - GLfloat ddx, ddy, ddz; /* current rotational acceleration */ - GLfloat d_max; /* max velocity */ + rotator *rot; + trackball_state *trackball; + Bool button_down_p; GLuint ball_list; GLuint spike_list; @@ -74,7 +62,7 @@ typedef struct { static ball_configuration *bps = NULL; -static char *do_spin; +static Bool do_spin; static GLfloat speed; static Bool do_wander; @@ -87,17 +75,17 @@ static XrmOptionDescRec opts[] = { }; 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}, + {&do_spin, "spin", "Spin", DEF_SPIN, t_Bool}, + {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, + {&speed, "speed", "Speed", DEF_SPEED, t_Float}, }; -ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL}; +ENTRYPOINT ModeSpecOpt ball_opts = {countof(opts), opts, countof(vars), vars, NULL}; /* Window management, etc */ -void +ENTRYPOINT void reshape_ball (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; @@ -106,87 +94,23 @@ reshape_ball (ModeInfo *mi, int width, int height) glMatrixMode(GL_PROJECTION); glLoadIdentity(); + gluPerspective (30.0, 1/h, 1.0, 100.0); - gluPerspective( 30.0, 1/h, 1.0, 100.0 ); - gluLookAt( 0.0, 0.0, 15.0, - 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glTranslatef(0.0, 0.0, -15.0); - - glClear(GL_COLOR_BUFFER_BIT); -} - - -/* lifted from lament.c */ -#define RAND(n) ((long) ((random() & 0x7fffffff) % ((long) (n)))) -#define RANDSIGN() ((random() & 1) ? 1 : -1) - -static void -rotate(GLfloat *pos, GLfloat *v, GLfloat *dv, GLfloat max_v) -{ - double ppos = *pos; - - /* tick position */ - if (ppos < 0) - ppos = -(ppos + *v); - else - ppos += *v; - - if (ppos > 1.0) - ppos -= 1.0; - else if (ppos < 0) - ppos += 1.0; - - if (ppos < 0) abort(); - if (ppos > 1.0) abort(); - *pos = (*pos > 0 ? ppos : -ppos); - - /* accelerate */ - *v += *dv; - - /* clamp velocity */ - if (*v > max_v || *v < -max_v) - { - *dv = -*dv; - } - /* If it stops, start it going in the other direction. */ - else if (*v < 0) - { - if (random() % 4) - { - *v = 0; - - /* keep going in the same direction */ - if (random() % 2) - *dv = 0; - else if (*dv < 0) - *dv = -*dv; - } - else - { - /* reverse gears */ - *v = -*v; - *dv = -*dv; - *pos = -*pos; - } - } + gluLookAt( 0.0, 0.0, 30.0, + 0.0, 0.0, 0.0, + 0.0, 1.0, 0.0); - /* Alter direction of rotational acceleration randomly. */ - if (! (random() % 120)) - *dv = -*dv; +# 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 - /* Change acceleration very occasionally. */ - if (! (random() % 200)) - { - if (*dv == 0) - *dv = 0.00001; - else if (random() & 1) - *dv *= 1.2; - else - *dv *= 0.8; - } + glClear(GL_COLOR_BUFFER_BIT); } @@ -234,6 +158,8 @@ draw_spikes (ModeInfo *mi) glScalef (diam, pos, diam); glCallList (bp->spike_list); glPopMatrix(); + + mi->polygon_count += (SPIKE_FACES + 1); } } @@ -258,23 +184,27 @@ move_spikes (ModeInfo *mi) } -void +ENTRYPOINT Bool +ball_handle_event (ModeInfo *mi, XEvent *event) +{ + ball_configuration *bp = &bps[MI_SCREEN(mi)]; + + if (gltrackball_event_handler (event, bp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &bp->button_down_p)) + return True; + + return False; +} + + +ENTRYPOINT void init_ball (ModeInfo *mi) { ball_configuration *bp; int wire = MI_IS_WIREFRAME(mi); - if (!bps) { - bps = (ball_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (ball_configuration)); - if (!bps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - - bp = &bps[MI_SCREEN(mi)]; - } - + MI_INIT (mi, bps, 0); bp = &bps[MI_SCREEN(mi)]; bp->glx_context = init_GL(mi); @@ -299,20 +229,19 @@ init_ball (ModeInfo *mi) glLightfv(GL_LIGHT0, GL_SPECULAR, spc); } - bp->rotx = frand(1.0) * RANDSIGN(); - bp->roty = frand(1.0) * RANDSIGN(); - bp->rotz = frand(1.0) * RANDSIGN(); - - /* bell curve from 0-6 degrees, avg 3 */ - bp->dx = (frand(2) + frand(2) + frand(2)) / (360/2); - bp->dy = (frand(2) + frand(2) + frand(2)) / (360/2); - bp->dz = (frand(2) + frand(2) + frand(2)) / (360/2); - - bp->d_max = bp->dx * 2; - - bp->ddx = 0.00006 + frand(0.00003); - bp->ddy = 0.00006 + frand(0.00003); - bp->ddz = 0.00006 + frand(0.00003); + { + double spin_speed = 10.0; + double wander_speed = 0.12; + double spin_accel = 2.0; + + bp->rot = make_rotator (do_spin ? spin_speed : 0, + do_spin ? spin_speed : 0, + do_spin ? spin_speed : 0, + spin_accel, + do_wander ? wander_speed : 0, + True); + bp->trackball = gltrackball_init (True); + } bp->ncolors = 128; bp->colors = (XColor *) calloc(bp->ncolors, sizeof(XColor)); @@ -332,14 +261,14 @@ init_ball (ModeInfo *mi) glNewList (bp->spike_list, GL_COMPILE); cone (0, 0, 0, 0, 1, 0, - 1, 0, SPIKE_FACES, SMOOTH_SPIKES, wire); + 1, 0, SPIKE_FACES, SMOOTH_SPIKES, False, wire); glEndList (); randomize_spikes (mi); } -void +ENTRYPOINT void draw_ball (ModeInfo *mi) { ball_configuration *bp = &bps[MI_SCREEN(mi)]; @@ -347,20 +276,19 @@ draw_ball (ModeInfo *mi) Window window = MI_WINDOW(mi); int c2; - /* #### I'm not getting specular reflections on the ball, - and I can't figure out why. - */ + static const GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; + static const GLfloat sspec[4] = {0.0, 0.0, 0.0, 1.0}; + static const GLfloat bshiny = 128.0; + static const GLfloat sshiny = 0.0; - static GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0}; - static GLfloat scolor[4] = {0.0, 0.0, 0.0, 1.0}; - static GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; - static GLfloat sspec[4] = {0.0, 0.0, 0.0, 1.0}; - static GLfloat bshiny = 128.0; - static GLfloat sshiny = 0.0; + GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0}; + GLfloat scolor[4] = {0.0, 0.0, 0.0, 1.0}; if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); + glShadeModel(GL_SMOOTH); glEnable(GL_DEPTH_TEST); @@ -374,39 +302,18 @@ draw_ball (ModeInfo *mi) glScalef(1.1, 1.1, 1.1); { - GLfloat x, y, z; - - if (do_wander) - { - static int frame = 0; - -# define SINOID(SCALE,SIZE) \ - ((((1 + sin((frame * (SCALE)) / 2 * M_PI)) / 2.0) * (SIZE)) - (SIZE)/2) - - x = SINOID(0.051, 8.0); - y = SINOID(0.037, 8.0); - z = SINOID(0.131, 13.0); - frame++; - glTranslatef(x, y, z); - } - - if (do_spin) - { - x = bp->rotx; - y = bp->roty; - z = bp->rotz; - if (x < 0) x = 1 - (x + 1); - if (y < 0) y = 1 - (y + 1); - if (z < 0) z = 1 - (z + 1); - - 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); - - rotate(&bp->rotx, &bp->dx, &bp->ddx, bp->d_max); - rotate(&bp->roty, &bp->dy, &bp->ddy, bp->d_max); - rotate(&bp->rotz, &bp->dz, &bp->ddz, bp->d_max); - } + double x, y, z; + get_position (bp->rot, &x, &y, &z, !bp->button_down_p); + glTranslatef((x - 0.5) * 8, + (y - 0.5) * 8, + (z - 0.5) * 15); + + gltrackball_rotate (bp->trackball); + + get_rotation (bp->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); } bcolor[0] = bp->colors[bp->ccolor].red / 65536.0; @@ -421,6 +328,8 @@ draw_ball (ModeInfo *mi) bp->ccolor++; if (bp->ccolor >= bp->ncolors) bp->ccolor = 0; + mi->polygon_count = 0; + glScalef (2.0, 2.0, 2.0); move_spikes (mi); @@ -429,6 +338,7 @@ draw_ball (ModeInfo *mi) glMateriali (GL_FRONT, GL_SHININESS, bshiny); glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, bcolor); glCallList (bp->ball_list); + mi->polygon_count += (SPHERE_SLICES * SPHERE_STACKS); glMaterialfv (GL_FRONT, GL_SPECULAR, sspec); glMaterialf (GL_FRONT, GL_SHININESS, sshiny); @@ -442,4 +352,6 @@ draw_ball (ModeInfo *mi) glXSwapBuffers(dpy, window); } +XSCREENSAVER_MODULE_2 ("DangerBall", dangerball, ball) + #endif /* USE_GL */