/* insert defaults here */
#define DEF_ENGINE "(none)"
+#define DEF_TITLES "False"
+#define DEF_SPIN "True"
+#define DEF_WANDER "True"
-#define DEFAULTS "*delay: 10000 \n" \
+#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*move: True \n" \
"*spin: True \n" \
"*engine: " DEF_ENGINE "\n" \
+ "*titles: " DEF_TITLES "\n" \
+ "*titleFont: -*-times-bold-r-normal-*-180-*\n" \
-# include "xlockmore.h" /* from the xscreensaver distribution */
+# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
-# include "xlock.h" /* from the xlockmore distribution */
+# include "xlock.h" /* from the xlockmore distribution */
#endif /* !STANDALONE */
+#include "glxfonts.h"
#include "rotator.h"
#include "gltrackball.h"
static int move;
static int movepaused = 0;
static int spin;
+static Bool do_titles;
static XrmOptionDescRec opts[] = {
- {"-engine", ".engine.engine", XrmoptionSepArg, DEF_ENGINE },
- {"-move", ".engine.move", XrmoptionNoArg, (caddr_t) "true" },
- {"+move", ".engine.move", XrmoptionNoArg, (caddr_t) "false" },
- {"-spin", ".engine.spin", XrmoptionNoArg, (caddr_t) "true" },
- {"+spin", ".engine.spin", XrmoptionNoArg, (caddr_t) "false" },
+ {"-engine", ".engine.engine", XrmoptionSepArg, DEF_ENGINE },
+ {"-move", ".engine.move", XrmoptionNoArg, "True" },
+ {"+move", ".engine.move", XrmoptionNoArg, "False" },
+ {"-spin", ".engine.spin", XrmoptionNoArg, "True" },
+ {"+spin", ".engine.spin", XrmoptionNoArg, "False" },
+ { "-titles", ".engine.titles", XrmoptionNoArg, "True" },
+ { "+titles", ".engine.titles", XrmoptionNoArg, "False" },
};
static argtype vars[] = {
- {(caddr_t *) &which_engine, "engine", "Engine", DEF_ENGINE, t_String},
- {(caddr_t *) &move, "move", "Move", "True", t_Bool},
- {(caddr_t *) &spin, "spin", "Spin", "True", t_Bool},
+ {&which_engine, "engine", "Engine", DEF_ENGINE, t_String},
+ {&move, "move", "Move", DEF_WANDER, t_Bool},
+ {&spin, "spin", "Spin", DEF_SPIN, t_Bool},
+ {&do_titles, "titles", "Titles", DEF_TITLES, t_Bool},
};
ModeSpecOpt engine_opts = {countof(opts), opts, countof(vars), vars, NULL};
rotator *rot;
trackball_state *trackball;
Bool button_down_p;
+ XFontStruct *xfont;
+ GLuint font_dlist;
+ char *engine_name;
} Engine;
static Engine *engine = NULL;
* To avoid going completely insane, we also reorder these so the newly
* renumbered cylinder 0 is always first: 0-3-4-1-2-5
*
- * For a flat 6, the included angle is 180 degrees (0 would be a inline engine).
- * Because these are all four-stroke engines, each piston goes through
- * 720 degrees of rotation for each time the spark plug sparks, so in this case,
- * we would use the following angles:
+ * For a flat 6, the included angle is 180 degrees (0 would be a inline
+ * engine). Because these are all four-stroke engines, each piston goes
+ * through 720 degrees of rotation for each time the spark plug sparks,
+ * so in this case, we would use the following angles:
+ *
* cylinder firing order angle
* -------- ------------ -----
* 0 0 0
#define ENG engines[engineType]
/* given a number of cylinders and an included angle, finds matching engine */
-int find_engine(const char *name)
+int
+find_engine(char *name)
{
- int i;
+ unsigned int i;
+ char *s;
if (!name || !*name || !strcasecmp (name, "(none)"))
return (random() % countof(engines));
+ for (s = name; *s; s++)
+ if (*s == '-' || *s == '_') *s = ' ';
+
for (i = 0; i < countof(engines); i++) {
if (!strcasecmp(name, engines[i].engineName))
return i;
in one frame can be a bit harsh..
*/
-void make_tables(void) {
-int i;
-float f;
+void make_tables(void)
+{
+ int i;
+ float f;
f = ONEREV / (M_PI * 2);
for (i = 0 ; i <= TWOREV ; i++) {
/* angle is how far around the axis to go (up to 360) */
void cylinder (GLfloat x, GLfloat y, GLfloat z,
- float length, float outer, float inner, int endcaps, int sang, int eang) {
-int a; /* current angle around cylinder */
-int b = 0; /* previous */
-int angle, norm, step, sangle;
-float z1, y1, z2, y2, ex=0;
-float y3, z3;
-float Z1, Y1, Z2, Y2, xl, Y3, Z3;
-GLfloat y2c[TWOREV], z2c[TWOREV];
-GLfloat ony, onz; /* previous normals */
-int nsegs, tube = 0;
+ float length, float outer, float inner, int endcaps, int sang, int eang)
+{
+ int a; /* current angle around cylinder */
+ int b = 0; /* previous */
+ int angle, norm, step, sangle;
+ float z1, y1, z2, y2, ex=0;
+ float y3, z3;
+ float Z1, Y1, Z2, Y2, xl, Y3, Z3;
+ GLfloat y2c[TWOREV], z2c[TWOREV];
+ GLfloat ony, onz; /* previous normals */
+ int nsegs, tube = 0;
glPushMatrix();
nsegs = outer*(MAX(win_w, win_h)/200);
}
/* this is just a convenience function to make a solid rod */
-void rod (GLfloat x, GLfloat y, GLfloat z, float length, float diameter) {
+void rod (GLfloat x, GLfloat y, GLfloat z, float length, float diameter)
+{
cylinder(x, y, z, length, diameter, diameter, 3, 0, ONEREV);
}
void Rect(GLfloat x, GLfloat y, GLfloat z, GLfloat w, GLfloat h,
- GLfloat t) {
-GLfloat yh;
-GLfloat xw;
-GLfloat zt;
+ GLfloat t)
+{
+ GLfloat yh;
+ GLfloat xw;
+ GLfloat zt;
yh = y+h; xw = x+w; zt = z - t;
glEnd();
}
-void makepiston(void) {
-GLfloat colour[] = {0.6, 0.6, 0.6, 1.0};
-int i;
+void makepiston(void)
+{
+ GLfloat colour[] = {0.6, 0.6, 0.6, 1.0};
+ int i;
i = glGenLists(1);
glNewList(i, GL_COMPILE);
glEndList();
}
-void CrankBit(GLfloat x) {
+void CrankBit(GLfloat x)
+{
Rect(x, -1.4, 0.5, 0.2, 1.8, 1);
cylinder(x, -0.5, 0, 0.2, 2, 2, 1, 60, 120);
}
-void boom(GLfloat x, GLfloat y, int s) {
-static GLfloat red[] = {0, 0, 0, 0.9};
-static GLfloat lpos[] = {0, 0, 0, 1};
-static GLfloat d = 0, wd;
-int flameOut = 720/ENG.speed/ENG.cylinders;
-static int time = 0;
+void boom(GLfloat x, GLfloat y, int s)
+{
+ static GLfloat red[] = {0, 0, 0, 0.9};
+ static GLfloat lpos[] = {0, 0, 0, 1};
+ static GLfloat d = 0, wd;
+ int flameOut = 720/ENG.speed/ENG.cylinders;
+ static int time = 0;
if (time == 0 && s) {
red[0] = red[1] = 0;
glDisable(GL_BLEND);
}
-void display(Engine *e) {
-
-static int a = 0;
-GLfloat zb, yb;
-static GLfloat ln[730], yp[730], ang[730];
-static int ln_init = 0;
-static int lastPlug = 0;
-int half;
-int sides;
-int j, b;
-static float rightSide;
+void display(Engine *e)
+{
+ static int a = 0;
+ GLfloat zb, yb;
+ static GLfloat ln[730], yp[730], ang[730];
+ static int ln_init = 0;
+ static int lastPlug = 0;
+ int half;
+ int sides;
+ int j, b;
+ static float rightSide;
glEnable(GL_LIGHTING);
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
b = (a+HALFREV+ENG.pistonAngle[j+half]) % TWOREV;
glPushMatrix();
glRotatef(ang[b], 0, 1, 0);
- rod(-cos_table[b], -crankWidth/2-crankOffset*(j+half), -sin_table[b],
- ln[b], 0.2);
+ rod(-cos_table[b],
+ -crankWidth/2-crankOffset*(j+half),
+ -sin_table[b],
+ ln[b], 0.2);
glPopMatrix();
}
glPopMatrix();
glFlush();
}
-void makeshaft (void) {
-int i;
-int j;
-const static float crankThick = 0.2;
-const static float crankDiam = 0.3;
+void makeshaft (void)
+{
+ int i;
+ int j;
+ static const float crankThick = 0.2;
+ static const float crankDiam = 0.3;
i = glGenLists(1);
glNewList(i, GL_COMPILE);
*/
rod(-2, 0, 0, 2, crankDiam);
- /* Each crank is crankWidth units wide and the total width of a cylinder assembly
- * is 3.3 units. For inline engines, there is just a single crank per cylinder
- * width. For other engine configurations, there is a crank between each pair
- * of adjacent cylinders on one side of the engine, so the crankOffset length is
+ /* Each crank is crankWidth units wide and the total width of a
+ * cylinder assembly is 3.3 units. For inline engines, there is just
+ * a single crank per cylinder width. For other engine
+ * configurations, there is a crank between each pair of adjacent
+ * cylinders on one side of the engine, so the crankOffset length is
* halved.
*/
crankOffset = 3.3;
glEndList();
}
+
void reshape_engine(ModeInfo *mi, int width, int height)
{
-
glViewport(0,0,(GLint)width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
void init_engine(ModeInfo *mi)
{
-int screen = MI_SCREEN(mi);
-Engine *e;
+ int screen = MI_SCREEN(mi);
+ Engine *e;
if (engine == NULL) {
if ((engine = (Engine *) calloc(MI_NUM_SCREENS(mi),
}
{
- double spin_speed = 1.0;
- double wander_speed = 0.03;
+ double spin_speed = 0.5;
+ double wander_speed = 0.01;
e->rot = make_rotator (spin ? spin_speed : 0,
spin ? spin_speed : 0,
glEnable(GL_NORMALIZE);
make_tables();
engineType = find_engine(which_engine);
+
+ e->engine_name = malloc(200);
+ sprintf (e->engine_name,
+ "%s\n%s%d%s",
+ engines[engineType].engineName,
+ (engines[engineType].includedAngle == 0 ? "" :
+ engines[engineType].includedAngle == 180 ? "Flat " : "V"),
+ engines[engineType].cylinders,
+ (engines[engineType].includedAngle == 0 ? " Cylinder" : "")
+ );
+
makeshaft();
makepiston();
+ load_font (mi->dpy, "titleFont", &e->xfont, &e->font_dlist);
}
-Bool engine_handle_event (ModeInfo *mi, XEvent *event) {
+Bool engine_handle_event (ModeInfo *mi, XEvent *event)
+{
Engine *e = &engine[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
- event->xbutton.button & Button1)
+ event->xbutton.button == Button1)
{
e->button_down_p = True;
gltrackball_start (e->trackball,
return True;
}
else if (event->xany.type == ButtonRelease &&
- event->xbutton.button & Button1) {
+ event->xbutton.button == Button1) {
e->button_down_p = False;
movepaused = 0;
return True;
}
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5))
+ {
+ gltrackball_mousewheel (e->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
e->button_down_p) {
gltrackball_track (e->trackball,
return False;
}
-void draw_engine(ModeInfo *mi) {
-Engine *e = &engine[MI_SCREEN(mi)];
-Window w = MI_WINDOW(mi);
-Display *disp = MI_DISPLAY(mi);
+void draw_engine(ModeInfo *mi)
+{
+ Engine *e = &engine[MI_SCREEN(mi)];
+ Window w = MI_WINDOW(mi);
+ Display *disp = MI_DISPLAY(mi);
if (!e->glx_context)
- return;
+ return;
glXMakeCurrent(disp, w, *(e->glx_context));
display(e);
+ if (do_titles)
+ print_gl_string (mi->dpy, e->xfont, e->font_dlist,
+ mi->xgwa.width, mi->xgwa.height,
+ 10, mi->xgwa.height - 10,
+ e->engine_name);
+
if(mi->fps_p) do_fps(mi);
glFinish();
glXSwapBuffers(disp, w);
}
-void release_engine(ModeInfo *mi) {
-
+void release_engine(ModeInfo *mi)
+{
if (engine != NULL) {
(void) free((void *) engine);
engine = NULL;
projects / xscreensaver / blobdiff