X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglblur.c;h=d65fdacf20c796cc5f6292b9331fc5ed1c21d2bd;hb=c141c2b05e374757b6499d12bb8a6d4d943b1529;hp=193da13f3e85fffe4d5a80c178661546e956ddab;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/glx/glblur.c b/hacks/glx/glblur.c
index 193da13f..d65fdacf 100644
--- a/hacks/glx/glblur.c
+++ b/hacks/glx/glblur.c
@@ -1,5 +1,5 @@
 /* glblur --- radial blur using GL textures
- * Copyright (c) 2002-2004 Jamie Zawinski <jwz@jwz.org>
+ * Copyright (c) 2002-2011 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -46,7 +46,7 @@
 
 #define DEF_SPIN        "XYZ"
 #define DEF_WANDER      "True"
-#define DEF_BLURSIZE    "15"
+#define DEF_BLUR_SIZE   "15"
 
 typedef struct metaball metaball;
 
@@ -99,7 +99,7 @@ static XrmOptionDescRec opts[] = {
 static argtype vars[] = {
   {&do_spin,   "spin",   "Spin",   DEF_SPIN,   t_String},
   {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
-  {&blursize,  "blurSize","BlurSize", DEF_BLURSIZE,  t_Int},
+  {&blursize,  "blurSize","BlurSize", DEF_BLUR_SIZE,  t_Int},
 };
 
 ENTRYPOINT ModeSpecOpt glblur_opts = {countof(opts), opts, countof(vars), vars, NULL};
@@ -239,11 +239,13 @@ init_texture (ModeInfo *mi)
 
   glGenTextures (1, &bp->texture);
   glBindTexture (GL_TEXTURE_2D, bp->texture);
-  glTexImage2D (GL_TEXTURE_2D, 0, 4, 128, 128, 0,
+  glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
+                bp->tex_w, bp->tex_h, 0,
 		GL_RGBA,
                 /* GL_UNSIGNED_BYTE, */
                 GL_UNSIGNED_INT_8_8_8_8_REV,
                 bp->tex_data);
+  check_gl_error ("texture generation");
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 }
@@ -262,7 +264,7 @@ render_scene_to_texture (ModeInfo *mi)
   glBindTexture (GL_TEXTURE_2D, bp->texture);
   glCopyTexImage2D (GL_TEXTURE_2D, 0, GL_LUMINANCE, 0, 0,
                     bp->tex_w, bp->tex_h, 0);
-  check_gl_error ("texture");
+  check_gl_error ("texture2D");
 
   glViewport (0, 0, MI_WIDTH(mi), MI_HEIGHT(mi));
 }
@@ -278,12 +280,9 @@ overlay_blur_texture (ModeInfo *mi)
   GLfloat inc = 0.02 * (25.0 / times);
 
   GLfloat spost = 0;		    /* starting texture coordinate offset */
-  GLfloat alpha_inc = 0.9 / times;  /* transparency fade factor */
+  GLfloat alpha_inc;		    /* transparency fade factor */
   GLfloat alpha = 0.2;		    /* initial transparency */
 
-  glDisable (GL_TEXTURE_GEN_S);
-  glDisable (GL_TEXTURE_GEN_T);
-
   glEnable (GL_TEXTURE_2D);
   glDisable (GL_DEPTH_TEST);
   glBlendFunc (GL_SRC_ALPHA,GL_ONE);
@@ -361,7 +360,9 @@ glblur_handle_event (ModeInfo *mi, XEvent *event)
     }
   else if (event->xany.type == ButtonPress &&
            (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5))
+            event->xbutton.button == Button5 ||
+            event->xbutton.button == Button6 ||
+            event->xbutton.button == Button7))
     {
       gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10,
                               !!event->xbutton.state);
@@ -400,6 +401,7 @@ init_glblur (ModeInfo *mi)
   bp->glx_context = init_GL(mi);
 
   reshape_glblur (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+  clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
 
   if (!wire)
     {
@@ -428,7 +430,7 @@ init_glblur (ModeInfo *mi)
       glEnable(GL_LIGHTING);
       glEnable(GL_LIGHT0);
 
-      glMateriali(GL_FRONT, GL_SHININESS, shiny);
+      glMaterialf(GL_FRONT, GL_SHININESS, shiny);
     }
 
   {
@@ -484,6 +486,7 @@ init_glblur (ModeInfo *mi)
   bp->scene_dlist2 = glGenLists (1);
 
   init_texture (mi);
+
   generate_object (mi);
 }
 
@@ -568,7 +571,6 @@ draw_glblur (ModeInfo *mi)
     glMaterialfv (GL_FRONT_AND_BACK, GL_SPECULAR, spec);
 
     glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color0);
-
     glCallList (bp->obj_dlist0);
 
     glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color1);
@@ -577,6 +579,7 @@ draw_glblur (ModeInfo *mi)
     glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color2);
     glCallList (bp->obj_dlist2);
 
+    glMatrixMode (GL_MODELVIEW);
     glPopMatrix ();
   }
   glEndList ();
@@ -598,6 +601,7 @@ draw_glblur (ModeInfo *mi)
     glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color3);
     glCallList (bp->obj_dlist3);
 
+    glMatrixMode (GL_MODELVIEW);
     glPopMatrix ();
   }
   glEndList ();