X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fglplanet.c;fp=hacks%2Fglx%2Fglplanet.c;h=20ccc5841f5a16db4e3469eff00bdd5a8e779f37;hp=3657e4c4f9c67e67ae0113652ff65fe68ab2fab8;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213

diff --git a/hacks/glx/glplanet.c b/hacks/glx/glplanet.c
index 3657e4c4..20ccc584 100644
--- a/hacks/glx/glplanet.c
+++ b/hacks/glx/glplanet.c
@@ -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},
 };
 
@@ -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);