X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fpolyhedra-gl.c;h=a46453348f6ba7b861ee65f26f7a4a0e1cfdb149;hp=83e4a38164a19d2f067fd18d21214cd52e1c099e;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21 diff --git a/hacks/glx/polyhedra-gl.c b/hacks/glx/polyhedra-gl.c index 83e4a381..a4645334 100644 --- a/hacks/glx/polyhedra-gl.c +++ b/hacks/glx/polyhedra-gl.c @@ -1,4 +1,4 @@ -/* polyhedra, Copyright (c) 2004-2011 Jamie Zawinski +/* polyhedra, Copyright (c) 2004-2014 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 @@ -18,9 +18,10 @@ #define DEFAULTS "*delay: 30000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ - "*titleFont: -*-helvetica-medium-r-normal-*-140-*\n" \ - "*titleFont2: -*-helvetica-medium-r-normal-*-100-*\n" \ - "*titleFont3: -*-helvetica-medium-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" \ + "*suppressRotationAnimation: True\n" \ # define refresh_polyhedra 0 @@ -30,6 +31,17 @@ #include "xlockmore.h" +#ifdef HAVE_JWXYZ +# include "jwxyz.h" +#else +# include +# include +# include +#endif + +#ifdef HAVE_JWZGLES +# include "jwzgles.h" +#endif /* HAVE_JWZGLES */ #define DEF_SPIN "True" #define DEF_WANDER "True" @@ -38,7 +50,7 @@ #define DEF_DURATION "12" #define DEF_WHICH "random" -#include "glxfonts.h" +#include "texfont.h" #include "normals.h" #include "polyhedra.h" #include "colors.h" @@ -46,11 +58,16 @@ #include "gltrackball.h" #include "teapot.h" -#ifndef HAVE_COCOA +#ifndef HAVE_JWXYZ # define XK_MISCELLANY # include #endif +#ifndef HAVE_JWZGLES +# define HAVE_TESS +#endif + + #ifdef USE_GL /* whole file */ typedef struct { @@ -65,7 +82,6 @@ typedef struct { int which; int change_to; GLuint object_list; - GLuint title_list; int mode; /* 0 = normal, 1 = out, 2 = in */ int mode_tick; @@ -73,8 +89,7 @@ typedef struct { int ncolors; XColor *colors; - XFontStruct *xfont1, *xfont2, *xfont3; - GLuint font1_dlist, font2_dlist, font3_dlist; + texture_font_data *font1_data, *font2_data, *font3_data; time_t last_change_time; int change_tick; @@ -156,9 +171,9 @@ static void load_fonts (ModeInfo *mi) { polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; - load_font (mi->dpy, "titleFont", &bp->xfont1, &bp->font1_dlist); - load_font (mi->dpy, "titleFont2", &bp->xfont2, &bp->font2_dlist); - load_font (mi->dpy, "titleFont3", &bp->xfont3, &bp->font3_dlist); + bp->font1_data = load_texture_font (mi->dpy, "titleFont"); + bp->font2_data = load_texture_font (mi->dpy, "titleFont2"); + bp->font3_data = load_texture_font (mi->dpy, "titleFont3"); } @@ -168,12 +183,12 @@ startup_blurb (ModeInfo *mi) { polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; const char *s = "Computing polyhedra..."; + texture_font_data *f = bp->font1_data; + 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, 0) + 40), - mi->xgwa.height - 10, - s, False); + print_texture_label (mi->dpy, f, + mi->xgwa.width, mi->xgwa.height, + 0, s); glFinish(); glXSwapBuffers(MI_DISPLAY(mi), MI_WINDOW(mi)); } @@ -182,8 +197,6 @@ startup_blurb (ModeInfo *mi) /* Window management, etc */ -static void new_label (ModeInfo *mi); - ENTRYPOINT void reshape_polyhedra (ModeInfo *mi, int width, int height) { @@ -202,9 +215,6 @@ reshape_polyhedra (ModeInfo *mi, int width, int height) 0.0, 1.0, 0.0); glClear(GL_COLOR_BUFFER_BIT); - - /* need to re-render the text when the window size changes */ - new_label (mi); } @@ -213,63 +223,36 @@ polyhedra_handle_event (ModeInfo *mi, XEvent *event) { polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) - { - bp->button_down_p = True; - gltrackball_start (bp->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) - { - bp->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 (bp->trackball, event->xbutton.button, 10, - !!event->xbutton.state); - return True; - } + if (gltrackball_event_handler (event, bp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &bp->button_down_p)) + return True; else if (event->xany.type == KeyPress) { KeySym keysym; 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 == '=' || - keysym == XK_Right || keysym == XK_Up) + keysym == XK_Right || keysym == XK_Up || keysym == XK_Next) bp->change_to = (bp->which + 1) % bp->npolyhedra; else if (c == '<' || c == ',' || c == '-' || c == '_' || c == '\010' || c == '\177' || - keysym == XK_Left || keysym == XK_Down) + keysym == XK_Left || keysym == XK_Down || keysym == XK_Prior) bp->change_to = (bp->which + bp->npolyhedra - 1) % bp->npolyhedra; + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + goto DEF; if (bp->change_to != -1) return True; } - else if (event->xany.type == MotionNotify && - bp->button_down_p) + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) { - gltrackball_track (bp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); + DEF: + bp->change_to = random() % bp->npolyhedra; return True; } @@ -278,65 +261,63 @@ polyhedra_handle_event (ModeInfo *mi, XEvent *event) static void -new_label (ModeInfo *mi) +draw_label (ModeInfo *mi) { polyhedra_configuration *bp = &bps[MI_SCREEN(mi)]; polyhedron *p = bp->which >= 0 ? bp->polyhedra[bp->which] : 0; + char label[1024]; + char name2[255]; + GLfloat color[4] = { 0.8, 0.8, 0.8, 1 }; + texture_font_data *f; + + if (!p || !do_titles) return; + + strcpy (name2, p->name); + if (*p->class) + sprintf (name2 + strlen(name2), " (%s)", p->class); + + sprintf (label, + "Polyhedron %d: \t%s\n\n" + "Wythoff Symbol:\t%s\n" + "Vertex Configuration:\t%s\n" + "Symmetry Group:\t%s\n" + /* "Dual of: \t%s\n" */ + "\n" + "Faces:\t %d\n" + "Edges:\t %d\n" + "Vertices:\t %d\n" + "Density:\t %d\n" + "Euler:\t%s%d\n", + bp->which, name2, p->wythoff, p->config, p->group, + /* p->dual, */ + p->logical_faces, p->nedges, p->logical_vertices, + p->density, (p->chi < 0 ? "" : " "), p->chi); + + if (MI_WIDTH(mi) >= 500 && MI_HEIGHT(mi) >= 375) + f = bp->font1_data; + else if (MI_WIDTH(mi) >= 350 && MI_HEIGHT(mi) >= 260) + f = bp->font2_data; /* small font */ + else + f = bp->font3_data; /* tiny font */ - glNewList (bp->title_list, GL_COMPILE); - if (p && do_titles) - { - char label[1024]; - char name2[255]; - strcpy (name2, p->name); - if (*p->class) - sprintf (name2 + strlen(name2), " (%s)", p->class); - - sprintf (label, - "Polyhedron %d: \t%s\n\n" - "Wythoff Symbol:\t%s\n" - "Vertex Configuration:\t%s\n" - "Symmetry Group:\t%s\n" - /* "Dual of: \t%s\n" */ - "\n" - "Faces:\t %d\n" - "Edges:\t %d\n" - "Vertices:\t %d\n" - "Density:\t %d\n" - "Euler:\t%s%d\n", - bp->which, name2, p->wythoff, p->config, p->group, - /* p->dual, */ - p->logical_faces, p->nedges, p->logical_vertices, - p->density, (p->chi < 0 ? "" : " "), p->chi); - - { - XFontStruct *f; - GLuint fl; - if (MI_WIDTH(mi) >= 500 && MI_HEIGHT(mi) >= 375) - f = bp->xfont1, fl = bp->font1_dlist; /* big font */ - else if (MI_WIDTH(mi) >= 350 && MI_HEIGHT(mi) >= 260) - f = bp->xfont2, fl = bp->font2_dlist; /* small font */ - else - f = bp->xfont3, fl = bp->font3_dlist; /* tiny font */ - - glColor3f (0.8, 0.8, 0); - print_gl_string (mi->dpy, f, fl, - mi->xgwa.width, mi->xgwa.height, - 10, mi->xgwa.height - 10, - label, False); - } - } - glEndList (); + glColor4fv (color); + glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, color); + print_texture_label (mi->dpy, f, + mi->xgwa.width, mi->xgwa.height, + 1, label); } +#ifdef HAVE_TESS static void tess_error (GLenum errorCode) { fprintf (stderr, "%s: tesselation error: %s\n", progname, gluErrorString(errorCode)); - exit (0); + abort(); } +#endif /* HAVE_TESS */ + static void new_polyhedron (ModeInfo *mi) @@ -349,11 +330,13 @@ new_polyhedron (ModeInfo *mi) /* Use the GLU polygon tesselator so that nonconvex faces are displayed correctly (e.g., for the "pentagrammic concave deltohedron"). */ +# ifdef HAVE_TESS GLUtesselator *tobj = gluNewTess(); gluTessCallback (tobj, GLU_TESS_BEGIN, (void (*) (void)) &glBegin); gluTessCallback (tobj, GLU_TESS_END, (void (*) (void)) &glEnd); gluTessCallback (tobj, GLU_TESS_VERTEX, (void (*) (void)) &glVertex3dv); gluTessCallback (tobj, GLU_TESS_ERROR, (void (*) (void)) &tess_error); +# endif /* HAVE_TESS */ mi->polygon_count = 0; @@ -372,18 +355,26 @@ new_polyhedron (ModeInfo *mi) bp->change_to = -1; p = bp->polyhedra[bp->which]; - new_label (mi); - if (wire) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glNewList (bp->object_list, GL_COMPILE); if (bp->which == bp->npolyhedra-1) { + GLfloat bcolor[4]; + bcolor[0] = bp->colors[0].red / 65536.0; + bcolor[1] = bp->colors[0].green / 65536.0; + bcolor[2] = bp->colors[0].blue / 65536.0; + bcolor[3] = 1.0; + if (wire) + glColor3f (0, 1, 0); + else + glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, bcolor); + 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->nedges = p->nfaces * 3 / 2; + p->npoints = p->nfaces * 3; p->logical_faces = p->nfaces; p->logical_vertices = p->npoints; } @@ -404,12 +395,13 @@ new_polyhedron (ModeInfo *mi) 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; + bcolor[3] = 1.0; glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, bcolor); } kludge_normal (f->npoints, f->points, p->points); +# ifdef HAVE_TESS gluTessBeginPolygon (tobj, 0); gluTessBeginContour (tobj); for (j = 0; j < f->npoints; j++) @@ -419,12 +411,26 @@ new_polyhedron (ModeInfo *mi) } gluTessEndContour (tobj); gluTessEndPolygon (tobj); +# else /* !HAVE_TESS */ + glBegin (wire ? GL_LINE_LOOP : + f->npoints == 3 ? GL_TRIANGLES : + f->npoints == 4 ? GL_QUADS : + GL_POLYGON); + for (j = 0; j < f->npoints; j++) + { + point *pp = &p->points[f->points[j]]; + glVertex3f (pp->x, pp->y, pp->z); + } + glEnd(); +# endif /* !HAVE_TESS */ } } glEndList (); mi->polygon_count += p->nfaces; +# ifdef HAVE_TESS gluDeleteTess (tobj); +# endif } @@ -451,14 +457,12 @@ init_polyhedra (ModeInfo *mi) polyhedra_configuration *bp; int wire = MI_IS_WIREFRAME(mi); - if (!bps) { - bps = (polyhedra_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (polyhedra_configuration)); - if (!bps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - } +# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */ + MI_IS_WIREFRAME(mi) = 0; + wire = 0; +# endif + + MI_INIT (mi, bps, NULL); bp = &bps[MI_SCREEN(mi)]; @@ -502,14 +506,13 @@ init_polyhedra (ModeInfo *mi) spin_accel, do_wander ? wander_speed : 0, True); - bp->trackball = gltrackball_init (); + bp->trackball = gltrackball_init (True); } bp->npolyhedra = construct_polyhedra (&bp->polyhedra); construct_teapot (mi); bp->object_list = glGenLists (1); - bp->title_list = glGenLists (1); bp->change_to = -1; { @@ -587,7 +590,7 @@ draw_polyhedra (ModeInfo *mi) if (!bp->button_down_p && now - bp->last_change_time >= duration) { bp->mode = 1; /* go out */ - bp->mode_tick = 20 * speed; + bp->mode_tick = 20 / speed; bp->last_change_time = now; } } @@ -597,7 +600,7 @@ draw_polyhedra (ModeInfo *mi) if (--bp->mode_tick <= 0) { new_polyhedron (mi); - bp->mode_tick = 20 * speed; + bp->mode_tick = 20 / speed; bp->mode = 2; /* go in */ } } @@ -616,6 +619,15 @@ draw_polyhedra (ModeInfo *mi) glPushMatrix (); +# 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 + glScalef(1.1, 1.1, 1.1); { @@ -641,15 +653,15 @@ draw_polyhedra (ModeInfo *mi) if (bp->mode != 0) { GLfloat s = (bp->mode == 1 - ? bp->mode_tick / (20 * speed) - : ((20 * speed) - bp->mode_tick + 1) / (20 * speed)); + ? bp->mode_tick / (20 / speed) + : ((20 / speed) - bp->mode_tick + 1) / (20 / speed)); glScalef (s, s, s); } glScalef (2, 2, 2); glCallList (bp->object_list); if (bp->mode == 0 && !bp->button_down_p) - glCallList (bp->title_list); + draw_label (mi); /* print_texture_font can't go inside a display list */ glPopMatrix ();