X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fpulsar.c;h=c344c82bbb6eca843b03e6ff5839b965fd6a2c2f;hp=b7a8e43346b096abc4c50e3a6bcea23d36c09ca2;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=551b3de3f619c04c2dd1971ee9b3f02e270c28c9 diff --git a/hacks/glx/pulsar.c b/hacks/glx/pulsar.c index b7a8e433..c344c82b 100644 --- a/hacks/glx/pulsar.c +++ b/hacks/glx/pulsar.c @@ -15,35 +15,50 @@ * Revision History: * 4-Apr-1999: dek@cgl.ucsf.edu Created module "pulsar" + * 27-Apr-1999: dek@cgl.ucsf.edu Submitted module "pulsar" + * 4-May-1999: jwz@jwz.org Added module "pulsar" + * 4-May-1999: dek@cgl.ucsf.edu Submitted module "pulsar" updates * + * Notes: + * The pulsar screensaver draws a number of rotating, pulsing rectangles + * on your screen. Depending on the options you choose, you can set a number + * of interesting OpenGL parameters, including alpha blending, depth testing, fog, + * lighting, texturing, mipmapping, bilinear filtering, and line antialiasing. + * Additionally, there is a "frames per second" meter which gives an estimate of + * the speed of your graphics card. + * + * Example command-line switches: + * Only draw a single quad, and don't fill it (boring but fast) + * pulsar -wire -quads 1 -fps + * + * Only try this with hardware graphics acceleration (PPro 200 w/ a Voodoo 2 runs great) + * pulsar -quads 10 -texture -mipmap -texture_quality -light -fog -fps + * */ #include #include #include -/*- - * 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 "Screensaver" # define HACK_INIT init_screensaver # define HACK_DRAW draw_screensaver +# define HACK_RESHAPE reshape_screensaver # define screensaver_opts xlockmore_opts -#define DEFAULTS "*light: False \n" \ +#define DEFAULTS "*delay: 10000 \n" \ + "*showFPS: False \n" \ + "*light: False \n" \ "*wire: False \n" \ + "*quads: 5 \n" \ "*blend: True \n" \ "*fog: False \n" \ "*antialias: False \n" \ "*texture: False \n" \ "*texture_quality: False \n" \ "*mipmap: False \n" \ - "*fps: False \n" \ "*doDepth: False \n" \ + "*image: BUILTIN \n" # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ @@ -52,13 +67,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 @@ -71,101 +79,40 @@ #include #include -#include -#include +#include #include +#include + +#include "xpm-ximage.h" /* Functions for loading and storing textures */ #define checkImageWidth 64 #define checkImageHeight 64 -char *Textures[] = { - "./test.ppm4", -}; - -typedef struct { - int sizeX, sizeY; - GLubyte *data; -} PPMImage; - /* Functions for handling the frames per second timer */ #include "GL/glx.h" -#ifndef SAMPLE_FRAMES -#define SAMPLE_FRAMES 10 -#endif - -static GLint base; -static int FrameCounter = 0; -static double oldtime=-1., newtime=-1.; -static char FPSstring[1024]="FPS: NONE"; - -static float x_pos=0, y_pos=0; - -#define FONT "-*-courier-medium-r-normal-*-240-*" - - - -#define NUM_TRIANGLES 5 -static float scale_x=1, scale_y=1, scale_z=1; -static int frame = 0; -struct triangle -{ - GLfloat tx, ty, tz; - GLfloat rx, ry, rz; - - GLfloat dtx, dty, dtz; - GLfloat drx, dry, drz; - -}; -struct triangle triangles[NUM_TRIANGLES]; -GLint tri_list; - - #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) #define WIDTH 800 #define HEIGHT 600 -int global_width=WIDTH, global_height=HEIGHT; - - -static XrmOptionDescRec opts[] = { - {"-light", ".pulsar.light", XrmoptionNoArg, (caddr_t) "true" }, - {"+light", ".pulsar.light", XrmoptionNoArg, (caddr_t) "false" }, - {"-wire", ".pulsar.wire", XrmoptionNoArg, (caddr_t) "true" }, - {"+wire", ".pulsar.wire", XrmoptionNoArg, (caddr_t) "false" }, - {"-blend", ".pulsar.blend", XrmoptionNoArg, (caddr_t) "true" }, - {"+blend", ".pulsar.blend", XrmoptionNoArg, (caddr_t) "false" }, - {"-fog", ".pulsar.fog", XrmoptionNoArg, (caddr_t) "true" }, - {"+fog", ".pulsar.fog", XrmoptionNoArg, (caddr_t) "false" }, - {"-antialias", ".pulsar.antialias", XrmoptionNoArg, (caddr_t) "true" }, - {"+antialias", ".pulsar.antialias", XrmoptionNoArg, (caddr_t) "false" }, - {"-texture", ".pulsar.texture", XrmoptionNoArg, (caddr_t) "true" }, - {"+texture", ".pulsar.texture", XrmoptionNoArg, (caddr_t) "false" }, - {"-texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, (caddr_t) "true" }, - {"+texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, (caddr_t) "false" }, - {"-mipmap", ".pulsar.mipmap", XrmoptionNoArg, (caddr_t) "true" }, - {"+mipmap", ".pulsar.mipmap", XrmoptionNoArg, (caddr_t) "false" }, - {"-fps", ".pulsar.fps", XrmoptionNoArg, (caddr_t) "true" }, - {"+fps", ".pulsar.fps", XrmoptionNoArg, (caddr_t) "false" }, - {"-do_depth", ".pulsar.doDepth", XrmoptionNoArg, (caddr_t) "true" }, - {"+do_depth", ".pulsar.doDepth", XrmoptionNoArg, (caddr_t) "false" }, -}; - -#define DEF_LIGHT "False" -#define DEF_WIRE "False" -#define DEF_BLEND "True" -#define DEF_FOG "False" +#define NUM_QUADS 5 +#define DEF_NUM_QUADS "5" +#define DEF_LIGHT "False" +#define DEF_WIRE "False" +#define DEF_BLEND "True" +#define DEF_FOG "False" #define DEF_ANTIALIAS "False" -#define DEF_TEXTURE "False" +#define DEF_TEXTURE "False" #define DEF_TEXTURE_QUALITY "False" -#define DEF_MIPMAP "False" -#define DEF_FPS "False" -#define DEF_DO_DEPTH "False" +#define DEF_MIPMAP "False" +#define DEF_DO_DEPTH "False" +#define DEF_IMAGE "BUILTIN" +static int num_quads; static int do_light; static int do_wire; static int do_blend; @@ -174,24 +121,65 @@ static int do_antialias; static int do_texture; static int do_texture_quality; static int do_mipmap; -static int do_fps; static int do_depth; +static char *which_image; + + +static XrmOptionDescRec opts[] = { + {"-quads", ".pulsar.quads", XrmoptionSepArg, 0 }, + {"-light", ".pulsar.light", XrmoptionNoArg, "true" }, + {"+light", ".pulsar.light", XrmoptionNoArg, "false" }, + {"-wire", ".pulsar.wire", XrmoptionNoArg, "true" }, + {"+wire", ".pulsar.wire", XrmoptionNoArg, "false" }, + {"-blend", ".pulsar.blend", XrmoptionNoArg, "true" }, + {"+blend", ".pulsar.blend", XrmoptionNoArg, "false" }, + {"-fog", ".pulsar.fog", XrmoptionNoArg, "true" }, + {"+fog", ".pulsar.fog", XrmoptionNoArg, "false" }, + {"-antialias", ".pulsar.antialias", XrmoptionNoArg, "true" }, + {"+antialias", ".pulsar.antialias", XrmoptionNoArg, "false" }, + {"-texture", ".pulsar.texture", XrmoptionNoArg, "true" }, + {"+texture", ".pulsar.texture", XrmoptionNoArg, "false" }, + {"-texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, "true" }, + {"+texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, "false" }, + {"-mipmap", ".pulsar.mipmap", XrmoptionNoArg, "true" }, + {"+mipmap", ".pulsar.mipmap", XrmoptionNoArg, "false" }, + {"-do_depth", ".pulsar.doDepth", XrmoptionNoArg, "true" }, + {"+do_depth", ".pulsar.doDepth", XrmoptionNoArg, "false" }, + {"-image", ".pulsar.image", XrmoptionSepArg, 0 }, +}; + static argtype vars[] = { - {(caddr_t *) &do_light, "light", "Light", DEF_LIGHT, t_Bool}, - {(caddr_t *) &do_wire, "wire", "Wire", DEF_WIRE, t_Bool}, - {(caddr_t *) &do_blend, "blend", "Blend", DEF_BLEND, t_Bool}, - {(caddr_t *) &do_fog, "fog", "Fog", DEF_FOG, t_Bool}, - {(caddr_t *) &do_antialias, "antialias", "Antialias", DEF_ANTIALIAS, t_Bool}, - {(caddr_t *) &do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, - {(caddr_t *) &do_texture_quality, "texture_quality", "Texture_quality", DEF_TEXTURE_QUALITY, t_Bool}, - {(caddr_t *) &do_mipmap, "mipmap", "Mipmap", DEF_MIPMAP, t_Bool}, - {(caddr_t *) &do_fps, "fps", "fps", DEF_FPS, t_Bool}, - {(caddr_t *) &do_depth, "doDepth", "DoDepth", DEF_DO_DEPTH, t_Bool}, + {&num_quads, "quads", "Quads", DEF_NUM_QUADS, t_Int}, + {&do_light, "light", "Light", DEF_LIGHT, t_Bool}, + {&do_wire, "wire", "Wire", DEF_WIRE, t_Bool}, + {&do_blend, "blend", "Blend", DEF_BLEND, t_Bool}, + {&do_fog, "fog", "Fog", DEF_FOG, t_Bool}, + {&do_antialias, "antialias", "Antialias", DEF_ANTIALIAS, t_Bool}, + {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, + {&do_texture_quality, "texture_quality", "Texture_quality", DEF_TEXTURE_QUALITY, t_Bool}, + {&do_mipmap, "mipmap", "Mipmap", DEF_MIPMAP, t_Bool}, + {&do_depth, "doDepth", "DoDepth", DEF_DO_DEPTH, t_Bool}, + {&which_image, "image", "Image", DEF_IMAGE, t_String}, }; -ModeSpecOpt screensaver_opts = {countof(opts), opts, countof(vars), vars, NULL}; +static OptionStruct desc[] = +{ + {"-quads num", "how many quads to draw"}, + {"-/+ light", "whether to do enable lighting (slower)"}, + {"-/+ wire", "whether to do use wireframe instead of filled (faster)"}, + {"-/+ blend", "whether to do enable blending (slower)"}, + {"-/+ fog", "whether to do enable fog (?)"}, + {"-/+ antialias", "whether to do enable antialiased lines (slower)"}, + {"-/+ texture", "whether to do enable texturing (much slower)"}, + {"-/+ texture_quality", "whether to do enable linear/mipmap filtering (much much slower)"}, + {"-/+ mipmap", "whether to do enable mipmaps (much slower)"}, + {"-/+ depth", "whether to do enable depth buffer checking (slower)"}, + {"-image ", "texture image to load"}, +}; + +ModeSpecOpt screensaver_opts = {countof(opts), opts, countof(vars), vars, desc}; #ifdef USE_MODULES ModStruct screensaver_description = @@ -212,95 +200,26 @@ typedef struct { static screensaverstruct *Screensaver = NULL; - -void FPS_Setup(void) -{ - Display *Dpy; - XFontStruct *fontInfo; - Font id; - int first=0, last=255; - - Dpy = XOpenDisplay(NULL); - fontInfo = XLoadQueryFont(Dpy, FONT); - if (fontInfo == NULL) - { - fprintf(stderr, "Failed to load font %s\n", FONT); - exit(1); - } - - id = fontInfo->fid; - first = fontInfo->min_char_or_byte2; - last = fontInfo->max_char_or_byte2; - - base = glGenLists((GLuint) last+1); - if (base == 0) { - fprintf (stderr, "out of display lists\n"); - exit(1); - } - glXUseXFont(id, first, last-first+1, base+first); - -} - -void PrintString(float x, float y, char *string) +struct quad { - int len, i; - - /* save the current state */ - /* note: could be expensive! */ - glPushAttrib(GL_ALL_ATTRIB_BITS); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluOrtho2D(0, global_width, 0, global_height); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - /* disable lighting and texturing when drawing bitmaps! */ - glDisable(GL_TEXTURE_2D); - glDisable(GL_LIGHTING); - glDisable(GL_BLEND); - - /* draw a black background */ + GLfloat tx, ty, tz; + GLfloat rx, ry, rz; - /* draw the text */ - glColor3f(1,1,1); - glRasterPos2f( x, y); - len = (int) strlen(string); - for (i = 0; i < len; i++) { - glCallList(base+string[i]); - } + GLfloat dtx, dty, dtz; + GLfloat drx, dry, drz; - /* clean up after our state changes */ - glPopAttrib(); -} +}; -double gettime(void) -{ - struct timeval now; -#ifdef GETTIMEOFDAY_TWO_ARGS - struct timezone tzp; - gettimeofday(&now, &tzp); -#else - gettimeofday(&now); -#endif - return (double) (now.tv_sec + (((double) now.tv_usec) * 0.000001)); -} -void DoFPS(void) -{ - /* every SAMPLE_FRAMES frames, get the time and use it to get the - frames per second */ - if (!(FrameCounter % SAMPLE_FRAMES)) { - oldtime = newtime; - newtime = gettime(); - sprintf(FPSstring, "FPS: %.02f", SAMPLE_FRAMES/(newtime-oldtime)); - } +GLint quad_list; - PrintString(x_pos,y_pos,FPSstring); +static float scale_x=1, scale_y=1, scale_z=1; +static int frame = 0; - FrameCounter++; -} +struct quad *quads; -GLubyte *Generate_Image(int *width, int *height, int *format) +GLubyte * +Generate_Image(int *width, int *height, int *format) { GLubyte *result; int i, j, c; @@ -308,7 +227,7 @@ GLubyte *Generate_Image(int *width, int *height, int *format) *width = checkImageWidth; *height = checkImageHeight; - result = (GLubyte *)malloc(4 * *width * *height); + result = (GLubyte *)malloc(4 * (*width) * (*height)); counter = 0; for (i = 0; i < checkImageWidth; i++) { @@ -326,248 +245,70 @@ GLubyte *Generate_Image(int *width, int *height, int *format) } - -#ifdef TIFF -#include -/* Load a TIFF texture: requires libtiff */ -uint32 *LoadTIFF(char *filename, int *width, int *height, int *format) -{ - TIFF *tif; - char emsg[1024]; - uint32 *raster; - TIFFRGBAImage img; - tsize_t npixels; - - tif = TIFFOpen(filename, "r"); - if (tif == NULL) { - fprintf(stderr, "Problem showing %s\n", filename); - return Generate_Image(&width, &height, &format); - } - if (TIFFRGBAImageBegin(&img, tif, 0, emsg)) { - npixels = (tsize_t) (img.width * img.height); - raster = (uint32 *) _TIFFmalloc(npixels * (tsize_t) sizeof(uint32)); - if (raster != NULL) { - if (TIFFRGBAImageGet(&img, raster, img.width, img.height) == 0) { - TIFFError(filename, emsg); - return Generate_Image(&width, &height, &format); - } - } - TIFFRGBAImageEnd(&img); - } else { - TIFFError(filename, emsg); - return Generate_Image(&width, &height, &format); - } - - *width = img.width; - *height = img.height; - *format = GL_RGBA; - - TIFFClose(tif); - return raster; -} -#endif - - -/* Load a modified version of PPM format with an extra byte for alpha */ -GLubyte *LoadPPM4(const char *filename, int *width, int *height, int *format) -{ - char buff[1024]; - PPMImage *result; - FILE *fp; - int maxval; - - fp = fopen(filename, "rb"); - if (!fp) - { - fprintf(stderr, "Unable to open file '%s'\n", filename); - return Generate_Image(width, height, format); - } - - if (!fgets(buff, sizeof(buff), fp)) - { - perror(filename); - return Generate_Image(width, height, format); - } - - if (buff[0] != '6' || buff[1] != 'P') - { - fprintf(stderr, "Invalid image format (must be `6P')\n"); - return Generate_Image(width, height, format); - } - - result = malloc(sizeof(PPMImage)); - if (!result) - { - fprintf(stderr, "Unable to allocate memory\n"); - return Generate_Image(width, height, format); - } - - do - { - fgets(buff, sizeof(buff), fp); - } - while (buff[0] == '#'); - - if (sscanf(buff, "%d %d", &result->sizeX, &result->sizeY) != 2) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - if (fscanf(fp, "%d", &maxval) != 1) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - while (fgetc(fp) != '\n') - ; - - result->data = (GLubyte *)malloc(4 * result->sizeX * result->sizeY); - if (!result) - { - fprintf(stderr, "Unable to allocate memory\n"); - exit(1); - } - - if (fread(result->data, 4 * result->sizeX, result->sizeY, fp) != result->sizeY) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - fclose(fp); - - *width = result->sizeX; - *height = result->sizeY; - *format = GL_RGBA; - return result->data; -} - -/* Load a plain PPM image */ -GLubyte *LoadPPM(const char *filename, int *width, int *height, int *format) -{ - char buff[1024]; - PPMImage *result; - FILE *fp; - int maxval; - - fp = fopen(filename, "rb"); - if (!fp) - { - fprintf(stderr, "Unable to open file '%s'\n", filename); - return Generate_Image(width, height, format); - exit(1); - } - if (!fgets(buff, sizeof(buff), fp)) - { - perror(filename); - return Generate_Image(width, height, format); - } - - if (buff[0] != 'P' || buff[1] != '6') - { - fprintf(stderr, "Invalid image format (must be `P6')\n"); - return Generate_Image(width, height, format); - } - - result = malloc(sizeof(PPMImage)); - if (!result) - { - fprintf(stderr, "Unable to allocate memory\n"); - return Generate_Image(width, height, format); - } - - do - { - fgets(buff, sizeof(buff), fp); - } - while (buff[0] == '#'); - - if (sscanf(buff, "%d %d", &result->sizeX, &result->sizeY) != 2) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - if (fscanf(fp, "%d", &maxval) != 1) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - while (fgetc(fp) != '\n') - ; - - result->data = (GLubyte *)malloc(3 * result->sizeX * result->sizeY); - if (!result) - { - fprintf(stderr, "Unable to allocate memory\n"); - return Generate_Image(width, height, format); - } - - if (fread(result->data, 3 * result->sizeX, result->sizeY, fp) != result->sizeY) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - fclose(fp); - - *width = result->sizeX; - *height = result->sizeY; - *format = GL_RGB; - return result->data; -} - /* Create a texture in OpenGL. First an image is loaded and stored in a raster buffer, then it's */ -void Create_Texture(char *filename) +void Create_Texture(ModeInfo *mi, const char *filename) { int height, width; GLubyte *image; - GLint a; int format; - fprintf(stdout, "Loading texture '%s'\n", filename); - - if ( !strncmp((filename+strlen(filename)-3), "ppm", 3)) - image = LoadPPM(filename, &width, &height, &format); - else if ( !strncmp((filename+strlen(filename)-4), "ppm4", 4)) - image = LoadPPM4(filename, &width, &height, &format); -#ifdef TIFF - else if ( !strncmp((filename+strlen(filename)-4), "tiff", 4)) - image = (GLubyte *)LoadTIFF(filename, &width, &height, &format); -#endif - else { - fprintf(stderr, "Unknown file format extension: '%s'\n", filename); + if ( !strncmp(filename, "BUILTIN", 7)) image = Generate_Image(&width, &height, &format); - } + else + { + XImage *ximage = xpm_file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi), + MI_COLORMAP (mi), filename); + image = (GLubyte *) ximage->data; + width = ximage->width; + height = ximage->height; + format = GL_RGBA; + } /* GL_MODULATE or GL_DECAL depending on what you want */ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + /* perhaps we can edge a bit more speed at the expense of quality */ + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); if (do_texture_quality) { + /* with texture_quality, the min and mag filters look *much* nice but are *much* slower */ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); } else { + /* default is to do it quick and dirty */ + /* if you have mipmaps turned on, but not texture quality, nothing will happen! */ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); } + /* mipmaps make the image look much nicer */ if (do_mipmap) - a=gluBuild2DMipmaps(GL_TEXTURE_2D, format, width, height, format, GL_UNSIGNED_BYTE, image); - else - glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, - format, GL_UNSIGNED_BYTE, image); - - free(image); + { + int status; + clear_gl_error(); + status = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, width, height, format, + GL_UNSIGNED_BYTE, image); + if (status) + { + const char *s = (char *) gluErrorString (status); + fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n", + progname, width, height, + (s ? s : "(unknown)")); + exit (1); + } + check_gl_error("mipmapping"); + } + else + { + clear_gl_error(); + glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, + format, GL_UNSIGNED_BYTE, image); + check_gl_error("texture"); + } } void resetProjection(void) { @@ -579,52 +320,54 @@ void resetProjection(void) { } -void GenerateTriangle(void) +void GenerateQuad(void) { int i; - tri_list = glGenLists(1); - glNewList(tri_list,GL_COMPILE); -/* glBegin(GL_TRIANGLES); */ + quad_list = glGenLists(1); + glNewList(quad_list,GL_COMPILE); +#if 1 glBegin(GL_QUADS); glColor4f(1,0,0,.4); glNormal3f(0,0,1); glTexCoord2f(0,0); glVertex2f(-1, -1); glColor4f(0,1,0,.4); glNormal3f(0,0,1); glTexCoord2f(0,1); glVertex2f(-1, 1); glColor4f(0,0,1,.4); glNormal3f(0,0,1); glTexCoord2f(1,1); glVertex2f( 1, 1); glColor4f(1,1,1,1); glNormal3f(0,0,1); glTexCoord2f(1,0); glVertex2f( 1, -1); +#else + glBegin(GL_TRIANGLE_STRIP); + glColor4f(0,1,0,.4); glNormal3f(0,0,1); glTexCoord2f(0,1); glVertex2f(-1, 1); + glColor4f(1,0,0,.4); glNormal3f(0,0,1); glTexCoord2f(0,0); glVertex2f(-1, -1); + glColor4f(0,0,1,.4); glNormal3f(0,0,1); glTexCoord2f(1,1); glVertex2f( 1, 1); + glColor4f(1,1,1,.4); glNormal3f(0,0,1); glTexCoord2f(1,0); glVertex2f( 1, -1); +#endif glEnd(); glEndList(); - for (i=0; i < NUM_TRIANGLES; i++) + quads = (struct quad *) malloc(sizeof(struct quad) * num_quads); + for (i=0; i < num_quads; i++) { - triangles[i].rx = 0.; - triangles[i].ry = 0.; - triangles[i].rz = 0.; - triangles[i].tx = 0.; - triangles[i].ty = 0.; - triangles[i].tz = -10; - - triangles[i].drx = drand48() * 5.; - triangles[i].dry = drand48() * 5.; - triangles[i].drz = 0; + quads[i].rx = 0.; + quads[i].ry = 0.; + quads[i].rz = 0.; + quads[i].tx = 0.; + quads[i].ty = 0.; + quads[i].tz = -10; + + quads[i].drx = frand(5.0); + quads[i].dry = frand(5.0); + quads[i].drz = 0; } } -void initializeGL(GLsizei width, GLsizei height) +void initializeGL(ModeInfo *mi, GLsizei width, GLsizei height) { GLfloat fogColor[4] = { 0.1, 0.1, 0.1, 0.1 }; - global_width=width; - global_height=height; - glViewport( 0, 0, width, height ); resetProjection(); if (do_depth) glEnable(GL_DEPTH_TEST); - if (do_fps) - FPS_Setup(); - if (do_antialias) { do_blend = 1; glEnable(GL_LINE_SMOOTH); @@ -659,36 +402,34 @@ void initializeGL(GLsizei width, GLsizei height) if (do_texture) - { - Create_Texture(Textures[0]); - } + Create_Texture(mi, which_image); - GenerateTriangle(); + GenerateQuad(); } -void drawTriangles(void) { +void drawQuads(void) { int i; - for (i=0; i < NUM_TRIANGLES; i++) + for (i=0; i < num_quads; i++) { glPushMatrix(); - glTranslatef(triangles[i].tx,0,0); - glTranslatef(0,triangles[i].ty,0); - glTranslatef(0,0,triangles[i].tz); - glRotatef(triangles[i].rx, 1,0,0); - glRotatef(triangles[i].ry, 0,1,0); - glRotatef(triangles[i].rz, 0,0,1); - glCallList(tri_list); + glTranslatef(quads[i].tx,0,0); + glTranslatef(0,quads[i].ty,0); + glTranslatef(0,0,quads[i].tz); + glRotatef(quads[i].rx, 1,0,0); + glRotatef(quads[i].ry, 0,1,0); + glRotatef(quads[i].rz, 0,0,1); + glCallList(quad_list); glPopMatrix(); - triangles[i].rx += triangles[i].drx; - triangles[i].ry += triangles[i].dry; - triangles[i].rz += triangles[i].drz; + quads[i].rx += quads[i].drx; + quads[i].ry += quads[i].dry; + quads[i].rz += quads[i].drz; } } -GLvoid drawScene(GLvoid) +GLvoid drawScene(ModeInfo * mi) { - +/* check_gl_error ("drawScene"); */ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); /* we have to do this here because the FPS meter turns these 3 features off!! */ @@ -709,15 +450,20 @@ GLvoid drawScene(GLvoid) } resetProjection(); + + /* use XYZ scaling factors to change the size of the pulsar */ glScalef(scale_x, scale_y, scale_z); - drawTriangles(); - + drawQuads(); + + /* update the scaling factors- cyclic */ scale_x = cos(frame/360.)*10.; scale_y = sin(frame/360.)*10.; scale_z = 1; + /* increment frame-counter */ frame++; - DoFPS(); + +/* check_gl_error ("drawScene"); */ } @@ -731,15 +477,16 @@ void draw_screensaver(ModeInfo * mi) return; glXMakeCurrent(display, window, *(gp->glx_context)); - drawScene(); + drawScene(mi); + if (mi->fps_p) do_fps (mi); glXSwapBuffers(display, window); } /* Standard reshape function */ -static void -reshape(int width, int height) +void +reshape_screensaver(ModeInfo *mi, int width, int height) { - glViewport( 0, 0, global_width, global_height ); + glViewport( 0, 0, MI_WIDTH(mi), MI_HEIGHT(mi) ); resetProjection(); } @@ -758,8 +505,8 @@ init_screensaver(ModeInfo * mi) gp->window = MI_WINDOW(mi); if ((gp->glx_context = init_GL(mi)) != NULL) { - reshape(MI_WIDTH(mi), MI_HEIGHT(mi)); - initializeGL(MI_WIDTH(mi), MI_HEIGHT(mi)); + reshape_screensaver(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + initializeGL(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); } else { MI_CLEARWINDOW(mi); } @@ -777,7 +524,7 @@ void release_screensaver(ModeInfo * mi) (void) free((void *) Screensaver); Screensaver = NULL; } + free(quads); FreeAllGL(mi); } #endif -