X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fpolyhedra-gl.c;h=fe3205fff41311e088b165a249bc0df4818c8674;hb=50be9bb40dc60130c99ffa568e6677779904ff70;hp=b693a55d1b5145fbd79c817a86910c740c4a3c62;hpb=2d04c4f22466851aedb6ed0f2919d148f726b889;p=xscreensaver diff --git a/hacks/glx/polyhedra-gl.c b/hacks/glx/polyhedra-gl.c index b693a55d..fe3205ff 100644 --- a/hacks/glx/polyhedra-gl.c +++ b/hacks/glx/polyhedra-gl.c @@ -1,4 +1,4 @@ -/* polyhedra, Copyright (c) 2004 Jamie Zawinski +/* polyhedra, Copyright (c) 2004-2008 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 @@ -15,43 +15,28 @@ * is in "polyhedra.c". */ -#include - -extern XtAppContext app; - -#define PROGCLASS "Polyhedra" -#define HACK_INIT init_polyhedra -#define HACK_DRAW draw_polyhedra -#define HACK_RESHAPE reshape_polyhedra -#define HACK_HANDLE_EVENT polyhedra_handle_event -#define EVENT_MASK PointerMotionMask -#define sws_opts xlockmore_opts - -#define DEF_SPIN "True" -#define DEF_WANDER "True" -#define DEF_SPEED "1.0" -#define DEF_TITLES "True" -#define DEF_DURATION "12" -#define DEF_WHICH "-1" - #define DEFAULTS "*delay: 30000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ - "*speed: " DEF_SPEED "\n" \ - "*spin: " DEF_SPIN "\n" \ - "*wander: " DEF_WANDER "\n" \ - "*duration: " DEF_DURATION "\n" \ - "*which: " DEF_WHICH "\n" \ - "*titleFont: -*-times-bold-r-normal-*-180-*\n" \ - "*titleFont2: -*-times-bold-r-normal-*-120-*\n" \ - "*titleFont3: -*-times-bold-r-normal-*-80-*\n" \ + "*titleFont: -*-helvetica-medium-r-normal-*-140-*\n" \ + "*titleFont2: -*-helvetica-medium-r-normal-*-100-*\n" \ + "*titleFont3: -*-helvetica-medium-r-normal-*-80-*\n" \ +# define refresh_polyhedra 0 +# define release_polyhedra 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) #include "xlockmore.h" -#include + + +#define DEF_SPIN "True" +#define DEF_WANDER "True" +#define DEF_SPEED "1.0" +#define DEF_TITLES "True" +#define DEF_DURATION "12" +#define DEF_WHICH "random" #include "glxfonts.h" #include "normals.h" @@ -59,11 +44,14 @@ extern XtAppContext app; #include "colors.h" #include "rotator.h" #include "gltrackball.h" -#include +#include "teapot.h" -#ifdef USE_GL /* whole file */ +#ifndef HAVE_COCOA +# define XK_MISCELLANY +# include +#endif -#include +#ifdef USE_GL /* whole file */ typedef struct { GLXContext *glx_context; @@ -88,6 +76,9 @@ typedef struct { XFontStruct *xfont1, *xfont2, *xfont3; GLuint font1_dlist, font2_dlist, font3_dlist; + time_t last_change_time; + int change_tick; + } polyhedra_configuration; static polyhedra_configuration *bps = NULL; @@ -121,7 +112,7 @@ static argtype vars[] = { {&do_which_str,"which", "Which", DEF_WHICH, t_String}, }; -ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL}; +ENTRYPOINT ModeSpecOpt polyhedra_opts = {countof(opts), opts, countof(vars), vars, NULL}; @@ -133,7 +124,7 @@ static void kludge_normal (int n, const int *indices, const point *points) { XYZ normal = { 0, 0, 0 }; - XYZ p; + XYZ p = { 0, 0, 0 }; int i; for (i = 0; i < n; ++i) { @@ -180,9 +171,9 @@ startup_blurb (ModeInfo *mi) glColor3f (0.8, 0.8, 0); print_gl_string (mi->dpy, bp->xfont1, bp->font1_dlist, mi->xgwa.width, mi->xgwa.height, - mi->xgwa.width - (string_width (bp->xfont1, s) + 40), + mi->xgwa.width - (string_width (bp->xfont1, s, 0) + 40), mi->xgwa.height - 10, - s); + s, False); glFinish(); glXSwapBuffers(MI_DISPLAY(mi), MI_WINDOW(mi)); } @@ -193,7 +184,7 @@ startup_blurb (ModeInfo *mi) */ static void new_label (ModeInfo *mi); -void +ENTRYPOINT void reshape_polyhedra (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; @@ -217,7 +208,7 @@ reshape_polyhedra (ModeInfo *mi, int width, int height) } -Bool +ENTRYPOINT Bool polyhedra_handle_event (ModeInfo *mi, XEvent *event) { polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; @@ -239,7 +230,9 @@ polyhedra_handle_event (ModeInfo *mi, XEvent *event) } else if (event->xany.type == ButtonPress && (event->xbutton.button == Button4 || - event->xbutton.button == Button5)) + event->xbutton.button == Button5 || + event->xbutton.button == Button6 || + event->xbutton.button == Button7)) { gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10, !!event->xbutton.state); @@ -251,13 +244,21 @@ polyhedra_handle_event (ModeInfo *mi, XEvent *event) char c = 0; XLookupString (&event->xkey, &c, 1, &keysym, 0); +# ifdef HAVE_COCOA +# define XK_Right -1 +# define XK_Left -1 +# define XK_Up -1 +# define XK_Down -1 +# endif bp->change_to = -1; if (c == ' ' || c == '\t' || c == '\r' || c == '\n') bp->change_to = random() % bp->npolyhedra; - else if (c == '>' || c == '.' || c == '+' || c == '=') + else if (c == '>' || c == '.' || c == '+' || c == '=' || + keysym == XK_Right || keysym == XK_Up) bp->change_to = (bp->which + 1) % bp->npolyhedra; else if (c == '<' || c == ',' || c == '-' || c == '_' || - c == '\010' || c == '\177') + c == '\010' || c == '\177' || + keysym == XK_Left || keysym == XK_Down) bp->change_to = (bp->which + bp->npolyhedra - 1) % bp->npolyhedra; if (bp->change_to != -1) @@ -322,7 +323,7 @@ new_label (ModeInfo *mi) print_gl_string (mi->dpy, f, fl, mi->xgwa.width, mi->xgwa.height, 10, mi->xgwa.height - 10, - label); + label, False); } } glEndList (); @@ -343,7 +344,6 @@ new_polyhedron (ModeInfo *mi) polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; polyhedron *p; int wire = MI_IS_WIREFRAME(mi); - static GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0}; int i; /* Use the GLU polygon tesselator so that nonconvex faces are displayed @@ -374,34 +374,52 @@ new_polyhedron (ModeInfo *mi) new_label (mi); + if (wire) + glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); + glNewList (bp->object_list, GL_COMPILE); - for (i = 0; i < p->nfaces; i++) + if (bp->which == bp->npolyhedra-1) { - int j; - face *f = &p->faces[i]; - - if (f->color > 64 || f->color < 0) abort(); - if (wire) - glColor3f (0, 1, 0); - else + glScalef (0.8, 0.8, 0.8); + p->nfaces = unit_teapot (6, wire); + p->nedges = p->nfaces * 2; /* #### is this right? */ + p->npoints = p->nfaces / 3; /* #### is this right? */ + p->logical_faces = p->nfaces; + p->logical_vertices = p->npoints; + } + else + { + glFrontFace (GL_CCW); + for (i = 0; i < p->nfaces; i++) { - bcolor[0] = bp->colors[f->color].red / 65536.0; - bcolor[1] = bp->colors[f->color].green / 65536.0; - bcolor[2] = bp->colors[f->color].blue / 65536.0; - glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, bcolor); - } + int j; + face *f = &p->faces[i]; - kludge_normal (f->npoints, f->points, p->points); + if (f->color > 64 || f->color < 0) abort(); + if (wire) + glColor3f (0, 1, 0); + else + { + GLfloat bcolor[4]; + bcolor[0] = bp->colors[f->color].red / 65536.0; + bcolor[1] = bp->colors[f->color].green / 65536.0; + bcolor[2] = bp->colors[f->color].blue / 65536.0; + bcolor[2] = 1.0; + glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, bcolor); + } + + kludge_normal (f->npoints, f->points, p->points); - gluTessBeginPolygon (tobj, 0); - gluTessBeginContour (tobj); - for (j = 0; j < f->npoints; j++) - { - point *pp = &p->points[f->points[j]]; - gluTessVertex (tobj, &pp->x, &pp->x); + gluTessBeginPolygon (tobj, 0); + gluTessBeginContour (tobj); + for (j = 0; j < f->npoints; j++) + { + point *pp = &p->points[f->points[j]]; + gluTessVertex (tobj, &pp->x, &pp->x); + } + gluTessEndContour (tobj); + gluTessEndPolygon (tobj); } - gluTessEndContour (tobj); - gluTessEndPolygon (tobj); } glEndList (); @@ -410,7 +428,24 @@ new_polyhedron (ModeInfo *mi) } -void +static void +construct_teapot (ModeInfo *mi) +{ + polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; + int n = bp->npolyhedra-1; + polyhedron *p = (polyhedron *) calloc (1, sizeof(*p)); + p->number = n; + p->wythoff = strdup("X00398|1984"); + p->name = strdup("Teapot"); + p->dual = strdup(""); + p->config = strdup("Melitta"); + p->group = strdup("Teapotahedral (Newell[1975])"); + p->class = strdup("Utah Teapotahedron"); + bp->polyhedra[n] = p; +} + + +ENTRYPOINT void init_polyhedra (ModeInfo *mi) { polyhedra_configuration *bp; @@ -423,8 +458,6 @@ init_polyhedra (ModeInfo *mi) fprintf(stderr, "%s: out of memory\n", progname); exit(1); } - - bp = &bps[MI_SCREEN(mi)]; } bp = &bps[MI_SCREEN(mi)]; @@ -435,8 +468,6 @@ init_polyhedra (ModeInfo *mi) load_fonts (mi); startup_blurb (mi); - reshape_polyhedra (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); - if (!wire) { GLfloat pos[4] = {1.0, 1.0, 1.0, 0.0}; @@ -475,6 +506,7 @@ init_polyhedra (ModeInfo *mi) } bp->npolyhedra = construct_polyhedra (&bp->polyhedra); + construct_teapot (mi); bp->object_list = glGenLists (1); bp->title_list = glGenLists (1); @@ -484,8 +516,17 @@ init_polyhedra (ModeInfo *mi) int x; char c; do_which = -1; - if (1 == sscanf (do_which_str, " %d %c", &x, &c)) - do_which = x; + if (!strcasecmp (do_which_str, "random")) + ; + else if (1 == sscanf (do_which_str, " %d %c", &x, &c)) + { + if (x >= 0 && x < bp->npolyhedra) + do_which = x; + else + fprintf (stderr, + "%s: polyhedron %d does not exist: there are only %d.\n", + progname, x, bp->npolyhedra-1); + } else if (*do_which_str) { char *s; @@ -494,6 +535,7 @@ init_polyhedra (ModeInfo *mi) for (x = 0; x < bp->npolyhedra; x++) if (!strcasecmp (do_which_str, bp->polyhedra[x]->name) || + !strcasecmp (do_which_str, bp->polyhedra[x]->class) || !strcasecmp (do_which_str, bp->polyhedra[x]->wythoff) || !strcasecmp (do_which_str, bp->polyhedra[x]->config)) { @@ -510,42 +552,42 @@ init_polyhedra (ModeInfo *mi) } new_polyhedron (mi); + reshape_polyhedra (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + } -void +ENTRYPOINT void draw_polyhedra (ModeInfo *mi) { polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; Display *dpy = MI_DISPLAY(mi); Window window = MI_WINDOW(mi); - static time_t last_time = 0; - - static GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; - static GLfloat bshiny = 128.0; + static const GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; + GLfloat bshiny = 128.0; if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); + if (bp->mode == 0 && do_which >= 0 && bp->change_to < 0) ; else if (bp->mode == 0) { - static int tick = 0; - if (bp->change_to >= 0) - tick = 999, last_time = 1; - if (tick++ > 10) + bp->change_tick = 999, bp->last_change_time = 1; + if (bp->change_tick++ > 10) { time_t now = time((time_t *) 0); - if (last_time == 0) last_time = now; - tick = 0; - if (!bp->button_down_p && now - last_time >= duration) + if (bp->last_change_time == 0) bp->last_change_time = now; + bp->change_tick = 0; + if (!bp->button_down_p && now - bp->last_change_time >= duration) { bp->mode = 1; /* go out */ bp->mode_tick = 20 * speed; - last_time = now; + bp->last_change_time = now; } } } @@ -616,4 +658,6 @@ draw_polyhedra (ModeInfo *mi) glXSwapBuffers(dpy, window); } +XSCREENSAVER_MODULE ("Polyhedra", polyhedra) + #endif /* USE_GL */