/* glblur --- radial blur using GL textures
- * Copyright (c) 2002-2008 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
#define DEF_SPIN "XYZ"
#define DEF_WANDER "True"
-#define DEF_BLURSIZE "15"
+#define DEF_BLUR_SIZE "15"
typedef struct metaball metaball;
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};
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);
}
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));
}
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);
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)
{
glEnable(GL_LIGHTING);
glEnable(GL_LIGHT0);
- glMateriali(GL_FRONT, GL_SHININESS, shiny);
+ glMaterialf(GL_FRONT, GL_SHININESS, shiny);
}
{
bp->scene_dlist2 = glGenLists (1);
init_texture (mi);
+
generate_object (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);
glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color2);
glCallList (bp->obj_dlist2);
+ glMatrixMode (GL_MODELVIEW);
glPopMatrix ();
}
glEndList ();
glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color3);
glCallList (bp->obj_dlist3);
+ glMatrixMode (GL_MODELVIEW);
glPopMatrix ();
}
glEndList ();