X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=5ad9ccd5f34f1ee02994670fd09e04749954aced;hp=97e7824ffcf7c78def6550eb3550174789847d25;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38 diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c index 97e7824f..5ad9ccd5 100644 --- a/hacks/glx/moebius.c +++ b/hacks/glx/moebius.c @@ -77,62 +77,48 @@ static const char sccsid[] = "@(#)moebius.c 5.01 2001/03/01 xlockmore"; * In real OpenGL, PseudoColor DO NOT support texture map (as far as I know). */ -#ifdef VMS -#include -#endif - #ifdef STANDALONE # define MODE_moebius -# define PROGCLASS "Moebius" -# define HACK_INIT init_moebius -# define HACK_DRAW draw_moebius -# define HACK_RESHAPE reshape_moebius -# define HACK_HANDLE_EVENT moebius_handle_event -# define EVENT_MASK PointerMotionMask -# define moebius_opts xlockmore_opts +# define refresh_moebius 0 # define DEFAULTS "*delay: 20000 \n" \ - "*showFPS: False \n" \ - "*wireframe: False \n" + "*showFPS: False \n" # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ - #endif /* !STANDALONE */ #ifdef MODE_moebius - -#include #include "e_textures.h" #include "rotator.h" #include "gltrackball.h" #define DEF_SOLIDMOEBIUS "False" -#define DEF_NOANTS "False" +#define DEF_DRAWANTS "True" static int solidmoebius; -static int noants; +static int drawants; static XrmOptionDescRec opts[] = { - {(char *) "-solidmoebius", (char *) ".moebius.solidmoebius", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+solidmoebius", (char *) ".moebius.solidmoebius", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-noants", (char *) ".moebius.noants", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+noants", (char *) ".moebius.noants", XrmoptionNoArg, (caddr_t) "off"} + {"-solidmoebius", ".moebius.solidmoebius", XrmoptionNoArg, "on"}, + {"+solidmoebius", ".moebius.solidmoebius", XrmoptionNoArg, "off"}, + {"-ants", ".moebius.drawants", XrmoptionNoArg, "on"}, + {"+ants", ".moebius.drawants", XrmoptionNoArg, "off"} }; static argtype vars[] = { {&solidmoebius, "solidmoebius", "Solidmoebius", DEF_SOLIDMOEBIUS, t_Bool}, - {&noants, "noants", "Noants", DEF_NOANTS, t_Bool} + {&drawants, "drawants", "Drawants", DEF_DRAWANTS, t_Bool} }; static OptionStruct desc[] = { - {(char *) "-/+solidmoebius", (char *) "select between a SOLID or a NET Moebius Strip"}, - {(char *) "-/+noants", (char *) "turn on/off walking ants"} + {"-/+solidmoebius", "select between a SOLID or a NET Moebius Strip"}, + {"-/+drawants", "turn on/off walking ants"} }; -ModeSpecOpt moebius_opts = +ENTRYPOINT ModeSpecOpt moebius_opts = {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES @@ -163,51 +149,33 @@ typedef struct { GLint WindH, WindW; GLfloat step; GLfloat ant_position; + float ant_step; GLXContext *glx_context; rotator *rot; trackball_state *trackball; Bool button_down_p; } moebiusstruct; -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 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 float MaterialGray5[] = -{0.5, 0.5, 0.5, 1.0}; -static float MaterialGray6[] = -{0.6, 0.6, 0.6, 1.0}; -static float MaterialGray8[] = -{0.8, 0.8, 0.8, 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 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 const float MaterialGray5[] = {0.5, 0.5, 0.5, 1.0}; +static const float MaterialGray6[] = {0.6, 0.6, 0.6, 1.0}; +static const float MaterialGray8[] = {0.8, 0.8, 0.8, 1.0}; static moebiusstruct *moebius = (moebiusstruct *) NULL; @@ -240,15 +208,14 @@ myCone(float radius) } static Bool -draw_moebius_ant(moebiusstruct * mp, float *Material, int mono) +draw_moebius_ant(moebiusstruct * mp, const float *Material, int mono) { - static float ant_step = 0; - float cos1 = cos(ant_step); - float cos2 = cos(ant_step + 2 * Pi / 3); - float cos3 = cos(ant_step + 4 * Pi / 3); - float sin1 = sin(ant_step); - float sin2 = sin(ant_step + 2 * Pi / 3); - float sin3 = sin(ant_step + 4 * Pi / 3); + float cos1 = cos(mp->ant_step); + float cos2 = cos(mp->ant_step + 2 * Pi / 3); + float cos3 = cos(mp->ant_step + 4 * Pi / 3); + float sin1 = sin(mp->ant_step); + float sin2 = sin(mp->ant_step + 2 * Pi / 3); + float sin3 = sin(mp->ant_step + 4 * Pi / 3); if (mono) glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, MaterialGray5); @@ -397,7 +364,7 @@ draw_moebius_ant(moebiusstruct * mp, float *Material, int mono) glEnable(GL_LIGHTING); - ant_step += 0.3; + mp->ant_step += 0.3; return True; } @@ -500,7 +467,7 @@ draw_moebius_strip(ModeInfo * mi) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); } - if (!noants) { + if (drawants) { /* DRAW BLUE ANT */ glPushMatrix(); glRotatef(mp->ant_position + 180, 0, 0, 1); @@ -549,8 +516,8 @@ draw_moebius_strip(ModeInfo * mi) #undef MoebiusDivisions #undef MoebiusTransversals -void -reshape_moebius(ModeInfo * mi, int width, int height) +ENTRYPOINT void +reshape_moebius (ModeInfo * mi, int width, int height) { moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; @@ -627,8 +594,8 @@ pinit(void) -void -release_moebius(ModeInfo * mi) +ENTRYPOINT void +release_moebius (ModeInfo * mi) { if (moebius != NULL) { (void) free((void *) moebius); @@ -637,13 +604,13 @@ release_moebius(ModeInfo * mi) FreeAllGL(mi); } -Bool +ENTRYPOINT Bool moebius_handle_event (ModeInfo *mi, XEvent *event) { moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; if (event->xany.type == ButtonPress && - event->xbutton.button & Button1) + event->xbutton.button == Button1) { mp->button_down_p = True; gltrackball_start (mp->trackball, @@ -652,11 +619,21 @@ moebius_handle_event (ModeInfo *mi, XEvent *event) return True; } else if (event->xany.type == ButtonRelease && - event->xbutton.button & Button1) + event->xbutton.button == Button1) { mp->button_down_p = False; return True; } + else if (event->xany.type == ButtonPress && + (event->xbutton.button == Button4 || + event->xbutton.button == Button5 || + event->xbutton.button == Button6 || + event->xbutton.button == Button7)) + { + gltrackball_mousewheel (mp->trackball, event->xbutton.button, 10, + !!event->xbutton.state); + return True; + } else if (event->xany.type == MotionNotify && mp->button_down_p) { @@ -670,8 +647,8 @@ moebius_handle_event (ModeInfo *mi, XEvent *event) } -void -init_moebius(ModeInfo * mi) +ENTRYPOINT void +init_moebius (ModeInfo * mi) { moebiusstruct *mp; @@ -700,8 +677,8 @@ init_moebius(ModeInfo * mi) } } -void -draw_moebius(ModeInfo * mi) +ENTRYPOINT void +draw_moebius (ModeInfo * mi) { moebiusstruct *mp; @@ -757,8 +734,9 @@ draw_moebius(ModeInfo * mi) mp->step += 0.025; } -void -change_moebius(ModeInfo * mi) +#ifndef STANDALONE +ENTRYPOINT void +change_moebius (ModeInfo * mi) { moebiusstruct *mp = &moebius[MI_SCREEN(mi)]; @@ -768,5 +746,9 @@ change_moebius(ModeInfo * mi) glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(mp->glx_context)); pinit(); } +#endif /* !STANDALONE */ + + +XSCREENSAVER_MODULE ("Moebius", moebius) #endif