X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Feuler2d.c;h=d42a2bbfd16becf622d396a516afeb73dae43c05;hb=39809ded547bdbb08207d3e514950425215b4410;hp=c73b64ad62a75f26f94c250e0d91d7ab1680a8cc;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3;p=xscreensaver diff --git a/hacks/euler2d.c b/hacks/euler2d.c index c73b64ad..d42a2bbf 100644 --- a/hacks/euler2d.c +++ b/hacks/euler2d.c @@ -1,9 +1,8 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* euler2d --- 2 Dimensional Incompressible Inviscid Fluid Flow */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)euler2d.c 5.00 2000/11/01 xlockmore"; - #endif /* @@ -42,19 +41,21 @@ static const char sccsid[] = "@(#)euler2d.c 5.00 2000/11/01 xlockmore"; */ #ifdef STANDALONE -#define MODE_euler2d -#define PROGCLASS "Euler2d" -#define HACK_INIT init_euler2d -#define HACK_DRAW draw_euler2d -#define euler2d_opts xlockmore_opts -#define DEFAULTS "*delay: 10000 \n" \ -"*count: 1024 \n" \ -"*cycles: 3000 \n" \ -"*ncolors: 64 \n" -#define SMOOTH_COLORS -#include "xlockmore.h" /* in xscreensaver distribution */ +# define MODE_euler2d +# define DEFAULTS "*delay: 10000 \n" \ + "*count: 1024 \n" \ + "*cycles: 3000 \n" \ + "*ncolors: 64 \n" \ + "*fpsSolid: true \n" \ + "*ignoreRotation: True \n" \ + +# define SMOOTH_COLORS +# define release_euler2d 0 +# define reshape_euler2d 0 +# define euler2d_handle_event 0 +# include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ -#include "xlock.h" /* in xlockmore distribution */ +# include "xlock.h" /* in xlockmore distribution */ #endif /* STANDALONE */ #ifdef MODE_euler2d @@ -69,32 +70,30 @@ static float power = 1; static XrmOptionDescRec opts[] = { - {(char* ) "-eulertail", (char *) ".euler2d.eulertail", - XrmoptionSepArg, (caddr_t) NULL}, - {(char* ) "-eulerpower", (char *) ".euler2d.eulerpower", - XrmoptionSepArg, (caddr_t) NULL}, + {"-eulertail", ".euler2d.eulertail", XrmoptionSepArg, NULL}, + {"-eulerpower", ".euler2d.eulerpower", XrmoptionSepArg, NULL}, }; static argtype vars[] = { - {(caddr_t *) &tail_len, (char *) "eulertail", - (char *) "EulerTail", (char *) DEF_EULERTAIL, t_Int}, - {(caddr_t *) &power, (char *) "eulerpower", - (char *) "EulerPower", (char *) "1", t_Float}, + {&tail_len, "eulertail", + "EulerTail", (char *) DEF_EULERTAIL, t_Int}, + {&power, "eulerpower", + "EulerPower", "1", t_Float}, }; static OptionStruct desc[] = { - {(char *) "-eulertail len", (char *) "Length of Euler2d tails"}, - {(char *) "-eulerpower power", (char *) "power of interaction law for points for Euler2d"}, + {"-eulertail len", "Length of Euler2d tails"}, + {"-eulerpower power", "power of interaction law for points for Euler2d"}, }; -ModeSpecOpt euler2d_opts = +ENTRYPOINT ModeSpecOpt euler2d_opts = {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES ModStruct euler2d_description = { - "euler2d", "init_euler2d", "draw_euler2d", "release_euler2d", - "refresh_euler2d", "init_euler2d", (char *) NULL, &euler2d_opts, + "euler2d", "init_euler2d", "draw_euler2d", (char *) NULL, + "refresh_euler2d", "init_euler2d", "free_euler2d", &euler2d_opts, 1000, 1024, 3000, 1, 64, 1.0, "", "Simulates 2D incompressible invisid fluid.", 0, NULL }; @@ -116,6 +115,7 @@ typedef struct { int height; int count; double xshift,yshift,scale; + double xshift2,yshift2; double radius; int N; @@ -484,11 +484,12 @@ ode_solve(euler2dstruct *sp) #define deallocate(p,t) if (p!=NULL) {(void) free((void *) p); p=(t*)NULL; } #define allocate(p,t,s) if ((p=(t*)malloc(sizeof(t)*s))==NULL)\ -{free_euler2d(sp);return;} +{free_euler2d(mi);return;} -static void -free_euler2d(euler2dstruct *sp) +ENTRYPOINT void +free_euler2d(ModeInfo * mi) { + euler2dstruct *sp = &euler2ds[MI_SCREEN(mi)]; deallocate(sp->csegs, XSegment); deallocate(sp->old_segs, XSegment); deallocate(sp->nold_segs, int); @@ -507,8 +508,8 @@ free_euler2d(euler2dstruct *sp) deallocate(sp->mod_dp2, double); } -void -init_euler2d(ModeInfo * mi) +ENTRYPOINT void +init_euler2d (ModeInfo * mi) { #define nr_rotates 18 /* how many rotations to try to fill as much of screen as possible - must be even number */ euler2dstruct *sp; @@ -524,21 +525,38 @@ init_euler2d(ModeInfo * mi) delta_t = 0.001; if (power>1.0) delta_t *= pow(0.1,power-1); - if (euler2ds == NULL) { - if ((euler2ds = (euler2dstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (euler2dstruct))) == NULL) - return; - } + MI_INIT (mi, euler2ds); sp = &euler2ds[MI_SCREEN(mi)]; +#ifdef HAVE_JWXYZ + jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi), False); +#endif + sp->boundary_color = NRAND(MI_NPIXELS(mi)); sp->hide_vortex = NRAND(4) != 0; sp->count = 0; + sp->xshift2 = sp->yshift2 = 0; + sp->width = MI_WIDTH(mi); sp->height = MI_HEIGHT(mi); + if (sp->width > sp->height * 5 || /* window has weird aspect */ + sp->height > sp->width * 5) + { + if (sp->width > sp->height) + { + sp->height = sp->width * 0.8; + sp->yshift2 = -sp->height/2; + } + else + { + sp->width = sp->height * 0.8; + sp->xshift2 = -sp->width/2; + } + } + sp->N = MI_COUNT(mi)+number_of_vortex_points; sp->Nvortex = number_of_vortex_points; @@ -552,8 +570,6 @@ init_euler2d(ModeInfo * mi) /* Clear the background. */ MI_CLEARWINDOW(mi); - free_euler2d(sp); - /* Allocate memory. */ if (sp->csegs == NULL) { @@ -679,6 +695,8 @@ init_euler2d(ModeInfo * mi) else sp->yshift = (low[besti-nr_rotates/2]+high[besti-nr_rotates/2])/2.0*sp->scale+sp->height/2; + sp->xshift += sp->xshift2; + sp->yshift += sp->yshift2; /* Initialize boundary */ @@ -747,8 +765,8 @@ init_euler2d(ModeInfo * mi) } } -void -draw_euler2d(ModeInfo * mi) +ENTRYPOINT void +draw_euler2d (ModeInfo * mi) { Display *display = MI_DISPLAY(mi); Window window = MI_WINDOW(mi); @@ -856,23 +874,14 @@ draw_euler2d(ModeInfo * mi) } -void -release_euler2d(ModeInfo * mi) -{ - if (euler2ds != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) - free_euler2d(&euler2ds[screen]); - (void) free((void *) euler2ds); - euler2ds = (euler2dstruct *) NULL; - } -} - -void -refresh_euler2d(ModeInfo * mi) +#ifndef STANDALONE +ENTRYPOINT void +refresh_euler2d (ModeInfo * mi) { MI_CLEARWINDOW(mi); } +#endif + +XSCREENSAVER_MODULE ("Euler2D", euler2d) #endif /* MODE_euler2d */