X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcage.c;h=654510d28e51f15f159e7a69965a4e8f1cbea6d9;hb=39809ded547bdbb08207d3e514950425215b4410;hp=9b781c90ebcc0c4a7437918ea912adb81e656de3;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c index 9b781c90..654510d2 100644 --- a/hacks/glx/cage.c +++ b/hacks/glx/cage.c @@ -79,10 +79,12 @@ static const char sccsid[] = "@(#)cage.c 5.01 2001/03/01 xlockmore"; # define MODE_cage # define DEFAULTS "*delay: 25000 \n" \ "*showFPS: False \n" \ - "*wireframe: False \n" -# define refresh_cage 0 -# define reshape_cage 0 -# define cage_handle_event 0 + "*wireframe: False \n" \ + "*suppressRotationAnimation: True\n" \ + +# define free_cage 0 +# define release_cage 0 +# define cage_handle_event xlockmore_no_events # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -90,14 +92,19 @@ static const char sccsid[] = "@(#)cage.c 5.01 2001/03/01 xlockmore"; #ifdef MODE_cage +#if 0 #include "e_textures.h" +#else +#include "xpm-ximage.h" +#include "../images/wood.xpm" +#endif ENTRYPOINT ModeSpecOpt cage_opts = {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL}; #ifdef USE_MODULES ModStruct cage_description = -{"cage", "init_cage", "draw_cage", "release_cage", +{"cage", "init_cage", "draw_cage", NULL, "draw_cage", "change_cage", (char *) NULL, &cage_opts, 25000, 1, 1, 1, 1.0, 4, "", "Shows the Impossible Cage, an Escher-like GL scene", 0, NULL}; @@ -142,7 +149,7 @@ static cagestruct *cage = (cagestruct *) NULL; #define PlankThickness 0.15 static Bool -draw_woodplank(cagestruct * cp, int wire) +draw_woodplank(ModeInfo *mi, cagestruct * cp, int wire) { glBegin(wire ? GL_LINES : GL_QUADS); glNormal3f(0, 0, 1); @@ -154,6 +161,7 @@ draw_woodplank(cagestruct * cp, int wire) glVertex3f(PlankWidth, PlankHeight, PlankThickness); glTexCoord2f(0, 1); glVertex3f(-PlankWidth, PlankHeight, PlankThickness); + mi->polygon_count++; glNormal3f(0, 0, -1); glTexCoord2f(0, 0); glVertex3f(-PlankWidth, PlankHeight, -PlankThickness); @@ -163,6 +171,7 @@ draw_woodplank(cagestruct * cp, int wire) glVertex3f(PlankWidth, -PlankHeight, -PlankThickness); glTexCoord2f(0, 1); glVertex3f(-PlankWidth, -PlankHeight, -PlankThickness); + mi->polygon_count++; glNormal3f(0, 1, 0); glTexCoord2f(0, 0); glVertex3f(-PlankWidth, PlankHeight, PlankThickness); @@ -172,6 +181,7 @@ draw_woodplank(cagestruct * cp, int wire) glVertex3f(PlankWidth, PlankHeight, -PlankThickness); glTexCoord2f(0, 1); glVertex3f(-PlankWidth, PlankHeight, -PlankThickness); + mi->polygon_count++; glNormal3f(0, -1, 0); glTexCoord2f(0, 0); glVertex3f(-PlankWidth, -PlankHeight, -PlankThickness); @@ -181,6 +191,7 @@ draw_woodplank(cagestruct * cp, int wire) glVertex3f(PlankWidth, -PlankHeight, PlankThickness); glTexCoord2f(0, 1); glVertex3f(-PlankWidth, -PlankHeight, PlankThickness); + mi->polygon_count++; glNormal3f(1, 0, 0); glTexCoord2f(0, 0); glVertex3f(PlankWidth, -PlankHeight, PlankThickness); @@ -190,6 +201,7 @@ draw_woodplank(cagestruct * cp, int wire) glVertex3f(PlankWidth, PlankHeight, -PlankThickness); glTexCoord2f(0, 1); glVertex3f(PlankWidth, PlankHeight, PlankThickness); + mi->polygon_count++; glNormal3f(-1, 0, 0); glTexCoord2f(0, 0); glVertex3f(-PlankWidth, PlankHeight, PlankThickness); @@ -199,92 +211,99 @@ draw_woodplank(cagestruct * cp, int wire) glVertex3f(-PlankWidth, -PlankHeight, -PlankThickness); glTexCoord2f(0, 1); glVertex3f(-PlankWidth, -PlankHeight, PlankThickness); + mi->polygon_count++; glEnd(); return True; } static Bool -draw_impossiblecage(cagestruct * cp, int wire) +draw_impossiblecage(ModeInfo *mi, cagestruct * cp, int wire) { glPushMatrix(); glRotatef(90, 0, 1, 0); glTranslatef(0.0, PlankHeight - PlankWidth, -PlankThickness - PlankWidth); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glRotatef(90, 0, 0, 1); glTranslatef(0.0, PlankHeight - PlankWidth, PlankWidth - PlankThickness); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glRotatef(90, 0, 1, 0); glTranslatef(0.0, PlankWidth - PlankHeight, -PlankThickness - PlankWidth); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankWidth - PlankHeight, 3 * PlankThickness - PlankWidth); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glRotatef(90, 0, 0, 1); glTranslatef(0.0, PlankWidth - PlankHeight, PlankWidth - PlankThickness); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankWidth - PlankHeight, PlankWidth - 3 * PlankThickness); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankHeight - PlankWidth, 3 * PlankThickness - PlankWidth); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glRotatef(90, 0, 0, 1); glTranslatef(0.0, PlankHeight - PlankWidth, PlankThickness - PlankWidth); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankHeight - PlankWidth, PlankWidth - 3 * PlankThickness); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glRotatef(90, 0, 1, 0); glTranslatef(0.0, PlankHeight - PlankWidth, PlankWidth + PlankThickness); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glRotatef(90, 0, 0, 1); glTranslatef(0.0, PlankWidth - PlankHeight, PlankThickness - PlankWidth); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glRotatef(90, 0, 1, 0); glTranslatef(0.0, PlankWidth - PlankHeight, PlankWidth + PlankThickness); - if (!draw_woodplank(cp, wire)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); return True; } static void -reshape(ModeInfo * mi, int width, int height) +reshape_cage(ModeInfo * mi, int width, int height) { cagestruct *cp = &cage[MI_SCREEN(mi)]; int i; + int y = 0; + + if (width > height * 5) { /* tiny window: show middle */ + height = width * 9/16; + y = -height/2; + } - glViewport(0, 0, cp->WindW = (GLint) width, cp->WindH = (GLint) height); + glViewport(0, y, cp->WindW = (GLint) width, cp->WindH = (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0); @@ -297,10 +316,7 @@ reshape(ModeInfo * mi, int width, int height) static void pinit(ModeInfo *mi) { - int status; - - glClearDepth(1.0); - glClearColor(0.0, 0.0, 0.0, 1.0); + /* int status; */ if (MI_IS_WIREFRAME(mi)) return; @@ -329,6 +345,7 @@ pinit(ModeInfo *mi) glPixelStorei(GL_UNPACK_ALIGNMENT, 1); +#if 0 clear_gl_error(); if (MI_IS_MONO(mi)) status = 0; @@ -344,6 +361,22 @@ pinit(ModeInfo *mi) exit (1); } check_gl_error("mipmapping"); +#else + { + XImage *img = xpm_to_ximage (mi->dpy, + mi->xgwa.visual, + mi->xgwa.colormap, + wood_texture); + glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, + img->width, img->height, 0, + GL_RGBA, + /* GL_UNSIGNED_BYTE, */ + GL_UNSIGNED_INT_8_8_8_8_REV, + img->data); + check_gl_error("texture"); + XDestroyImage (img); + } +#endif glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); @@ -355,41 +388,18 @@ pinit(ModeInfo *mi) glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular); } -ENTRYPOINT void -release_cage (ModeInfo * mi) -{ - if (cage != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - cagestruct *cp = &cage[screen]; - - if (cp->glx_context) { - cp->glx_context = (GLXContext *) NULL; - } - } - (void) free((void *) cage); - cage = (cagestruct *) NULL; - } - FreeAllGL(mi); -} - ENTRYPOINT void init_cage (ModeInfo * mi) { cagestruct *cp; - if (cage == NULL) { - if ((cage = (cagestruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (cagestruct))) == NULL) - return; - } + MI_INIT (mi, cage); cp = &cage[MI_SCREEN(mi)]; cp->step = NRAND(90); if ((cp->glx_context = init_GL(mi)) != NULL) { - reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + reshape_cage(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); glDrawBuffer(GL_BACK); pinit(mi); } else { @@ -412,12 +422,12 @@ draw_cage (ModeInfo * mi) if (!cp->glx_context) return; + mi->polygon_count = 0; glXMakeCurrent(display, window, *(cp->glx_context)); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glPushMatrix(); - glTranslatef(0.0, 0.0, -10.0); if (!MI_IS_ICONIC(mi)) { @@ -426,12 +436,24 @@ draw_cage (ModeInfo * mi) glScalef(Scale4Iconic * cp->WindH / cp->WindW, Scale4Iconic, Scale4Iconic); } +# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */ + { + int o = (int) current_device_rotation(); + GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi); + if (o != 0 && o != 180 && o != -180) { + glScalef (1/h, h, 1/h); /* #### not quite right */ + h = 1.7; + glScalef (h, h, h); + } + } +# endif + /* cage */ glRotatef(cp->step * 100, 0, 0, 1); glRotatef(25 + cos(cp->step * 5) * 6, 1, 0, 0); glRotatef(204.5 - sin(cp->step * 5) * 8, 0, 1, 0); - if (!draw_impossiblecage(cp, MI_IS_WIREFRAME(mi))) { - release_cage(mi); + if (!draw_impossiblecage(mi, cp, MI_IS_WIREFRAME(mi))) { + MI_ABORT(mi); return; }