X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fflurry.c;h=c9008a9471ed428f4500ee4c6da2c7e811e2569b;hb=39809ded547bdbb08207d3e514950425215b4410;hp=9e071e7e65731c1ec74318ed088eb5dd7ebf0e89;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/glx/flurry.c b/hacks/glx/flurry.c index 9e071e7e..c9008a94 100644 --- a/hacks/glx/flurry.c +++ b/hacks/glx/flurry.c @@ -47,8 +47,8 @@ static const char sccsid[] = "@(#)flurry.c 4.07 97/11/24 xlockmore"; # define DEFAULTS "*delay: 10000 \n" \ "*showFPS: False \n" -# define refresh_flurry 0 -# define flurry_handle_event 0 +# define release_flurry 0 +# define flurry_handle_event xlockmore_no_events # include "xlockmore.h" /* from the xscreensaver distribution */ #ifdef USE_GL @@ -72,10 +72,10 @@ ModStruct flurry_description = { "flurry", "init_flurry", "draw_flurry", - "release_flurry", + NULL, "draw_flurry", "init_flurry", - NULL, + "free_flurry", &flurry_opts, 1000, 1, 2, 1, 4, 1.0, "", @@ -90,8 +90,6 @@ ModStruct flurry_description = { global_info_t *flurry_info = NULL; -static double gTimeCounter = 0.0; - static double currentTime(void) { struct timeval tv; @@ -105,14 +103,8 @@ double currentTime(void) { return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0; } -void OTSetup (void) { - if (gTimeCounter == 0.0) { - gTimeCounter = currentTime(); - } -} - -double TimeInSecondsSinceStart (void) { - return currentTime() - gTimeCounter; +double TimeInSecondsSinceStart (const global_info_t *global) { + return currentTime() - global->gTimeCounter; } #if 0 @@ -150,7 +142,8 @@ flurry_info_t *new_flurry_info(global_info_t *global, int streams, ColorModes co flurry->flurryRandomSeed = RandFlt(0.0, 300.0); flurry->fOldTime = 0; - flurry->fTime = TimeInSecondsSinceStart() + flurry->flurryRandomSeed; + flurry->dframe = 0; + flurry->fTime = TimeInSecondsSinceStart(global) + flurry->flurryRandomSeed; flurry->fDeltaTime = flurry->fTime - flurry->fOldTime; flurry->numStreams = streams; @@ -199,11 +192,10 @@ void GLSetupRC(global_info_t *global) glViewport(0,0,(int) global->sys_glWidth,(int) global->sys_glHeight); glMatrixMode(GL_PROJECTION); glLoadIdentity(); - gluOrtho2D(0,global->sys_glWidth,0,global->sys_glHeight); + glOrtho(0,global->sys_glWidth,0,global->sys_glHeight,-1,1); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glClearColor(0.0,0.0,0.0,1.0); glClear(GL_COLOR_BUFFER_BIT); glEnableClientState(GL_COLOR_ARRAY); @@ -232,7 +224,7 @@ void GLRenderScene(global_info_t *global, flurry_info_t *flurry, double b) flurry->dframe++; flurry->fOldTime = flurry->fTime; - flurry->fTime = TimeInSecondsSinceStart() + flurry->flurryRandomSeed; + flurry->fTime = TimeInSecondsSinceStart(global) + flurry->flurryRandomSeed; flurry->fDeltaTime = flurry->fTime - flurry->fOldTime; flurry->drag = (float) pow(0.9965,flurry->fDeltaTime*85.0); @@ -326,14 +318,10 @@ ENTRYPOINT void reshape_flurry(ModeInfo *mi, int width, int height) glViewport(0.0, 0.0, width, height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); - gluOrtho2D(0, width, 0, height); + glOrtho(0, width, 0, height,-1,1); glMatrixMode(GL_MODELVIEW); - - glClearColor(0.0, 0.0, 0.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); - glFlush(); - GLResize(global, (float)width, (float)height); } @@ -354,15 +342,12 @@ init_flurry(ModeInfo * mi) PRESET_MAX } preset_num; - if (flurry_info == NULL) { - OTSetup(); - if ((flurry_info = (global_info_t *) calloc(MI_NUM_SCREENS(mi), - sizeof (global_info_t))) == NULL) - return; - } + MI_INIT (mi, flurry_info); global = &flurry_info[screen]; + global->gTimeCounter = currentTime(); + global->window = MI_WINDOW(mi); global->flurry = NULL; @@ -403,7 +388,7 @@ init_flurry(ModeInfo * mi) case PRESET_FIRE: { flurry_info_t *flurry; - flurry = new_flurry_info(global, 12, slowCyclicColorMode, 10000.0, 0.0, 1.0); + flurry = new_flurry_info(global, 12, slowCyclicColorMode, 10000.0, 0.2, 1.0); flurry->next = global->flurry; global->flurry = flurry; break; @@ -473,13 +458,14 @@ init_flurry(ModeInfo * mi) } else { MI_CLEARWINDOW(mi); } + + global->first = 1; + global->oldFrameTime = -1; } ENTRYPOINT void draw_flurry(ModeInfo * mi) { - static int first = 1; - static double oldFrameTime = -1; double newFrameTime; double deltaFrameTime = 0; double brite; @@ -491,7 +477,7 @@ draw_flurry(ModeInfo * mi) Window window = MI_WINDOW(mi); newFrameTime = currentTime(); - if (oldFrameTime == -1) { + if (global->oldFrameTime == -1) { /* special case the first frame -- clear to black */ alpha = 1.0; } else { @@ -504,24 +490,24 @@ draw_flurry(ModeInfo * mi) * than that and the blending causes the display to * saturate, which looks really ugly. */ - if (newFrameTime - oldFrameTime < 1/60.0) { - usleep(MAX_(1,(int)(20000 * (newFrameTime - oldFrameTime)))); + if (newFrameTime - global->oldFrameTime < 1/60.0) { + usleep(MAX_(1,(int)(20000 * (newFrameTime - global->oldFrameTime)))); return; } - deltaFrameTime = newFrameTime - oldFrameTime; + deltaFrameTime = newFrameTime - global->oldFrameTime; alpha = 5.0 * deltaFrameTime; } - oldFrameTime = newFrameTime; + global->oldFrameTime = newFrameTime; if (alpha > 0.2) alpha = 0.2; if (!global->glx_context) return; - if (first) { + if (global->first) { MakeTexture(); - first = 0; + global->first = 0; } glDrawBuffer(GL_BACK); glXMakeCurrent(display, window, *(global->glx_context)); @@ -544,27 +530,18 @@ draw_flurry(ModeInfo * mi) } ENTRYPOINT void -release_flurry(ModeInfo * mi) +free_flurry(ModeInfo * mi) { - if (flurry_info != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - global_info_t *global = &flurry_info[screen]; - flurry_info_t *flurry; + global_info_t *global = &flurry_info[MI_SCREEN(mi)]; + flurry_info_t *flurry; - if (global->glx_context) { - glXMakeCurrent(MI_DISPLAY(mi), global->window, *(global->glx_context)); - } + if (global->glx_context) { + glXMakeCurrent(MI_DISPLAY(mi), global->window, *(global->glx_context)); + } - for (flurry = global->flurry; flurry; flurry=flurry->next) { - delete_flurry_info(flurry); - } - } - (void) free((void *) flurry_info); - flurry_info = NULL; + for (flurry = global->flurry; flurry; flurry=flurry->next) { + delete_flurry_info(flurry); } - FreeAllGL(mi); } XSCREENSAVER_MODULE ("Flurry", flurry)