X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fpipes.c;h=e47361eaaaf8a1e0fffdacbd1fe3ee4ec8049e4a;hp=881651de90e720798f8c5cf7e19d44a81d4c63ac;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38 diff --git a/hacks/glx/pipes.c b/hacks/glx/pipes.c index 881651de..e47361ea 100644 --- a/hacks/glx/pipes.c +++ b/hacks/glx/pipes.c @@ -42,29 +42,15 @@ static const char sccsid[] = "@(#)pipes.c 4.07 97/11/24 xlockmore"; * 29-Apr-97: Efficiency speed-ups by Marcelo F. Vianna */ -/*- - * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock. - * otherwise caddr_t is not defined correctly - */ - -#include - #ifdef STANDALONE -# define PROGCLASS "Pipes" -# define HACK_INIT init_pipes -# define HACK_DRAW draw_pipes -# define HACK_RESHAPE reshape_pipes -# define pipes_opts xlockmore_opts -# define DEFAULTS "*delay: 100 \n" \ +# define DEFAULTS "*delay: 10000 \n" \ "*count: 2 \n" \ "*cycles: 5 \n" \ "*size: 500 \n" \ "*showFPS: False \n" \ - "*fpsSolid: True \n" \ - "*fisheye: True \n" \ - "*tightturns: False \n" \ - "*doubleBuffer: True \n" \ - "*rotatepipes: True \n" + "*fpsSolid: True \n" +# define refresh_pipes 0 +# define pipes_handle_event 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -72,7 +58,6 @@ static const char sccsid[] = "@(#)pipes.c 4.07 97/11/24 xlockmore"; #ifdef USE_GL -#include #include "buildlwo.h" #define DEF_FACTORY "2" @@ -88,15 +73,15 @@ static Bool dbuf_p; static XrmOptionDescRec opts[] = { - {"-factory", ".pipes.factory", XrmoptionSepArg, (caddr_t) NULL}, - {"-fisheye", ".pipes.fisheye", XrmoptionNoArg, (caddr_t) "on"}, - {"+fisheye", ".pipes.fisheye", XrmoptionNoArg, (caddr_t) "off"}, - {"-tightturns", ".pipes.tightturns", XrmoptionNoArg, (caddr_t) "on"}, - {"+tightturns", ".pipes.tightturns", XrmoptionNoArg, (caddr_t) "off"}, - {"-rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, (caddr_t) "on"}, - {"+rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, (caddr_t) "off"}, - {"-db", ".pipes.doubleBuffer", XrmoptionNoArg, (caddr_t) "on"}, - {"+db", ".pipes.doubleBuffer", XrmoptionNoArg, (caddr_t) "off"}, + {"-factory", ".pipes.factory", XrmoptionSepArg, 0}, + {"-fisheye", ".pipes.fisheye", XrmoptionNoArg, "on"}, + {"+fisheye", ".pipes.fisheye", XrmoptionNoArg, "off"}, + {"-tightturns", ".pipes.tightturns", XrmoptionNoArg, "on"}, + {"+tightturns", ".pipes.tightturns", XrmoptionNoArg, "off"}, + {"-rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, "on"}, + {"+rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, "off"}, + {"-db", ".pipes.doubleBuffer", XrmoptionNoArg, "on"}, + {"+db", ".pipes.doubleBuffer", XrmoptionNoArg, "off"}, }; static argtype vars[] = { @@ -115,7 +100,7 @@ static OptionStruct desc[] = {"-/+db", "turn on/off double buffering"} }; -ModeSpecOpt pipes_opts = +ENTRYPOINT ModeSpecOpt pipes_opts = {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES @@ -165,10 +150,11 @@ typedef struct { int system_length; int turncounter; Window window; - float *system_color; + const float *system_color; GLfloat initial_rotation; GLuint valve, bolts, betweenbolts, elbowbolts, elbowcoins; GLuint guagehead, guageface, guagedial, guageconnector; + int reset; GLXContext *glx_context; } pipesstruct; @@ -176,49 +162,31 @@ extern struct lwo LWO_BigValve, LWO_PipeBetweenBolts, LWO_Bolts3D; extern struct lwo LWO_GuageHead, LWO_GuageFace, LWO_GuageDial, LWO_GuageConnector; extern struct lwo LWO_ElbowBolts, LWO_ElbowCoins; -static float front_shininess[] = -{60.0}; -static float front_specular[] = -{0.7, 0.7, 0.7, 1.0}; -static float ambient0[] = -{0.4, 0.4, 0.4, 1.0}; -static float diffuse0[] = -{1.0, 1.0, 1.0, 1.0}; -static float ambient1[] = -{0.2, 0.2, 0.2, 1.0}; -static float diffuse1[] = -{0.5, 0.5, 0.5, 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 MaterialRed[] = -{0.7, 0.0, 0.0, 1.0}; -static float MaterialGreen[] = -{0.1, 0.5, 0.2, 1.0}; -static float MaterialBlue[] = -{0.0, 0.0, 0.7, 1.0}; -static float MaterialCyan[] = -{0.2, 0.5, 0.7, 1.0}; -static float MaterialYellow[] = -{0.7, 0.7, 0.0, 1.0}; -static float MaterialMagenta[] = -{0.6, 0.2, 0.5, 1.0}; -static float MaterialWhite[] = -{0.7, 0.7, 0.7, 1.0}; -static float MaterialGray[] = -{0.2, 0.2, 0.2, 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 ambient0[] = {0.4, 0.4, 0.4, 1.0}; +static const float diffuse0[] = {1.0, 1.0, 1.0, 1.0}; +static const float ambient1[] = {0.2, 0.2, 0.2, 1.0}; +static const float diffuse1[] = {0.5, 0.5, 0.5, 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 MaterialRed[] = {0.7, 0.0, 0.0, 1.0}; +static const float MaterialGreen[] = {0.1, 0.5, 0.2, 1.0}; +static const float MaterialBlue[] = {0.0, 0.0, 0.7, 1.0}; +static const float MaterialCyan[] = {0.2, 0.5, 0.7, 1.0}; +static const float MaterialYellow[] = {0.7, 0.7, 0.0, 1.0}; +static const float MaterialMagenta[] = {0.6, 0.2, 0.5, 1.0}; +static const float MaterialWhite[] = {0.7, 0.7, 0.7, 1.0}; +static const float MaterialGray[] = {0.2, 0.2, 0.2, 1.0}; static pipesstruct *pipes = NULL; static void -MakeTube(int direction) +MakeTube(ModeInfo *mi, int direction) { float an; float SINan_3, COSan_3; @@ -239,6 +207,7 @@ MakeTube(int direction) glNormal3f((COSan_3 = cos(an) / 3.0), (SINan_3 = sin(an) / 3.0), 0.0); glVertex3f(COSan_3, SINan_3, one_third); glVertex3f(COSan_3, SINan_3, -one_third); + mi->polygon_count++; } glEnd(); } @@ -319,6 +288,7 @@ myElbow(ModeInfo * mi, int bolted) glVertex3fv(p1); glNormal3fv(n0); glVertex3fv(p0); + mi->polygon_count++; glEnd(); } } @@ -331,8 +301,10 @@ myElbow(ModeInfo * mi, int bolted) glRotatef(90.0, 0.0, 1.0, 0.0); glTranslatef(0.0, one_third, one_third); glCallList(pp->elbowcoins); + mi->polygon_count += LWO_ElbowCoins.num_pnts/3; glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); glCallList(pp->elbowbolts); + mi->polygon_count += LWO_ElbowBolts.num_pnts/3; glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, pp->system_color); glPopMatrix(); glFrontFace(GL_CCW); @@ -404,8 +376,10 @@ MakeValve(ModeInfo * mi, int newdir) } glFrontFace(GL_CW); glCallList(pp->betweenbolts); + mi->polygon_count += LWO_PipeBetweenBolts.num_pnts/3; glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); glCallList(pp->bolts); + mi->polygon_count += LWO_Bolts3D.num_pnts/3; if (!MI_IS_MONO(mi)) { if (pp->system_color == MaterialRed) { glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, NRAND(2) ? MaterialYellow : MaterialBlue); @@ -428,6 +402,7 @@ MakeValve(ModeInfo * mi, int newdir) } glRotatef((GLfloat) (NRAND(90)), 1.0, 0.0, 0.0); glCallList(pp->valve); + mi->polygon_count += LWO_BigValve.num_pnts/3; glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, pp->system_color); glFrontFace(GL_CCW); } @@ -453,11 +428,14 @@ MakeGuage(ModeInfo * mi, int newdir) if ((newdir == dirLEFT) || (newdir == dirRIGHT)) glRotatef(90.0, 0.0, 1.0, 0.0); glCallList(pp->betweenbolts); + mi->polygon_count += LWO_PipeBetweenBolts.num_pnts/3; glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray); glCallList(pp->bolts); + mi->polygon_count += LWO_Bolts3D.num_pnts/3; glPopMatrix(); glCallList(pp->guageconnector); + mi->polygon_count += LWO_GuageConnector.num_pnts/3; glPushMatrix(); glTranslatef(0.0, 1.33333, 0.0); /* Do not change the above to 1 + ONE_THIRD, because */ @@ -465,14 +443,17 @@ MakeGuage(ModeInfo * mi, int newdir) glRotatef(NRAND(270) + 45.0, 0.0, 0.0, -1.0); /* Random rotation for the dial. I love it. */ glCallList(pp->guagedial); + mi->polygon_count += LWO_GuageDial.num_pnts/3; glPopMatrix(); glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, pp->system_color); glCallList(pp->guagehead); + mi->polygon_count += LWO_GuageHead.num_pnts/3; /* GuageFace is drawn last, in case of low-res depth buffers. */ glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialWhite); glCallList(pp->guageface); + mi->polygon_count += LWO_GuageFace.num_pnts/3; glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, pp->system_color); glFrontFace(GL_CCW); @@ -486,7 +467,7 @@ MakeShape(ModeInfo * mi, int newdir) switch (NRAND(2)) { case 1: if (!MakeGuage(mi, newdir)) - MakeTube(newdir); + MakeTube(mi, newdir); break; default: MakeValve(mi, newdir); @@ -494,27 +475,15 @@ MakeShape(ModeInfo * mi, int newdir) } } -void -reshape_pipes(ModeInfo * mi, int width, int height) -{ - pipesstruct *pp = &pipes[MI_SCREEN(mi)]; - - glViewport(0, 0, pp->WindW = (GLint) width, pp->WindH = (GLint) height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - /*glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0); */ - gluPerspective(65.0, (GLfloat) width / (GLfloat) height, 0.1, 20.0); - glMatrixMode(GL_MODELVIEW); - - glClear(GL_COLOR_BUFFER_BIT); -} - static void pinit(ModeInfo * mi, int zera) { pipesstruct *pp = &pipes[MI_SCREEN(mi)]; int X, Y, Z; + if (zera) + mi->polygon_count = 0; + glClearDepth(1.0); glClearColor(0.0, 0.0, 0.0, 1.0); glColor3f(1.0, 1.0, 1.0); @@ -625,8 +594,24 @@ pinit(ModeInfo * mi, int zera) pp->nowdir = SelectNeighbor(mi); } -void -init_pipes(ModeInfo * mi) +ENTRYPOINT void +reshape_pipes(ModeInfo * mi, int width, int height) +{ + pipesstruct *pp = &pipes[MI_SCREEN(mi)]; + pinit(mi, 1); + + glViewport(0, 0, pp->WindW = (GLint) width, pp->WindH = (GLint) height); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + /*glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0); */ + gluPerspective(65.0, (GLfloat) width / (GLfloat) height, 0.1, 20.0); + glMatrixMode(GL_MODELVIEW); + + glClear(GL_COLOR_BUFFER_BIT); +} + +ENTRYPOINT void +init_pipes (ModeInfo * mi) { int screen = MI_SCREEN(mi); pipesstruct *pp; @@ -687,8 +672,8 @@ init_pipes(ModeInfo * mi) } } -void -draw_pipes(ModeInfo * mi) +ENTRYPOINT void +draw_pipes (ModeInfo * mi) { pipesstruct *pp = &pipes[MI_SCREEN(mi)]; @@ -701,6 +686,17 @@ draw_pipes(ModeInfo * mi) if (!pp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(pp->glx_context)); + + if (pp->reset) { + if (--pp->reset) { + /* Would be nice to fade to black here, by drawing successive quads + over the whole scene with gamma. */ + return; + } + pinit(mi, 1); + } + glPushMatrix(); glTranslatef(0.0, 0.0, fisheye ? -3.8 : -4.8); @@ -737,9 +733,9 @@ draw_pipes(ModeInfo * mi) /* If the maximum number of system was drawn, restart (clearing the screen), */ /* else start a new system. */ if (++pp->system_number > pp->number_of_systems) { - if (!mi->fps_p) - sleep(1); - pinit(mi, 1); + /* pause doing nothing for N seconds before clearing the screen. */ + int secs = 3; + pp->reset = secs * 1000000 / MI_PAUSE(mi); } else { pinit(mi, 0); } @@ -778,7 +774,7 @@ draw_pipes(ModeInfo * mi) if ((pp->counter > 1) && (NRAND(100) < factory)) { MakeShape(mi, newdir); } else { - MakeTube(newdir); + MakeTube(mi, newdir); } glPopMatrix(); } else { @@ -962,7 +958,7 @@ draw_pipes(ModeInfo * mi) /* Cells'face pipe */ glTranslatef(((pp->PX + OPX) / 2.0 - 16) / 3.0 * 4.0, ((pp->PY + OPY) / 2.0 - 12) / 3.0 * 4.0, ((pp->PZ + OPZ) / 2.0 - 16) / 3.0 * 4.0); - MakeTube(newdir); + MakeTube(mi, newdir); glPopMatrix(); @@ -974,8 +970,9 @@ draw_pipes(ModeInfo * mi) if (mi->fps_p) do_fps (mi); } -void -change_pipes(ModeInfo * mi) +#ifndef STANDALONE +ENTRYPOINT void +change_pipes (ModeInfo * mi) { pipesstruct *pp = &pipes[MI_SCREEN(mi)]; @@ -985,9 +982,11 @@ change_pipes(ModeInfo * mi) glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(pp->glx_context)); pinit(mi, 1); } +#endif /* !STANDALONE */ -void -release_pipes(ModeInfo * mi) + +ENTRYPOINT void +release_pipes (ModeInfo * mi) { if (pipes != NULL) { int screen; @@ -1029,4 +1028,6 @@ release_pipes(ModeInfo * mi) FreeAllGL(mi); } +XSCREENSAVER_MODULE ("Pipes", pipes) + #endif