X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fatlantis.c;h=140295c1fe22d86cfe3cdb95dc334b3cd1d6f99b;hb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;hp=36a58c5404078b727a6f995a3f653af57db10557;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;p=xscreensaver diff --git a/hacks/glx/atlantis.c b/hacks/glx/atlantis.c index 36a58c54..140295c1 100644 --- a/hacks/glx/atlantis.c +++ b/hacks/glx/atlantis.c @@ -1,7 +1,7 @@ /* atlantis --- Shows moving 3D sea animals */ #if !defined( lint ) && !defined( SABER ) -static const char sccsid[] = "@(#)atlantis.c 1.1 98/05/13 xlockmore"; +static const char sccsid[] = "@(#)atlantis.c 1.3 98/06/18 xlockmore"; #endif @@ -34,11 +34,29 @@ static const char sccsid[] = "@(#)atlantis.c 1.1 98/05/13 xlockmore"; * * Eric Lassauge (May-13-1998) * - * TODO : - use def_xxx options to initialize local variables (number of - * sharks, etc...) - * - test standalone mode - * - better colormap handling (problems somewhere ?) - * - purify it (!) + * REVISION HISTORY: + * + * David A. Bagley - 98/06/17 : Add whalespeed option. Global options to + * initialize local variables are now: + * XLock.atlantis.cycles: 100 ! SharkSpeed + * XLock.atlantis.batchcount: 4 ! SharkNum + * XLock.atlantis.whalespeed: 250 ! WhaleSpeed + * XLock.atlantis.size: 6000 ! SharkSize + * Add random direction for whales/dolphins + * + * E.Lassauge - 98/06/16: Use the following global options to initialize + * local variables : + * XLock.atlantis.delay: 100 ! SharkSpeed + * XLock.atlantis.batchcount: 4 ! SharkNum + * XLock.atlantis.cycles: 250 ! WhaleSpeed + * XLock.atlantis.size: 6000 ! SharkSize + * Add support for -/+ wireframe (t'was so easy to do!) + * + * TODO : + * - add a sort of background image or random bg color + * - better handling of sizes and speeds + * - test standalone and module modes + * - purify it (!) */ /* Copyright (c) Mark J. Kilgard, 1994. */ @@ -85,31 +103,48 @@ static const char sccsid[] = "@(#)atlantis.c 1.1 98/05/13 xlockmore"; # define HACK_INIT init_atlantis # define HACK_DRAW draw_atlantis # define atlantis_opts xlockmore_opts -# define DEFAULTS "*delay: 1000 \n" +# define DEFAULTS "*delay: 1000 \n" \ + "*count: 4 \n" \ + "*cycles: 100 \n" \ + "*size: 6000 \n" \ + "*whalespeed: 250 \n" # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ - +#include "vis.h" #endif /* !STANDALONE */ #ifdef USE_GL -#include -#include -#include -#include #include "atlantis.h" #include +#define DEF_WHALESPEED "250" +static int whalespeed; +static XrmOptionDescRec opts[] = +{ + {"-whalespeed", ".atlantis.whalespeed", XrmoptionSepArg, (caddr_t) NULL} +}; + +static argtype vars[] = +{ +{(caddr_t *) & whalespeed, "whalespeed", "WhaleSpeed", DEF_WHALESPEED, t_Int} +}; + +static OptionStruct desc[] = +{ + {"-whalespeed num", "speed of whales and the dolphin"} +}; + ModeSpecOpt atlantis_opts = -{0, NULL, 0, NULL, NULL}; +{sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES ModStruct atlantis_description = {"atlantis", "init_atlantis", "draw_atlantis", "release_atlantis", "refresh_atlantis", "change_atlantis", NULL, &atlantis_opts, - 1000, 2, 5, 500, 64, 1.0, "", + 1000, NUM_SHARKS, SHARKSPEED, SHARKSIZE, 64, 1.0, "", "Shows moving sharks/whales/dolphin", 0, NULL}; #endif @@ -117,151 +152,151 @@ ModStruct atlantis_description = static atlantisstruct *atlantis = NULL; static void -InitFishs(atlantisstruct *ap) +InitFishs(atlantisstruct * ap) { - int i; - - for (i = 0; i < NUM_SHARKS; i++) { - ap->sharks[i].x = 70000.0 + NRAND(6000); - ap->sharks[i].y = NRAND(6000); - ap->sharks[i].z = NRAND(6000); - ap->sharks[i].psi = NRAND(360) - 180.0; - ap->sharks[i].v = 1.0; - } - - /* i = LRAND() & 1; */ /* Works the first time but they do not return */ - ap->dolph.x = 30000.0; - ap->dolph.y = 0.0; - ap->dolph.z = 6000.0; - ap->dolph.psi = /* (i) ? 90.0 : - */ 90.0; - ap->dolph.theta = 0.0; - ap->dolph.v = 3.0; - - ap->momWhale.x = 70000.0; - ap->momWhale.y = 0.0; - ap->momWhale.z = 0.0; - ap->momWhale.psi = /* (i) ? 90.0 : - */ 90.0; - ap->momWhale.theta = 0.0; - ap->momWhale.v = 3.0; - - ap->babyWhale.x = 60000.0; - ap->babyWhale.y = -2000.0; - ap->babyWhale.z = -2000.0; - ap->babyWhale.psi = /* (i) ? 90.0 : - */ 90.0; - ap->babyWhale.theta = 0.0; - ap->babyWhale.v = 3.0; + int i; + + for (i = 0; i < ap->num_sharks; i++) { + ap->sharks[i].x = 70000.0 + NRAND(ap->sharksize); + ap->sharks[i].y = NRAND(ap->sharksize); + ap->sharks[i].z = NRAND(ap->sharksize); + ap->sharks[i].psi = NRAND(360) - 180.0; + ap->sharks[i].v = 1.0; + } + + /* Random whae direction */ + ap->whaledir = LRAND() & 1; + + ap->dolph.x = 30000.0; + ap->dolph.y = 0.0; + ap->dolph.z = (float) (ap->sharksize); + ap->dolph.psi = (ap->whaledir) ? 90.0 : -90.0; + ap->dolph.theta = 0.0; + ap->dolph.v = 6.0; + + ap->momWhale.x = 70000.0; + ap->momWhale.y = 0.0; + ap->momWhale.z = 0.0; + ap->momWhale.psi = (ap->whaledir) ? 90.0 : -90.0; + ap->momWhale.theta = 0.0; + ap->momWhale.v = 3.0; + + ap->babyWhale.x = 60000.0; + ap->babyWhale.y = -2000.0; + ap->babyWhale.z = -2000.0; + ap->babyWhale.psi = (ap->whaledir) ? 90.0 : -90.0; + ap->babyWhale.theta = 0.0; + ap->babyWhale.v = 3.0; } static void -Init(atlantisstruct *ap) +Init(atlantisstruct * ap) { - static float ambient[] = - {0.1, 0.1, 0.1, 1.0}; - static float diffuse[] = - {1.0, 1.0, 1.0, 1.0}; - static float position[] = - {0.0, 1.0, 0.0, 0.0}; - static float mat_shininess[] = - {90.0}; - static float mat_specular[] = - {0.8, 0.8, 0.8, 1.0}; - static float mat_diffuse[] = - {0.46, 0.66, 0.795, 1.0}; - static float mat_ambient[] = - {0.0, 0.1, 0.2, 1.0}; - static float lmodel_ambient[] = - {0.4, 0.4, 0.4, 1.0}; - static float lmodel_localviewer[] = - {0.0}; -#if 0 - GLfloat map1[4] = - {0.0, 0.0, 0.0, 0.0}; - GLfloat map2[4] = - {0.0, 0.0, 0.0, 0.0}; -#endif - - glFrontFace(GL_CW); - - glDepthFunc(GL_LEQUAL); - glEnable(GL_DEPTH_TEST); - - glLightfv(GL_LIGHT0, GL_AMBIENT, ambient); - glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse); - glLightfv(GL_LIGHT0, GL_POSITION, position); - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient); - glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, lmodel_localviewer); - glEnable(GL_LIGHTING); - glEnable(GL_LIGHT0); - - glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess); - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_diffuse); - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient); - - InitFishs(ap); - - glClearColor(0.0, 0.5, 0.9, 0.0); + static float ambient[] = + {0.1, 0.1, 0.1, 1.0}; + static float diffuse[] = + {1.0, 1.0, 1.0, 1.0}; + static float position[] = + {0.0, 1.0, 0.0, 0.0}; + static float mat_shininess[] = + {90.0}; + static float mat_specular[] = + {0.8, 0.8, 0.8, 1.0}; + static float mat_diffuse[] = + {0.46, 0.66, 0.795, 1.0}; + static float mat_ambient[] = + {0.0, 0.1, 0.2, 1.0}; + static float lmodel_ambient[] = + {0.4, 0.4, 0.4, 1.0}; + static float lmodel_localviewer[] = + {0.0}; + float fblue = 0.0, fgreen; + + glFrontFace(GL_CW); + + glDepthFunc(GL_LEQUAL); + glEnable(GL_DEPTH_TEST); + + glLightfv(GL_LIGHT0, GL_AMBIENT, ambient); + glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse); + glLightfv(GL_LIGHT0, GL_POSITION, position); + glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient); + glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, lmodel_localviewer); + glEnable(GL_LIGHTING); + glEnable(GL_LIGHT0); + + glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient); + + InitFishs(ap); + + /* Add a little randomness */ + fblue = ((float) (NRAND(50)) / 100.0) + 0.50; + fgreen = fblue * 0.56; + glClearColor(0.0, fgreen, fblue, 0.0); } static void -Reshape(ModeInfo *mi,int width, int height) +Reshape(ModeInfo * mi, int width, int height) { - atlantisstruct *ap = &atlantis[MI_SCREEN(mi)]; + atlantisstruct *ap = &atlantis[MI_SCREEN(mi)]; - glViewport(0, 0, ap->WinW= (GLint) width, ap->WinH= (GLint) height); + glViewport(0, 0, ap->WinW = (GLint) width, ap->WinH = (GLint) height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluPerspective(400.0, (GLdouble)width/(GLdouble)height, 1.0, 2000000.0); - glMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + gluPerspective(400.0, (GLdouble) width / (GLdouble) height, 1.0, 2000000.0); + glMatrixMode(GL_MODELVIEW); } static void -Animate(atlantisstruct *ap) +Animate(atlantisstruct * ap) { - int i; - - for (i = 0; i < NUM_SHARKS; i++) { - SharkPilot(&(ap->sharks[i])); - SharkMiss(ap,i); - } - WhalePilot(&(ap->dolph)); - ap->dolph.phi++; - WhalePilot(&(ap->momWhale)); - ap->momWhale.phi++; - WhalePilot(&(ap->babyWhale)); - ap->babyWhale.phi++; + int i; + + for (i = 0; i < ap->num_sharks; i++) { + SharkPilot(&(ap->sharks[i]), ap->sharkspeed); + SharkMiss(ap, i); + } + WhalePilot(&(ap->dolph), ap->whalespeed, ap->whaledir); + ap->dolph.phi++; + WhalePilot(&(ap->momWhale), ap->whalespeed, ap->whaledir); + ap->momWhale.phi++; + WhalePilot(&(ap->babyWhale), ap->whalespeed, ap->whaledir); + ap->babyWhale.phi++; } static void -AllDisplay(atlantisstruct *ap) +AllDisplay(atlantisstruct * ap) { - int i; - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - for (i = 0; i < NUM_SHARKS; i++) { - glPushMatrix(); - FishTransform(&(ap->sharks[i])); - DrawShark(&(ap->sharks[i])); - glPopMatrix(); - } - - glPushMatrix(); - FishTransform(&(ap->dolph)); - DrawDolphin(&(ap->dolph)); - glPopMatrix(); - - glPushMatrix(); - FishTransform(&(ap->momWhale)); - DrawWhale(&(ap->momWhale)); - glPopMatrix(); - - glPushMatrix(); - FishTransform(&(ap->babyWhale)); - glScalef(0.45, 0.45, 0.3); - DrawWhale(&(ap->babyWhale)); - glPopMatrix(); + int i; + + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + for (i = 0; i < ap->num_sharks; i++) { + glPushMatrix(); + FishTransform(&(ap->sharks[i])); + DrawShark(&(ap->sharks[i]), ap->wire); + glPopMatrix(); + } + + glPushMatrix(); + FishTransform(&(ap->dolph)); + DrawDolphin(&(ap->dolph), ap->wire); + glPopMatrix(); + + glPushMatrix(); + FishTransform(&(ap->momWhale)); + DrawWhale(&(ap->momWhale), ap->wire); + glPopMatrix(); + + glPushMatrix(); + FishTransform(&(ap->babyWhale)); + glScalef(0.45, 0.45, 0.3); + DrawWhale(&(ap->babyWhale), ap->wire); + glPopMatrix(); } /* @@ -288,11 +323,38 @@ init_atlantis(ModeInfo * mi) if (atlantis == NULL) { if ((atlantis = (atlantisstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (atlantisstruct))) == NULL) + sizeof (atlantisstruct))) == NULL) return; } ap = &atlantis[screen]; - + ap->num_sharks = MI_COUNT(mi); + if (ap->sharks == NULL) { + if ((ap->sharks = (fishRec *) calloc(ap->num_sharks, + sizeof (fishRec))) == NULL) { + /* free everything up to now */ + (void) free((void *) atlantis); + atlantis = NULL; + return; + } + } + ap->sharkspeed = MI_CYCLES(mi); /* has influence on the "width" + of the movement */ + ap->sharksize = MI_SIZE(mi); /* has influence on the "distance" + of the sharks */ + ap->whalespeed = whalespeed; + ap->wire = MI_IS_WIREFRAME(mi); + + if (MI_IS_DEBUG(mi)) { + (void) fprintf(stderr, + "%s:\n\tnum_sharks=%d\n\tsharkspeed=%.1f\n\tsharksize=%d\n\twhalespeed=%.1f\n\twireframe=%s\n", + MI_NAME(mi), + ap->num_sharks, + ap->sharkspeed, + ap->sharksize, + ap->whalespeed, + ap->wire ? "yes" : "no" + ); + } if ((ap->glx_context = init_GL(mi)) != NULL) { Reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); @@ -319,6 +381,8 @@ draw_atlantis(ModeInfo * mi) Display *display = MI_DISPLAY(mi); Window window = MI_WINDOW(mi); + MI_IS_DRAWN(mi) = True; + if (!ap->glx_context) return; @@ -346,26 +410,24 @@ draw_atlantis(ModeInfo * mi) void release_atlantis(ModeInfo * mi) { + int screen; + if (atlantis != NULL) { + for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { + atlantisstruct *ap = &atlantis[screen]; + + if (ap->sharks) + (void) free((void *) ap->sharks); + } (void) free((void *) atlantis); atlantis = NULL; } FreeAllGL(mi); } -/* - *----------------------------------------------------------------------------- - * Called when the mainline xlock code notices possible window - * damage. This hook should take steps to repaint the entire - * window (no specific damage area information is provided). - *----------------------------------------------------------------------------- - */ - void refresh_atlantis(ModeInfo * mi) { - MI_CLEARWINDOW(mi); - Reshape(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); } void @@ -377,7 +439,7 @@ change_atlantis(ModeInfo * mi) return; glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(ap->glx_context)); - Init(ap); + Init(ap); } -#endif /* USE_GL */ +#endif /* USE_GL */