* Since I'm not a native English speaker, my apologies for any grammatical
* mistake.
*
- * My e-mail addresses are
- *
- * vianna@cat.cbpf.br
- * and
+ * My e-mail address is
* m-vianna@usa.net
* Marcelo F. Vianna (Apr-09-1997)
*
# 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" \
"*count: 2 \n" \
"*cycles: 5 \n" \
"*size: 500 \n" \
+ "*showFPS: False \n" \
+ "*fpsSolid: True \n" \
"*fisheye: True \n" \
"*tightturns: False \n" \
- "*rotatepipes: True \n" \
- "*noBuffer: True \n"
+ "*rotatepipes: True \n"
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
};
ModeSpecOpt pipes_opts =
-{7, opts, 4, vars, desc};
+{sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc};
#ifdef USE_MODULES
ModStruct pipes_description =
{"pipes", "init_pipes", "draw_pipes", "release_pipes",
-#if defined( MESA ) && defined( SLOW )
"draw_pipes",
-#else
- "change_pipes",
-#endif
"change_pipes", NULL, &pipes_opts,
- 1000, 2, 5, 500, 1.0, "",
+ 1000, 2, 5, 500, 4, 1.0, "",
"Shows a selfbuilding pipe system", 0, NULL};
#endif
/*************************************************************************/
typedef struct {
-#if defined( MESA ) && defined( SLOW )
int flip;
-#endif
+
GLint WindH, WindW;
int Cells[HCELLS][VCELLS][HCELLS];
int usedcolors[DEFINEDCOLORS];
glCallList(pp->betweenbolts);
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray);
glCallList(pp->bolts);
- if (!MI_WIN_IS_MONO(mi)) {
+ if (!MI_IS_MONO(mi)) {
if (pp->system_color == MaterialRed) {
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, NRAND(2) ? MaterialYellow : MaterialBlue);
} else if (pp->system_color == MaterialBlue) {
}
}
-static void
-reshape(ModeInfo * mi, int width, int height)
+void
+reshape_pipes(ModeInfo * mi, int width, int height)
{
pipesstruct *pp = &pipes[MI_SCREEN(mi)];
/*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
pp->counter = 0;
pp->turncounter = 0;
- if (!MI_WIN_IS_MONO(mi)) {
+ if (!MI_IS_MONO(mi)) {
int collist[DEFINEDCOLORS];
int i, j, lower = 1000;
pp->window = MI_WINDOW(mi);
if ((pp->glx_context = init_GL(mi)) != NULL) {
- reshape(mi, MI_WIN_WIDTH(mi), MI_WIN_HEIGHT(mi));
- pp->initial_rotation = -10.0;
+ reshape_pipes(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+ if (rotatepipes)
+ pp->initial_rotation = NRAND(180); /* jwz */
+ else
+ pp->initial_rotation = -10.0;
pinit(mi, 1);
if (factory > 0) {
- pp->valve = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_BigValve);
- pp->bolts = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_Bolts3D);
- pp->betweenbolts = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_PipeBetweenBolts);
+ pp->valve = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_BigValve);
+ pp->bolts = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_Bolts3D);
+ pp->betweenbolts = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_PipeBetweenBolts);
- pp->elbowbolts = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_ElbowBolts);
- pp->elbowcoins = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_ElbowCoins);
+ pp->elbowbolts = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_ElbowBolts);
+ pp->elbowcoins = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_ElbowCoins);
- pp->guagehead = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_GuageHead);
- pp->guageface = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_GuageFace);
- pp->guagedial = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_GuageDial);
- pp->guageconnector = BuildLWO(MI_WIN_IS_WIREFRAME(mi), &LWO_GuageConnector);
+ pp->guagehead = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_GuageHead);
+ pp->guageface = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_GuageFace);
+ pp->guagedial = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_GuageDial);
+ pp->guageconnector = BuildLWO(MI_IS_WIREFRAME(mi), &LWO_GuageConnector);
}
/* else they are all 0, thanks to calloc(). */
- if (MI_BATCHCOUNT(mi) < 1 || MI_BATCHCOUNT(mi) > NofSysTypes + 1) {
+ if (MI_COUNT(mi) < 1 || MI_COUNT(mi) > NofSysTypes + 1) {
pp->system_type = NRAND(NofSysTypes) + 1;
} else {
- pp->system_type = MI_BATCHCOUNT(mi);
+ pp->system_type = MI_COUNT(mi);
}
if (MI_CYCLES(mi) > 0 && MI_CYCLES(mi) < 11) {
if (!pp->glx_context)
return;
- glXMakeCurrent(display, window, *(pp->glx_context));
-
-#if defined( MESA ) && defined( SLOW )
- glDrawBuffer(GL_BACK);
-#else
- glDrawBuffer(GL_FRONT);
-#endif
glPushMatrix();
glTranslatef(0.0, 0.0, fisheye ? -3.8 : -4.8);
if (rotatepipes)
glRotatef(pp->initial_rotation, 0.0, 1.0, 0.0);
- if (!MI_WIN_IS_ICONIC(mi)) {
+ if (!MI_IS_ICONIC(mi)) {
/* Width/height ratio handled by gluPerspective() now. */
glScalef(Scale4Window, Scale4Window, Scale4Window);
} else {
glTranslatef((pp->PX - 16) / 3.0 * 4.0, (pp->PY - 12) / 3.0 * 4.0, (pp->PZ - 16) / 3.0 * 4.0);
/* Finish the system with another sphere */
mySphere(0.6);
-#if defined( MESA ) && defined( SLOW )
- glXSwapBuffers(display, window);
-#endif
+
glPopMatrix();
/* If the maximum number of system was drawn, restart (clearing the screen), */
glFlush();
-#if defined( MESA ) && defined( SLOW )
- pp->flip = !pp->flip;
- if (pp->flip)
- glXSwapBuffers(display, window);
-#endif
+ glXSwapBuffers(display, window);
+
+ if (mi->fps_p) do_fps (mi);
}
void
projects / xscreensaver / blobdiff