X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fgflux.c;h=e5e58ae99656b798b32fec4916899c66a6ae5561;hp=23fce87c78301571bcdde8ecfbd8311e377ffeca;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=3d9140a05b5272fed0883a0af0a71e30ef44d47f diff --git a/hacks/glx/gflux.c b/hacks/glx/gflux.c index 23fce87c..e5e58ae9 100644 --- a/hacks/glx/gflux.c +++ b/hacks/glx/gflux.c @@ -1,9 +1,8 @@ /* -*- Mode: C; tab-width: 4 -*- emacs friendly */ - /* gflux - creates a fluctuating 3D grid * requires OpenGL or MesaGL * - * Copyright (c) Josiah Pease, 2000 + * Copyright (c) Josiah Pease, 2000, 2003 * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that @@ -34,40 +33,20 @@ * 04 July 2000 : majour bug hunt, xscreensaver code rewritten * 08 July 2000 : texture mapping, rotation and zoom added * 21 July 2000 : cleaned up code from bug hunts, manpage written + * 24 November 2000 : fixed x co-ord calculation in solid - textured + * 05 March 2001 : put back non pnmlib code with #ifdefs + * 11 May 2002 : fixed image problems with large images */ -/*- - * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock. - * otherwise caddr_t is not defined correctly - */ - -#include - - #ifdef STANDALONE -# define PROGCLASS "gflux" -# define HACK_INIT init_gflux -# define HACK_DRAW draw_gflux -# define HACK_RESHAPE reshape_gflux -# define gflux_opts xlockmore_opts -#define DEFAULTS "*delay: 20000 \n" \ - "*showFPS: False \n" \ - "*squares: 19 \n" \ - "*resolution: 0 \n" \ - "*draw: 0 \n" \ - "*flat: 0 \n" \ - "*speed: 0.05 \n" \ - "*rotationx: 0.01 \n" \ - "*rotationy: 0.0 \n" \ - "*rotationz: 0.1 \n" \ - "*waves: 3 \n" \ - "*waveChange: 50 \n" \ - "*waveHeight: 1.0 \n" \ - "*waveFreq: 3.0 \n" \ - "*zoom: 1.0 \n" +#define DEFAULTS "*delay: 20000\n" \ + "*showFPS: False\n" \ + "*mode: light\n" \ + "*useSHM: True \n" +# define refresh_gflux 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -75,13 +54,6 @@ #ifdef USE_GL /* whole file */ -#ifdef HAVE_XPM -# include -# ifndef PIXEL_ALREADY_TYPEDEFED -# define PIXEL_ALREADY_TYPEDEFED /* Sigh, Xmu/Drawing.h needs this... */ -# endif -#endif - #ifdef HAVE_XMU # ifndef VMS # include @@ -96,62 +68,66 @@ #include #include -#include -#include -#include - #include -static enum {wire=0,solid,light,checker,textured} _draw; /* draw style */ -static int _squares = 19; /* grid size */ -static int _resolution = 4; /* wireframe resolution */ -static int _flat = 0; +#include "grab-ximage.h" +#include "gltrackball.h" + + +static enum {wire=0,solid,light,checker,grab} _draw; -static float _speed = 0.05; -static float _rotationx = 0.01; -static float _rotationy = 0.0; -static float _rotationz = 0.1; -static float _zoom = 1.0; +static int _squares; /* grid size */ +static int _resolution; /* wireframe resolution */ +static int _flat; + +static float _speed; +static float _rotationx; +static float _rotationy; +static float _rotationz; +static float _zoom; + +static int _waves; +static int _waveChange; +static float _waveHeight; +static float _waveFreq; -static int _waves = 3; -static int _waveChange = 50; -static float _waveHeight = 1.0; -static float _waveFreq = 3.0; #define WIDTH 320 #define HEIGHT 240 static XrmOptionDescRec opts[] = { - {"-squares", ".gflux.squares", XrmoptionSepArg, (caddr_t) NULL}, - {"-resolution", ".gflux.resolution", XrmoptionSepArg, (caddr_t) NULL}, - {"-draw", ".gflux.draw", XrmoptionSepArg, (caddr_t) NULL}, - {"-flat", ".gflux.flat", XrmoptionSepArg, (caddr_t) NULL}, - {"-speed", ".gflux.speed", XrmoptionSepArg, (caddr_t) NULL}, - {"-rotationx", ".gflux.rotationx", XrmoptionSepArg, (caddr_t) NULL}, - {"-rotationy", ".gflux.rotationy", XrmoptionSepArg, (caddr_t) NULL}, - {"-rotationz", ".gflux.rotationz", XrmoptionSepArg, (caddr_t) NULL}, - {"-waves", ".gflux.waves", XrmoptionSepArg, (caddr_t) NULL}, - {"-waveChange", ".gflux.waveChange", XrmoptionSepArg, (caddr_t) NULL}, - {"-waveHeight", ".gflux.waveHeight", XrmoptionSepArg, (caddr_t) NULL}, - {"-waveFreq", ".gflux.waveFreq", XrmoptionSepArg, (caddr_t) NULL}, - {"-zoom", ".gflux.zoom", XrmoptionSepArg, (caddr_t) NULL}, + {"-squares", ".gflux.squares", XrmoptionSepArg, 0}, + {"-resolution", ".gflux.resolution", XrmoptionSepArg, 0}, +/* {"-draw", ".gflux.draw", XrmoptionSepArg, 0},*/ + {"-mode", ".gflux.mode", XrmoptionSepArg, 0}, + {"-wireframe", ".gflux.mode", XrmoptionNoArg, "wire"}, + {"-flat", ".gflux.flat", XrmoptionSepArg, 0}, + {"-speed", ".gflux.speed", XrmoptionSepArg, 0}, + {"-rotationx", ".gflux.rotationx", XrmoptionSepArg, 0}, + {"-rotationy", ".gflux.rotationy", XrmoptionSepArg, 0}, + {"-rotationz", ".gflux.rotationz", XrmoptionSepArg, 0}, + {"-waves", ".gflux.waves", XrmoptionSepArg, 0}, + {"-waveChange", ".gflux.waveChange", XrmoptionSepArg, 0}, + {"-waveHeight", ".gflux.waveHeight", XrmoptionSepArg, 0}, + {"-waveFreq", ".gflux.waveFreq", XrmoptionSepArg, 0}, + {"-zoom", ".gflux.zoom", XrmoptionSepArg, 0}, }; static argtype vars[] = { - {(caddr_t *) & _squares, "squares", "Squares", "19", t_Int}, - {(caddr_t *) & _resolution, "resolution", "Resolution", "4", t_Int}, - {(caddr_t *) & _draw, "draw", "Draw", "0", t_Int}, - {(caddr_t *) & _flat, "flat", "Flat", "0", t_Int}, - {(caddr_t *) & _speed, "speed", "Speed", "0.05", t_Float}, - {(caddr_t *) & _rotationx, "rotationx", "Rotationx", "0.01", t_Float}, - {(caddr_t *) & _rotationy, "rotationy", "Rotationy", "0.0", t_Float}, - {(caddr_t *) & _rotationz, "rotationz", "Rotationz", "0.1", t_Float}, - {(caddr_t *) & _waves, "waves", "Waves", "3", t_Int}, - {(caddr_t *) & _waveChange, "waveChange", "WaveChange", "50", t_Int}, - {(caddr_t *) & _waveHeight, "waveHeight", "WaveHeight", "1.0", t_Float}, - {(caddr_t *) & _waveFreq, "waveFreq", "WaveFreq", "3.0", t_Float}, - {(caddr_t *) & _zoom, "zoom", "Zoom", "1.0", t_Float}, + {&_squares, "squares", "Squares", "19", t_Int}, + {&_resolution, "resolution", "Resolution", "4", t_Int}, +/* {&_draw, "draw", "Draw", "2", t_Int},*/ + {&_flat, "flat", "Flat", "0", t_Int}, + {&_speed, "speed", "Speed", "0.05", t_Float}, + {&_rotationx, "rotationx", "Rotationx", "0.01", t_Float}, + {&_rotationy, "rotationy", "Rotationy", "0.0", t_Float}, + {&_rotationz, "rotationz", "Rotationz", "0.1", t_Float}, + {&_waves, "waves", "Waves", "3", t_Int}, + {&_waveChange, "waveChange", "WaveChange", "50", t_Int}, + {&_waveHeight, "waveHeight", "WaveHeight", "1.0", t_Float}, + {&_waveFreq, "waveFreq", "WaveFreq", "3.0", t_Float}, + {&_zoom, "zoom", "Zoom", "1.0", t_Float}, }; @@ -159,7 +135,7 @@ static OptionStruct desc[] = { {"-squares num", "size of grid in squares (19)"}, {"-resolution num", "detail of lines making grid, wireframe only (4)"}, - {"-draw num", "draw method to use: 0=wireframe 1=solid 2=lit (0)"}, +/* {"-draw num", "draw method to use: 0=wireframe 1=solid 2=lit (0)"},*/ {"-flat num", "shading method, not wireframe: 0=smooth 1=flat (0)"}, {"-speed num", "speed of waves (0.05)"}, {"-rotationx num", "speed of xrotation (0.01)"}, @@ -172,7 +148,7 @@ static OptionStruct desc[] = {"-zoom num", "camera control (1.0)"}, }; -ModeSpecOpt gflux_opts = {countof(opts), opts, countof(vars), vars, desc}; +ENTRYPOINT ModeSpecOpt gflux_opts = {countof(opts), opts, countof(vars), vars, desc}; #ifdef USE_MODULES ModStruct gflux_description = @@ -183,7 +159,8 @@ ModStruct gflux_description = #endif /* structure for holding the gflux data */ -typedef struct { +typedef struct gfluxstruct { + ModeInfo *modeinfo; int screen_width, screen_height; GLXContext *glx_context; Window window; @@ -194,59 +171,127 @@ typedef struct { double dispy[MAXWAVES]; double dispx[MAXWAVES]; GLfloat colour[3]; - int imageWidth; - int imageHeight; - GLubyte *image; GLuint texName; - void (*drawFunc)(void); + GLfloat tex_xscale; + GLfloat tex_yscale; + XRectangle img_geom; + int img_width, img_height; + void (*drawFunc)(struct gfluxstruct *); + + trackball_state *trackball; + Bool button_down_p; + + double time; + double anglex; + double angley; + double anglez; + + int counter; + int newWave; + + Bool mipmap_p; + Bool waiting_for_image_p; + } gfluxstruct; -static gfluxstruct *gflux = NULL; +static gfluxstruct *gfluxes = NULL; /* prototypes */ -void initLighting(void); -void initTexture(void); -void loadTexture(void); -void createTexture(void); -void displaySolid(void); /* drawFunc implementations */ -void displayLight(void); -void displayTexture(void); -void displayWire(void); -void calcGrid(void); -double getGrid(double,double,double); +static void initLighting(void); +static void grabTexture(gfluxstruct *); +static void createTexture(gfluxstruct *); +static void displaySolid(gfluxstruct *); /* drawFunc implementations */ +static void displayLight(gfluxstruct *); +static void displayTexture(gfluxstruct *); +static void displayWire(gfluxstruct *); +static void calcGrid(gfluxstruct *); +static double getGrid(gfluxstruct *,double,double,double); /* as macro for speed */ /* could do with colour cycling here */ /* void genColour(double);*/ #define genColour(X) \ {\ - gflux->colour[0] = 0.0;\ - gflux->colour[1] = 0.5+0.5*(X);\ - gflux->colour[2] = 0.5-0.5*(X);\ + gp->colour[0] = 0.0;\ + gp->colour[1] = 0.5+0.5*(X);\ + gp->colour[2] = 0.5-0.5*(X);\ } /* BEGINNING OF FUNCTIONS */ +ENTRYPOINT Bool +gflux_handle_event (ModeInfo *mi, XEvent *event) +{ + gfluxstruct *gp = &gfluxes[MI_SCREEN(mi)]; + + if (event->xany.type == ButtonPress && + event->xbutton.button == Button1) + { + gp->button_down_p = True; + gltrackball_start (gp->trackball, + event->xbutton.x, event->xbutton.y, + MI_WIDTH (mi), MI_HEIGHT (mi)); + return True; + } + else if (event->xany.type == ButtonRelease && + event->xbutton.button == Button1) + { + gp->button_down_p = False; + return True; + } + else if (event->xany.type == ButtonPress && + (event->xbutton.button == Button4 || + event->xbutton.button == Button5 || + event->xbutton.button == Button6 || + event->xbutton.button == Button7)) + { + gltrackball_mousewheel (gp->trackball, event->xbutton.button, 10, + !!event->xbutton.state); + return True; + } + else if (event->xany.type == MotionNotify && + gp->button_down_p) + { + gltrackball_track (gp->trackball, + event->xmotion.x, event->xmotion.y, + MI_WIDTH (mi), MI_HEIGHT (mi)); + return True; + } + + return False; +} + + +static void +userRot(gfluxstruct *gp) +{ + gltrackball_rotate (gp->trackball); +} + /* draw the gflux once */ -void draw_gflux(ModeInfo * mi) +ENTRYPOINT void draw_gflux(ModeInfo * mi) { - gfluxstruct *gp = &gflux[MI_SCREEN(mi)]; + gfluxstruct *gp = &gfluxes[MI_SCREEN(mi)]; Display *display = MI_DISPLAY(mi); Window window = MI_WINDOW(mi); if (!gp->glx_context) return; + /* Just keep running before the texture has come in. */ + /* if (gp->waiting_for_image_p) return; */ + glXMakeCurrent(display, window, *(gp->glx_context)); - calcGrid(); - gflux->drawFunc(); + calcGrid(gp); + gp->drawFunc(gp); if (mi->fps_p) do_fps (mi); glXSwapBuffers(display, window); } /* reset the projection matrix */ -void resetProjection(void) { +static void resetProjection(void) +{ glMatrixMode(GL_PROJECTION); glLoadIdentity(); glFrustum(-_zoom,_zoom,-0.8*_zoom,0.8*_zoom,2,6); @@ -256,7 +301,7 @@ void resetProjection(void) { } /* Standard reshape function */ -void +ENTRYPOINT void reshape_gflux(ModeInfo *mi, int width, int height) { glViewport( 0, 0, width, height ); @@ -265,37 +310,41 @@ reshape_gflux(ModeInfo *mi, int width, int height) /* main OpenGL initialization routine */ -void initializeGL(ModeInfo *mi, GLsizei width, GLsizei height) +static void initializeGL(ModeInfo *mi, GLsizei width, GLsizei height) { + gfluxstruct *gp = &gfluxes[MI_SCREEN(mi)]; + reshape_gflux(mi, width, height); glViewport( 0, 0, width, height ); + + gp->tex_xscale = 1.0; /* maybe changed later */ + gp->tex_yscale = 1.0; + switch(_draw) { case solid : - gflux->drawFunc = (displaySolid); + gp->drawFunc = (displaySolid); glEnable(GL_DEPTH_TEST); break; case light : - gflux->drawFunc = (displayLight); + gp->drawFunc = (displayLight); glEnable(GL_DEPTH_TEST); initLighting(); break; case checker : - gflux->drawFunc = (displayTexture); + gp->drawFunc = (displayTexture); glEnable(GL_DEPTH_TEST); - createTexture(); - initTexture(); + createTexture(gp); initLighting(); break; - case textured : - gflux->drawFunc = (displayTexture); + case grab : + gp->drawFunc = (displayTexture); glEnable(GL_DEPTH_TEST); - loadTexture(); - initTexture(); + grabTexture(gp); initLighting(); break; case wire : default : - gflux->drawFunc = (displayWire); + gp->drawFunc = (displayWire); glDisable(GL_DEPTH_TEST); break; } @@ -307,18 +356,41 @@ void initializeGL(ModeInfo *mi, GLsizei width, GLsizei height) /* xgflux initialization routine */ -void init_gflux(ModeInfo * mi) +ENTRYPOINT void init_gflux(ModeInfo * mi) { int screen = MI_SCREEN(mi); gfluxstruct *gp; - if (gflux == NULL) { - if ((gflux = (gfluxstruct *) + if (gfluxes == NULL) { + if ((gfluxes = (gfluxstruct *) calloc(MI_NUM_SCREENS(mi), sizeof (gfluxstruct))) == NULL) return; } - gp = &gflux[screen]; + gp = &gfluxes[screen]; + gp->trackball = gltrackball_init (); + + gp->time = frand(1000.0); /* don't run two screens in lockstep */ + + { + char *s = get_string_resource (mi->dpy, "mode", "Mode"); + if (!s || !*s) _draw = wire; + else if (!strcasecmp (s, "wire")) _draw = wire; + else if (!strcasecmp (s, "solid")) _draw = solid; + else if (!strcasecmp (s, "light")) _draw = light; + else if (!strcasecmp (s, "checker")) _draw = checker; + else if (!strcasecmp (s, "grab")) _draw = grab; + else + { + fprintf (stderr, + "%s: mode must be one of: wire, solid, " + "light, checker, or grab; not \"%s\"\n", + progname, s); + exit (1); + } + } + + gp->modeinfo = mi; gp->window = MI_WINDOW(mi); if ((gp->glx_context = init_GL(mi)) != NULL) { reshape_gflux(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); @@ -329,145 +401,86 @@ void init_gflux(ModeInfo * mi) } /* cleanup code */ -void release_gflux(ModeInfo * mi) +ENTRYPOINT void release_gflux(ModeInfo * mi) { - if(gflux->image!=NULL) free(gflux->image); - if(gflux->glx_context!=NULL) free(gflux->glx_context); - if (gflux != NULL) { - (void) free((void *) gflux); - gflux = NULL; + if (gfluxes != NULL) { + free((void *) gfluxes); + gfluxes = NULL; } FreeAllGL(mi); } -/* loads several different types of PNM image from stdin */ -#define presult(A,B,C) (*(result+(A)*(gflux->imageWidth)*4+(B)*4+(C))) -void loadTexture(void) + +static void createTexture(gfluxstruct *gp) { - int i, j, levels, width, height; - int red,green,blue; - char s[4]; - int ppmType=0; - FILE *file = stdin; - GLubyte *result; - - fgets(s,4,file); - - if(!strncmp(s,"P6",2)) ppmType=6; - if(!strncmp(s,"P5",2)) ppmType=5; - if(!strncmp(s,"P3",2)) ppmType=3; - if(!strncmp(s,"P2",2)) ppmType=2; - if(!ppmType)exit(1); - - while((i=getc(file))=='#') - { - while(getc(file)!='\n'); - } - ungetc(i,file); - - fscanf(file,"%d %d %d",&width,&height,&levels); - - result = malloc(sizeof(GLubyte)*4*width*height); - gflux->imageWidth = width; - gflux->imageHeight = height; - - switch(ppmType) { - case 2 : /* ASCII grey */ - for(i=0;iimage = result; + int size = 4; + unsigned int data[] = { 0xFFFFFFFF, 0xAAAAAAAA, 0xFFFFFFFF, 0xAAAAAAAA, + 0xAAAAAAAA, 0xFFFFFFFF, 0xAAAAAAAA, 0xFFFFFFFF, + 0xFFFFFFFF, 0xAAAAAAAA, 0xFFFFFFFF, 0xAAAAAAAA, + 0xAAAAAAAA, 0xFFFFFFFF, 0xAAAAAAAA, 0xFFFFFFFF }; + + gp->tex_xscale = size; + gp->tex_yscale = size; + + glGenTextures (1, &gp->texName); + glBindTexture (GL_TEXTURE_2D, gp->texName); + + glTexImage2D (GL_TEXTURE_2D, 0, 3, size, size, 0, + GL_RGBA, GL_UNSIGNED_BYTE, data); + + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); } -/* creates an image for texture mapping */ -void createTexture(void) + +static void +image_loaded_cb (const char *filename, XRectangle *geometry, + int image_width, int image_height, + int texture_width, int texture_height, + void *closure) { - int i,j,c; - GLubyte *result; - - gflux->imageHeight = gflux->imageWidth = 8; - - result = malloc(sizeof(GLubyte)*4*gflux->imageHeight*gflux->imageWidth); - for(i=0;iimageHeight;i++) { - for(j=0;jimageWidth;j++) { - c = (((i)%2 ^ (j)%2) ? 100 : 200 ); - presult(i,j,0) = (GLubyte) c; - presult(i,j,1) = (GLubyte) c; - presult(i,j,2) = (GLubyte) c; - presult(i,j,3) = (GLubyte) 255; - } - } - gflux->image = result; + gfluxstruct *gp = (gfluxstruct *) closure; + gp->img_geom = *geometry; + + gp->tex_xscale = (GLfloat) image_width / texture_width; + gp->tex_yscale = -(GLfloat) image_height / texture_height; + gp->img_width = image_width; + gp->img_height = image_height; + + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, + (gp->mipmap_p ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR)); + + gp->waiting_for_image_p = False; } -#undef presult -/* specifies image as texture */ -void initTexture(void) +static void +grabTexture(gfluxstruct *gp) { - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glGenTextures(1, &gflux->texName); - glBindTexture(GL_TEXTURE_2D, gflux->texName); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - clear_gl_error(); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, gflux->imageWidth, - gflux->imageHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, gflux->image); - check_gl_error("texture"); + if (MI_IS_WIREFRAME(gp->modeinfo)) + return; + + gp->waiting_for_image_p = True; + gp->mipmap_p = True; + load_texture_async (gp->modeinfo->xgwa.screen, gp->modeinfo->window, + *gp->glx_context, 0, 0, gp->mipmap_p, gp->texName, + image_loaded_cb, gp); } -void initLighting(void) + +static void initLighting(void) { - static float ambientA[] = {0.0, 0.0, 0.0, 1.0}; - static float diffuseA[] = {1.0, 1.0, 1.0, 1.0}; - static float positionA[] = {5.0, 5.0, 15.0, 1.0}; + static const float ambientA[] = {0.0, 0.0, 0.0, 1.0}; + static const float diffuseA[] = {1.0, 1.0, 1.0, 1.0}; + static const float positionA[] = {5.0, 5.0, 15.0, 1.0}; - static float front_mat_shininess[] = {30.0}; - static float front_mat_specular[] = {0.5, 0.5, 0.5, 1.0}; + static const float front_mat_shininess[] = {30.0}; + static const float front_mat_specular[] = {0.5, 0.5, 0.5, 1.0}; - static float mat_diffuse[] = {0.5, 0.5, 0.5, 1.0}; + static const float mat_diffuse[] = {0.5, 0.5, 0.5, 1.0}; glMaterialfv(GL_FRONT, GL_SHININESS, front_mat_shininess); glMaterialfv(GL_FRONT, GL_SPECULAR, front_mat_specular); @@ -494,18 +507,44 @@ void initLighting(void) /* storing the values in an array */ /* is a posibility */ /************************************/ -void displayTexture(void) +static void displayTexture(gfluxstruct *gp) { - static double time = 0.0; - static double anglex = 0.0; - static double angley = 0.0; - static double anglez = 0.0; - double x,y,u,v; double z; double dx = 2.0/((double)_squares); double dy = 2.0/((double)_squares); + double du = 2.0/((double)_squares); + double dv = 2.0/((double)_squares); + + double xs = gp->tex_xscale; + double ys = gp->tex_yscale; + + double minx, miny, maxx, maxy; + double minu, minv; + +#if 0 + minx = (GLfloat) gp->img_geom.x / gp->img_width; + miny = (GLfloat) gp->img_geom.y / gp->img_height; + maxx = ((GLfloat) (gp->img_geom.x + gp->img_geom.width) / + gp->img_width); + maxy = ((GLfloat) (gp->img_geom.y + gp->img_geom.height) / + gp->img_height); + minu = minx; + minv = miny; + minx = (minx * 2) - 1; + miny = (miny * 2) - 1; + maxx = (maxx * 2) - 1; + maxy = (maxy * 2) - 1; +#else + minx = -1; + miny = -1; + maxx = 1; + maxy = 1; + minv = 0; + minu = 0; +#endif + glMatrixMode (GL_TEXTURE); glLoadIdentity (); glTranslatef(-1,-1,0); @@ -513,37 +552,38 @@ void displayTexture(void) glMatrixMode (GL_MODELVIEW); glLoadIdentity(); - glRotatef(anglex,1,0,0); - glRotatef(angley,0,1,0); - glRotatef(anglez,0,0,1); + userRot(gp); + glRotatef(gp->anglex,1,0,0); + glRotatef(gp->angley,0,1,0); + glRotatef(gp->anglez,0,0,1); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); glEnable(GL_TEXTURE_2D); + + clear_gl_error(); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glBindTexture(GL_TEXTURE_2D, gflux->texName); - glColor3f(0.5,0.5,0.5); + glBindTexture(GL_TEXTURE_2D, gp->texName); + check_gl_error("texture binding"); - for(x=-1,u=0;x<=1;x+=dx,u+=dx) { + glColor3f(0.5,0.5,0.5); + + for(x = minx, u = minu; x < maxx - 0.01; x += dx, u += du) { glBegin(GL_QUAD_STRIP); - for(y=-1,v=0;y<=1;y+=dy,v+=dx) { - z = getGrid(x,y,time); - /* genColour(z); - glColor3fv(gflux->colour); - */ glTexCoord2f(u,v); + for (y = miny, v = minv; y <= maxy + 0.01; y += dy, v += dv) { + z = getGrid(gp,x,y,gp->time); + glTexCoord2f(u*xs,v*ys); glNormal3f( - getGrid(x+dx,y,time)-getGrid(x-dx,y,time), - getGrid(x,y+dy,time)-getGrid(x,y-dy,time), + getGrid(gp,x+dx,y,gp->time)-getGrid(gp, x-dx,y,gp->time), + getGrid(gp,x,y+dy,gp->time)-getGrid(gp, x,y-dy,gp->time), 1 ); glVertex3f(x,y,z); - z = getGrid(x+dx,y,time); - /* genColour(z); - glColor3fv(gflux->colour); - */ glTexCoord2f(u+dx,v); + z = getGrid(gp,x+dx,y,gp->time); + glTexCoord2f((u+du)*xs,v*ys); glNormal3f( - getGrid(x+dx+dx,y,time)-getGrid(x,y,time), - getGrid(x+dx,y+dy,time)-getGrid(x+dx,y-dy,time), + getGrid(gp,x+dx+dx,y,gp->time)-getGrid(gp, x,y,gp->time), + getGrid(gp,x+dx,y+dy,gp->time)-getGrid(gp, x+dx,y-dy,gp->time), 1 ); glVertex3f(x+dx,y,z); @@ -551,91 +591,110 @@ void displayTexture(void) glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + /* Draw a border around the grid. + */ + glColor3f(0.4, 0.4, 0.4); + glDisable(GL_TEXTURE_2D); + glEnable (GL_LINE_SMOOTH); + + glBegin(GL_LINE_LOOP); + y = miny; + for (x = minx; x <= maxx; x += dx) + glVertex3f (x, y, getGrid (gp, x, y, gp->time)); + x = maxx; + for (y = miny; y <= maxy; y += dy) + glVertex3f (x, y, getGrid (gp, x, y, gp->time)); + y = maxy; + for (x = maxx; x >= minx; x -= dx) + glVertex3f (x, y, getGrid (gp, x, y, gp->time)); + x = minx; + for (y = maxy; y >= miny; y -= dy) + glVertex3f (x, y, getGrid (gp, x, y, gp->time)); + + glEnd(); + glEnable(GL_TEXTURE_2D); + + if (! gp->button_down_p) { + gp->time -= _speed; + gp->anglex -= _rotationx; + gp->angley -= _rotationy; + gp->anglez -= _rotationz; + } } -void displaySolid(void) +static void displaySolid(gfluxstruct *gp) { - static double time = 0.0; - static double anglex = 0.0; - static double angley = 0.0; - static double anglez = 0.0; - double x,y; double z; double dx = 2.0/((double)_squares); double dy = 2.0/((double)_squares); glLoadIdentity(); - glRotatef(anglex,1,0,0); - glRotatef(angley,0,1,0); - glRotatef(anglez,0,0,1); + glRotatef(gp->anglex,1,0,0); + glRotatef(gp->angley,0,1,0); + glRotatef(gp->anglez,0,0,1); + userRot(gp); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); - for(x=-1;x<=1;x+=dx) { + for(x=-1;x<0.9999;x+=dx) { glBegin(GL_QUAD_STRIP); for(y=-1;y<=1;y+=dy) { - z = getGrid(x,y,time); + z = getGrid(gp, x,y,gp->time); genColour(z); - glColor3fv(gflux->colour); + glColor3fv(gp->colour); glVertex3f(x,y,z); - z = getGrid(x+dx,y,time); + z = getGrid(gp, x+dx,y,gp->time); genColour(z); - glColor3fv(gflux->colour); + glColor3fv(gp->colour); glVertex3f(x+dx,y,z); } glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + if (! gp->button_down_p) { + gp->time -= _speed; + gp->anglex -= _rotationx; + gp->angley -= _rotationy; + gp->anglez -= _rotationz; + } } -void displayLight(void) +static void displayLight(gfluxstruct *gp) { - static double time = 0.0; - static double anglex = 0.0; - static double angley = 0.0; - static double anglez = 0.0; - double x,y; double z; double dx = 2.0/((double)_squares); double dy = 2.0/((double)_squares); glLoadIdentity(); - glRotatef(anglex,1,0,0); - glRotatef(angley,0,1,0); - glRotatef(anglez,0,0,1); + glRotatef(gp->anglex,1,0,0); + glRotatef(gp->angley,0,1,0); + glRotatef(gp->anglez,0,0,1); + userRot(gp); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); - for(x=-1;x<=1;x+=dx) { + for(x=-1;x<0.9999;x+=dx) { glBegin(GL_QUAD_STRIP); for(y=-1;y<=1;y+=dy) { - z = getGrid(x,y,time); + z = getGrid(gp, x,y,gp->time); genColour(z); - glColor3fv(gflux->colour); + glColor3fv(gp->colour); glNormal3f( - getGrid(x+dx,y,time)-getGrid(x-dx,y,time), - getGrid(x,y+dy,time)-getGrid(x,y-dy,time), + getGrid(gp, x+dx,y,gp->time)-getGrid(gp, x-dx,y,gp->time), + getGrid(gp, x,y+dy,gp->time)-getGrid(gp, x,y-dy,gp->time), 1 ); glVertex3f(x,y,z); - z = getGrid(x+dx,y,time); + z = getGrid(gp, x+dx,y,gp->time); genColour(z); - glColor3fv(gflux->colour); + glColor3fv(gp->colour); glNormal3f( - getGrid(x+dx+dx,y,time)-getGrid(x,y,time), - getGrid(x+dx,y+dy,time)-getGrid(x+dx,y-dy,time), + getGrid(gp, x+dx+dx,y,gp->time)-getGrid(gp, x,y,gp->time), + getGrid(gp, x+dx,y+dy,gp->time)-getGrid(gp, x+dx,y-dy,gp->time), 1 ); glVertex3f(x+dx,y,z); @@ -643,19 +702,16 @@ void displayLight(void) glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + if (! gp->button_down_p) { + gp->time -= _speed; + gp->anglex -= _rotationx; + gp->angley -= _rotationy; + gp->anglez -= _rotationz; + } } -void displayWire(void) +static void displayWire(gfluxstruct *gp) { - static double time = 0.0; - static double anglex = 0.0; - static double angley = 0.0; - static double anglez = 0.0; - double x,y; double z; double dx1 = 2.0/((double)(_squares*_resolution)) - 0.00001; @@ -664,18 +720,19 @@ void displayWire(void) double dy2 = 2.0/((double)_squares) - 0.00001; glLoadIdentity(); - glRotatef(anglex,1,0,0); - glRotatef(angley,0,1,0); - glRotatef(anglez,0,0,1); + glRotatef(gp->anglex,1,0,0); + glRotatef(gp->angley,0,1,0); + glRotatef(gp->anglez,0,0,1); + userRot(gp); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT); for(x=-1;x<=1;x+=dx2) { glBegin(GL_LINE_STRIP); for(y=-1;y<=1;y+=dy1) { - z = getGrid(x,y,time); + z = getGrid(gp, x,y,gp->time); genColour(z); - glColor3fv(gflux->colour); + glColor3fv(gp->colour); glVertex3f(x,y,z); } glEnd(); @@ -683,42 +740,44 @@ void displayWire(void) for(y=-1;y<=1;y+=dy2) { glBegin(GL_LINE_STRIP); for(x=-1;x<=1;x+=dx1) { - z = getGrid(x,y,time); + z = getGrid(gp, x,y,gp->time); genColour(z); - glColor3fv(gflux->colour); + glColor3fv(gp->colour); glVertex3f(x,y,z); } glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + if (! gp->button_down_p) { + gp->time -= _speed; + gp->anglex -= _rotationx; + gp->angley -= _rotationy; + gp->anglez -= _rotationz; + } } /* generates new ripples */ -void calcGrid(void) +static void calcGrid(gfluxstruct *gp) { - static int counter=0; double tmp; - static int newWave; + + if (gp->button_down_p) return; tmp = 1.0/((double)_waveChange); - if(!(counter%_waveChange)) { - newWave = ((int)(counter*tmp))%_waves; - gflux->dispx[newWave] = 1.0 - ((double)random())/RAND_MAX; - gflux->dispy[newWave] = 1.0 - ((double)random())/RAND_MAX; - gflux->freq[newWave] = _waveFreq * ((float)random())/RAND_MAX; - gflux->wa[newWave] = 0.0; + if(!(gp->counter%_waveChange)) { + gp->newWave = ((int)(gp->counter*tmp))%_waves; + gp->dispx[gp->newWave] = -frand(1.0); + gp->dispy[gp->newWave] = -frand(1.0); + gp->freq[gp->newWave] = _waveFreq * frand(1.0); + gp->wa[gp->newWave] = 0.0; } - counter++; - gflux->wa[newWave] += tmp; - gflux->wa[(newWave+1)%_waves] -= tmp; + gp->counter++; + gp->wa[gp->newWave] += tmp; + gp->wa[(gp->newWave+1)%_waves] -= tmp; } /* returns a height for the grid given time and x,y space co-ords */ -double getGrid(double x, double y, double a) +static double getGrid(gfluxstruct *gp, double x, double y, double a) { register int i; double retval=0.0; @@ -726,12 +785,14 @@ double getGrid(double x, double y, double a) tmp = 1.0/((float)_waves); for(i=0;i<_waves;i++) { - retval += gflux->wa[i] * tmp * sin( gflux->freq[i] - * ( (x+gflux->dispx[i]) * (x+gflux->dispx[i]) - + (y+gflux->dispy[i]) * (y+gflux->dispy[i]) +a ) ); + retval += gp->wa[i] * tmp * sin( gp->freq[i] + * ( (x+gp->dispx[i]) * (x+gp->dispx[i]) + + (y+gp->dispy[i]) * (y+gp->dispy[i]) +a ) ); } return(retval); } -#endif +XSCREENSAVER_MODULE ("Gflux", gflux) + +#endif