X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fdymaxionmap.c;h=60fb94f60bcfef835785bf01361b54f11c09ffc5;hp=f82a98dd6231351bfa4e5f88ed599ac6d54ed18b;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213 diff --git a/hacks/glx/dymaxionmap.c b/hacks/glx/dymaxionmap.c index f82a98dd..60fb94f6 100644 --- a/hacks/glx/dymaxionmap.c +++ b/hacks/glx/dymaxionmap.c @@ -22,6 +22,7 @@ "*wireframe: False \n" \ "*labelFont: " LABEL_FONT "\n" # define refresh_planet 0 +# define release_planet 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -88,7 +89,7 @@ ENTRYPOINT ModeSpecOpt planet_opts = {countof(opts), opts, countof(vars), vars, #ifdef USE_MODULES ModStruct planet_description = -{"planet", "init_planet", "draw_planet", "release_planet", +{"planet", "init_planet", "draw_planet", NULL, "draw_planet", "init_planet", NULL, &planet_opts, 1000, 1, 2, 1, 4, 1.0, "", "Buckminster Fuller's unwrapped icosahedral globe", 0, NULL}; @@ -134,6 +135,10 @@ setup_xpm_texture (ModeInfo *mi, char **xpm_data) MI_COLORMAP (mi), xpm_data); char buf[1024]; clear_gl_error(); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + /* iOS invalid enum: + glPixelStorei(GL_UNPACK_ROW_LENGTH, image->width); + */ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image->width, image->height, 0, GL_RGBA, @@ -142,18 +147,10 @@ setup_xpm_texture (ModeInfo *mi, char **xpm_data) image->data); sprintf (buf, "builtin texture (%dx%d)", image->width, image->height); check_gl_error(buf); - - /* setup parameters for texturing */ - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - 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); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); } -static void +static Bool setup_file_texture (ModeInfo *mi, char *filename) { Display *dpy = mi->dpy; @@ -162,7 +159,11 @@ setup_file_texture (ModeInfo *mi, char *filename) Colormap cmap = mi->xgwa.colormap; XImage *image = xpm_file_to_ximage (dpy, visual, cmap, filename); + if (!image) return False; + clear_gl_error(); + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + glPixelStorei(GL_UNPACK_ROW_LENGTH, image->width); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image->width, image->height, 0, GL_RGBA, @@ -172,16 +173,7 @@ setup_file_texture (ModeInfo *mi, char *filename) sprintf (buf, "texture: %.100s (%dx%d)", filename, image->width, image->height); check_gl_error(buf); - - /* setup parameters for texturing */ - glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - glPixelStorei(GL_UNPACK_ROW_LENGTH, image->width); - - 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); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + return True; } @@ -190,23 +182,39 @@ setup_texture(ModeInfo * mi) { planetstruct *gp = &planets[MI_SCREEN(mi)]; + glGenTextures (1, &gp->tex1); + glBindTexture (GL_TEXTURE_2D, gp->tex1); + + /* Must be after glBindTexture */ + 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); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + if (!which_image || !*which_image || !strcmp(which_image, "BUILTIN")) { - glGenTextures (1, &gp->tex1); - glBindTexture (GL_TEXTURE_2D, gp->tex1); + BUILTIN: setup_xpm_texture (mi, dymaxionmap_xpm); } else { - glGenTextures (1, &gp->tex1); - glBindTexture (GL_TEXTURE_2D, gp->tex1); - setup_file_texture (mi, which_image); + if (! setup_file_texture (mi, which_image)) + goto BUILTIN; } glGenTextures (1, &gp->tex2); glBindTexture (GL_TEXTURE_2D, gp->tex2); + + /* Must be after glBindTexture */ + 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); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + setup_xpm_texture (mi, ground); check_gl_error("texture initialization"); @@ -762,6 +770,9 @@ planet_handle_event (ModeInfo *mi, XEvent *event) } +static void free_planet (ModeInfo * mi); + + ENTRYPOINT void init_planet (ModeInfo * mi) { @@ -769,11 +780,7 @@ init_planet (ModeInfo * mi) int screen = MI_SCREEN(mi); Bool wire = MI_IS_WIREFRAME(mi); - if (planets == NULL) { - if ((planets = (planetstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (planetstruct))) == NULL) - return; - } + MI_INIT (mi, planets, free_planet); gp = &planets[screen]; if ((gp->glx_context = init_GL(mi)) != NULL) { @@ -998,28 +1005,17 @@ draw_planet (ModeInfo * mi) } -ENTRYPOINT void -release_planet (ModeInfo * mi) +static void +free_planet (ModeInfo * mi) { - if (planets != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - planetstruct *gp = &planets[screen]; + planetstruct *gp = &planets[MI_SCREEN(mi)]; - if (gp->glx_context) { - /* Display lists MUST be freed while their glXContext is current. */ - /* but this gets a BadMatch error. -jwz */ - /*glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(gp->glx_context));*/ + if (gp->glx_context) { + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(gp->glx_context)); - if (glIsList(gp->starlist)) - glDeleteLists(gp->starlist, 1); - } - } - (void) free((void *) planets); - planets = NULL; + if (glIsList(gp->starlist)) + glDeleteLists(gp->starlist, 1); } - FreeAllGL(mi); }