X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcage.c;h=becbec5bc3a0b066269dca3dc691ae35e011900f;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=f8965441807b8df00729e9bccc77df8644725a36;hpb=3f9592851ce4ed76a9979bfdd6ec7dc5c457e183;p=xscreensaver diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c index f8965441..becbec5b 100644 --- a/hacks/glx/cage.c +++ b/hacks/glx/cage.c @@ -1,9 +1,8 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* cage --- the Impossible Cage, an Escher like scene. */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)cage.c 5.01 2001/03/01 xlockmore"; - #endif /*- @@ -76,37 +75,25 @@ static const char sccsid[] = "@(#)cage.c 5.01 2001/03/01 xlockmore"; * In real OpenGL, PseudoColor DO NOT support texture map (as far as I know). */ -#ifdef VMS -/*- - * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock. - * otherwise caddr_t is not defined correctly - */ -#include -#endif - #ifdef STANDALONE # define MODE_cage -# define PROGCLASS "Cage" -# define HACK_INIT init_cage -# define HACK_DRAW draw_cage -# define HACK_RESHAPE reshape -# define cage_opts xlockmore_opts # define DEFAULTS "*delay: 25000 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" + +# define refresh_cage 0 +# define reshape_cage 0 +# define cage_handle_event 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ - #endif /* !STANDALONE */ #ifdef MODE_cage - -#include #include "e_textures.h" -ModeSpecOpt cage_opts = +ENTRYPOINT ModeSpecOpt cage_opts = {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL}; #ifdef USE_MODULES @@ -138,25 +125,16 @@ typedef struct { GLXContext *glx_context; } cagestruct; -static float front_shininess[] = -{60.0}; -static float front_specular[] = -{0.7, 0.7, 0.7, 1.0}; -static float ambient[] = -{0.0, 0.0, 0.0, 1.0}; -static float diffuse[] = -{1.0, 1.0, 1.0, 1.0}; -static float position0[] = -{1.0, 1.0, 1.0, 0.0}; -static float position1[] = -{-1.0, -1.0, 1.0, 0.0}; -static float lmodel_ambient[] = -{0.5, 0.5, 0.5, 1.0}; -static float lmodel_twoside[] = -{GL_TRUE}; - -static float MaterialWhite[] = -{0.7, 0.7, 0.7, 1.0}; +static const float front_shininess[] = {60.0}; +static const float front_specular[] = {0.7, 0.7, 0.7, 1.0}; +static const float ambient[] = {0.0, 0.0, 0.0, 1.0}; +static const float diffuse[] = {1.0, 1.0, 1.0, 1.0}; +static const float position0[] = {1.0, 1.0, 1.0, 0.0}; +static const float position1[] = {-1.0, -1.0, 1.0, 0.0}; +static const float lmodel_ambient[] = {0.5, 0.5, 0.5, 1.0}; +static const float lmodel_twoside[] = {GL_TRUE}; + +static const float MaterialWhite[] = {0.7, 0.7, 0.7, 1.0}; static cagestruct *cage = (cagestruct *) NULL; @@ -165,9 +143,9 @@ static cagestruct *cage = (cagestruct *) NULL; #define PlankThickness 0.15 static Bool -draw_woodplank(cagestruct * cp) +draw_woodplank(ModeInfo *mi, cagestruct * cp, int wire) { - glBegin(GL_QUADS); + glBegin(wire ? GL_LINES : GL_QUADS); glNormal3f(0, 0, 1); glTexCoord2f(0, 0); glVertex3f(-PlankWidth, -PlankHeight, PlankThickness); @@ -177,6 +155,7 @@ draw_woodplank(cagestruct * cp) 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); @@ -186,6 +165,7 @@ draw_woodplank(cagestruct * cp) 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); @@ -195,6 +175,7 @@ draw_woodplank(cagestruct * cp) 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); @@ -204,6 +185,7 @@ draw_woodplank(cagestruct * cp) 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); @@ -213,6 +195,7 @@ draw_woodplank(cagestruct * cp) 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); @@ -222,86 +205,87 @@ draw_woodplank(cagestruct * cp) glVertex3f(-PlankWidth, -PlankHeight, -PlankThickness); glTexCoord2f(0, 1); glVertex3f(-PlankWidth, -PlankHeight, PlankThickness); + mi->polygon_count++; glEnd(); return True; } static Bool -draw_impossiblecage(cagestruct * cp) +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)) + 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)) + 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)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankWidth - PlankHeight, 3 * PlankThickness - PlankWidth); - if (!draw_woodplank(cp)) + 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)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankWidth - PlankHeight, PlankWidth - 3 * PlankThickness); - if (!draw_woodplank(cp)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankHeight - PlankWidth, 3 * PlankThickness - PlankWidth); - if (!draw_woodplank(cp)) + 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)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); glPushMatrix(); glTranslatef(0.0, PlankHeight - PlankWidth, PlankWidth - 3 * PlankThickness); - if (!draw_woodplank(cp)) + 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)) + 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)) + 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)) + if (!draw_woodplank(mi, cp, wire)) return False; glPopMatrix(); return True; } -void +static void reshape(ModeInfo * mi, int width, int height) { cagestruct *cp = &cage[MI_SCREEN(mi)]; @@ -321,9 +305,13 @@ static void pinit(ModeInfo *mi) { int status; + glClearDepth(1.0); glClearColor(0.0, 0.0, 0.0, 1.0); + if (MI_IS_WIREFRAME(mi)) + return; + glLightfv(GL_LIGHT0, GL_AMBIENT, ambient); glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse); glLightfv(GL_LIGHT0, GL_POSITION, position0); @@ -357,7 +345,7 @@ pinit(ModeInfo *mi) GL_RGB, GL_UNSIGNED_BYTE, WoodTextureData); if (status) { - const char *s = gluErrorString (status); + const char *s = (char *) gluErrorString (status); fprintf (stderr, "%s: error mipmapping texture: %s\n", progname, (s ? s : "(unknown)")); exit (1); @@ -374,8 +362,8 @@ pinit(ModeInfo *mi) glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular); } -void -release_cage(ModeInfo * mi) +ENTRYPOINT void +release_cage (ModeInfo * mi) { if (cage != NULL) { int screen; @@ -393,8 +381,8 @@ release_cage(ModeInfo * mi) FreeAllGL(mi); } -void -init_cage(ModeInfo * mi) +ENTRYPOINT void +init_cage (ModeInfo * mi) { cagestruct *cp; @@ -416,8 +404,8 @@ init_cage(ModeInfo * mi) } } -void -draw_cage(ModeInfo * mi) +ENTRYPOINT void +draw_cage (ModeInfo * mi) { Display *display = MI_DISPLAY(mi); Window window = MI_WINDOW(mi); @@ -431,6 +419,7 @@ 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); @@ -449,7 +438,7 @@ draw_cage(ModeInfo * mi) 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)) { + if (!draw_impossiblecage(mi, cp, MI_IS_WIREFRAME(mi))) { release_cage(mi); return; } @@ -463,8 +452,9 @@ draw_cage(ModeInfo * mi) cp->step += 0.025; } -void -change_cage(ModeInfo * mi) +#ifndef STANDALONE +ENTRYPOINT void +change_cage (ModeInfo * mi) { cagestruct *cp = &cage[MI_SCREEN(mi)]; @@ -474,5 +464,8 @@ change_cage(ModeInfo * mi) glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cp->glx_context)); pinit(mi); } +#endif /* !STANDALONE */ + +XSCREENSAVER_MODULE ("Cage", cage) #endif