X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fblinkbox.c;h=b2c6e4bc960f7910a8afd4f4a8f26bdc2a729b61;hb=f0261d8acab611f3433160e4f07367b870439739;hp=23b2643783a2e4d9db47903f50072f7af6d043a8;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/glx/blinkbox.c b/hacks/glx/blinkbox.c index 23b26437..b2c6e4bc 100644 --- a/hacks/glx/blinkbox.c +++ b/hacks/glx/blinkbox.c @@ -31,7 +31,7 @@ #define ALPHA_AMT 0.05 /* this should be between 1 and 8 */ -#define DEF_WH "2" +#define DEF_BOXSIZE "2" #define DEF_DISSOLVE "False" #define DEF_FADE "True" #define DEF_BLUR "True" @@ -121,7 +121,7 @@ static XrmOptionDescRec opts[] = { }; static argtype vars[] = { - {&bscale_wh, "boxsize", "Boxsize", DEF_WH, t_Float}, + {&bscale_wh, "boxsize", "Boxsize", DEF_BOXSIZE, t_Float}, {&do_dissolve, "dissolve", "Dissolve", DEF_DISSOLVE, t_Bool}, {&do_fade, "fade", "Fade", DEF_FADE, t_Bool}, {&do_blur, "blur", "Blur", DEF_BLUR, t_Bool}, @@ -386,8 +386,6 @@ init_ball (ModeInfo *mi) bp->des_amt = bp->bscale.wh / MAX_COUNT; } - bp->glx_context = init_GL(mi); - reshape_ball(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); bp->ballList = glGenLists(1); glNewList(bp->ballList, GL_COMPILE); @@ -440,6 +438,7 @@ draw_ball (ModeInfo *mi) if (! bp->glx_context) return; + mi->polygon_count = 0; glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -466,6 +465,7 @@ draw_ball (ModeInfo *mi) glScalef(2,2,2); glCallList(bp->ballList); + mi->polygon_count += SPHERE_SLICES*SPHERE_STACKS; } else { @@ -487,6 +487,7 @@ draw_ball (ModeInfo *mi) glScalef(2, 2, 2); glCallList(bp->ballList); + mi->polygon_count += SPHERE_SLICES*SPHERE_STACKS; glScalef(.5, .5, .5); } i = 0; @@ -571,6 +572,7 @@ draw_ball (ModeInfo *mi) glScalef(bp->bscale.wh,bp->bscale.wh,bp->bscale.d); } glCallList(bp->boxList); + mi->polygon_count += 6; glPopMatrix(); bp->sp->counter--; bp->sp->des_count++; @@ -585,6 +587,7 @@ draw_ball (ModeInfo *mi) glPopMatrix(); + if (mi->fps_p) do_fps (mi); glFinish(); glXSwapBuffers(dpy, window);