X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglplanet.c;h=0e94270134dd6588d574090d20216a7c18c307da;hb=39809ded547bdbb08207d3e514950425215b4410;hp=3657e4c4f9c67e67ae0113652ff65fe68ab2fab8;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver diff --git a/hacks/glx/glplanet.c b/hacks/glx/glplanet.c index 3657e4c4..0e942701 100644 --- a/hacks/glx/glplanet.c +++ b/hacks/glx/glplanet.c @@ -38,7 +38,7 @@ "*imageBackground: Blue \n" \ "*suppressRotationAnimation: True\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 */ @@ -64,6 +64,7 @@ #define DEF_STARS "True" #define DEF_RESOLUTION "128" #define DEF_IMAGE "BUILTIN" +#define DEF_IMAGE2 "BUILTIN" #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -77,6 +78,7 @@ static int do_wander; static int do_texture; static int do_stars; static char *which_image; +static char *which_image2; static int resolution; static XrmOptionDescRec opts[] = { @@ -91,7 +93,8 @@ static XrmOptionDescRec opts[] = { {"-stars", ".glplanet.stars", XrmoptionNoArg, "true" }, {"+stars", ".glplanet.stars", XrmoptionNoArg, "false" }, {"-spin", ".glplanet.spin", XrmoptionSepArg, 0 }, - {"-image", ".glplanet.image", XrmoptionSepArg, 0 }, + {"-image", ".glplanet.image", XrmoptionSepArg, 0 }, + {"-image2", ".glplanet.image2", XrmoptionSepArg, 0 }, {"-resolution", ".glplanet.resolution", XrmoptionSepArg, 0 }, }; @@ -102,6 +105,7 @@ static argtype vars[] = { {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, {&do_stars, "stars", "Stars", DEF_STARS, t_Bool}, {&which_image, "image", "Image", DEF_IMAGE, t_String}, + {&which_image2,"image2", "Image", DEF_IMAGE2, t_String}, {&resolution, "resolution","Resolution", DEF_RESOLUTION, t_Int}, }; @@ -109,8 +113,8 @@ ENTRYPOINT ModeSpecOpt planet_opts = {countof(opts), opts, countof(vars), vars, #ifdef USE_MODULES ModStruct planet_description = -{"planet", "init_planet", "draw_planet", "release_planet", - "draw_planet", "init_planet", NULL, &planet_opts, +{"planet", "init_planet", "draw_planet", NULL, + "draw_planet", "init_planet", "free_planet", &planet_opts, 1000, 1, 2, 1, 4, 1.0, "", "Animates texture mapped sphere (planet)", 0, NULL}; #endif @@ -167,6 +171,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, @@ -175,18 +183,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; @@ -195,8 +195,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, @@ -206,16 +209,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; } @@ -224,25 +218,55 @@ 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); + BUILTIN1: setup_xpm_texture (mi, earth_xpm); - glGenTextures (1, &gp->tex2); - glBindTexture (GL_TEXTURE_2D, gp->tex2); + } + else + { + if (! setup_file_texture (mi, which_image)) + goto BUILTIN1; + } + + check_gl_error("texture 1 initialization"); + + 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); + + if (!which_image2 || + !*which_image2 || + !strcmp(which_image2, "BUILTIN")) + { + BUILTIN2: setup_xpm_texture (mi, earth_night_xpm); } else { - glGenTextures (1, &gp->tex1); - glBindTexture (GL_TEXTURE_2D, gp->tex1); - setup_file_texture (mi, which_image); + if (! setup_file_texture (mi, which_image2)) + goto BUILTIN2; } - check_gl_error("texture initialization"); + check_gl_error("texture 2 initialization"); /* Need to flip the texture top for bottom for some reason. */ glMatrixMode (GL_TEXTURE); @@ -301,8 +325,11 @@ init_stars (ModeInfo *mi) ENTRYPOINT void reshape_planet (ModeInfo *mi, int width, int height) { + planetstruct *gp = &planets[MI_SCREEN(mi)]; GLfloat h = (GLfloat) height / (GLfloat) width; + glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context)); + glViewport(0, 0, (GLint) width, (GLint) height); glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -344,13 +371,11 @@ 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); gp = &planets[screen]; + gp->window = MI_WINDOW(mi); + if ((gp->glx_context = init_GL(mi)) != NULL) { reshape_planet(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); } @@ -610,29 +635,18 @@ draw_planet (ModeInfo * mi) ENTRYPOINT void -release_planet (ModeInfo * mi) +free_planet (ModeInfo * mi) { - if (planets != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - planetstruct *gp = &planets[screen]; - - 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), gp->window, *(gp->glx_context));*/ - - if (glIsList(gp->platelist)) - glDeleteLists(gp->platelist, 1); - if (glIsList(gp->starlist)) - glDeleteLists(gp->starlist, 1); - } - } - (void) free((void *) planets); - planets = NULL; + planetstruct *gp = &planets[MI_SCREEN(mi)]; + + if (gp->glx_context) { + glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context)); + + if (glIsList(gp->platelist)) + glDeleteLists(gp->platelist, 1); + if (glIsList(gp->starlist)) + glDeleteLists(gp->starlist, 1); } - FreeAllGL(mi); }