X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcage.c;h=268d0830c604255b979221fc5d699c54fb3d1ed4;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=7b14c72c1fea24b940ceb50c0b5387248511cbdd;hpb=ffd8c0873576a9e3065696a624dce6b766b77062;p=xscreensaver diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c index 7b14c72c..268d0830 100644 --- a/hacks/glx/cage.c +++ b/hacks/glx/cage.c @@ -77,27 +77,28 @@ static const char sccsid[] = "@(#)cage.c 5.01 2001/03/01 xlockmore"; #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" + "*wireframe: False \n" \ + "*suppressRotationAnimation: True\n" \ + +# define refresh_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 +#if 0 #include "e_textures.h" +#else +#include "xpm-ximage.h" +#include "../images/wood.xpm" +#endif -ModeSpecOpt cage_opts = +ENTRYPOINT ModeSpecOpt cage_opts = {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL}; #ifdef USE_MODULES @@ -129,25 +130,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; @@ -156,9 +148,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); @@ -168,6 +160,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); @@ -177,6 +170,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); @@ -186,6 +180,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 +190,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); @@ -204,6 +200,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,87 +210,88 @@ 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 -reshape(ModeInfo * mi, int width, int height) +static void +reshape_cage(ModeInfo * mi, int width, int height) { cagestruct *cp = &cage[MI_SCREEN(mi)]; int i; @@ -311,9 +309,10 @@ 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; glLightfv(GL_LIGHT0, GL_AMBIENT, ambient); glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse); @@ -339,6 +338,7 @@ pinit(ModeInfo *mi) glPixelStorei(GL_UNPACK_ALIGNMENT, 1); +#if 0 clear_gl_error(); if (MI_IS_MONO(mi)) status = 0; @@ -354,6 +354,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); @@ -365,8 +381,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; @@ -384,8 +400,8 @@ release_cage(ModeInfo * mi) FreeAllGL(mi); } -void -init_cage(ModeInfo * mi) +ENTRYPOINT void +init_cage (ModeInfo * mi) { cagestruct *cp; @@ -399,7 +415,7 @@ init_cage(ModeInfo * 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 { @@ -407,8 +423,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); @@ -422,12 +438,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)) { @@ -436,11 +452,23 @@ 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)) { + if (!draw_impossiblecage(mi, cp, MI_IS_WIREFRAME(mi))) { release_cage(mi); return; } @@ -454,8 +482,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)]; @@ -465,5 +494,8 @@ change_cage(ModeInfo * mi) glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cp->glx_context)); pinit(mi); } +#endif /* !STANDALONE */ + +XSCREENSAVER_MODULE ("Cage", cage) #endif