From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz

[xscreensaver] / hacks / glx / cubenetic.c

diff --git a/hacks/glx/cubenetic.c b/hacks/glx/cubenetic.c
index 694c147b55b3b4f29869ddd274e4808def5706ee..95d8b6518d127fe1f9cd8a2daef8784c01d1c194 100644 (file)
--- a/hacks/glx/cubenetic.c
+++ b/hacks/glx/cubenetic.c
@@ -1,4 +1,4 @@
-/* cubenetic, Copyright (c) 2002-2008 Jamie Zawinski <jwz@jwz.org>
+/* cubenetic, Copyright (c) 2002-2014 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -13,6 +13,7 @@
                        "*count:        5           \n" \
                        "*showFPS:      False       \n" \
                        "*wireframe:    False       \n" \
+                       "*suppressRotationAnimation: True\n" \
 
 # define refresh_cube 0
 # define release_cube 0
@@ -32,7 +33,7 @@
 #define DEF_WANDER      "True"
 #define DEF_TEXTURE     "True"
 
-#define DEF_WAVE_COUNT  "3"
+#define DEF_WAVES       "3"
 #define DEF_WAVE_SPEED  "80"
 #define DEF_WAVE_RADIUS "512"
 
@@ -67,6 +68,7 @@ typedef struct {
 
   GLuint cube_list;
   GLuint texture_id;
+  int cube_polys;
   int ncubes;
   cube *cubes;
   waves *waves;
@@ -107,7 +109,7 @@ static argtype vars[] = {
   {&do_spin,   "spin",   "Spin",   DEF_SPIN,   t_String},
   {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
   {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool},
-  {&wave_count, "waves",     "Waves",      DEF_WAVE_COUNT, t_Int},
+  {&wave_count, "waves",     "Waves",      DEF_WAVES, t_Int},
   {&wave_speed, "waveSpeed", "WaveSpeed",  DEF_WAVE_SPEED, t_Int},
   {&wave_radius,"waveRadius","WaveRadius", DEF_WAVE_RADIUS,t_Int},
 };
@@ -115,15 +117,17 @@ static argtype vars[] = {
 ENTRYPOINT ModeSpecOpt cube_opts = {countof(opts), opts, countof(vars), vars, NULL};
 
 
-static void
+static int
 unit_cube (Bool wire)
 {
+  int polys = 0;
   glBegin (wire ? GL_LINE_LOOP : GL_QUADS);    /* front */
   glNormal3f (0, 0, 1);
   glTexCoord2f(1, 0); glVertex3f ( 0.5, -0.5,  0.5);
   glTexCoord2f(0, 0); glVertex3f ( 0.5,  0.5,  0.5);
   glTexCoord2f(0, 1); glVertex3f (-0.5,  0.5,  0.5);
   glTexCoord2f(1, 1); glVertex3f (-0.5, -0.5,  0.5);
+  polys++;
   glEnd();
 
   glBegin (wire ? GL_LINE_LOOP : GL_QUADS);    /* back */
@@ -132,6 +136,7 @@ unit_cube (Bool wire)
   glTexCoord2f(0, 1); glVertex3f (-0.5,  0.5, -0.5);
   glTexCoord2f(1, 1); glVertex3f ( 0.5,  0.5, -0.5);
   glTexCoord2f(1, 0); glVertex3f ( 0.5, -0.5, -0.5);
+  polys++;
   glEnd();
 
   glBegin (wire ? GL_LINE_LOOP : GL_QUADS);    /* left */
@@ -140,6 +145,7 @@ unit_cube (Bool wire)
   glTexCoord2f(1, 0); glVertex3f (-0.5,  0.5, -0.5);
   glTexCoord2f(0, 0); glVertex3f (-0.5, -0.5, -0.5);
   glTexCoord2f(0, 1); glVertex3f (-0.5, -0.5,  0.5);
+  polys++;
   glEnd();
 
   glBegin (wire ? GL_LINE_LOOP : GL_QUADS);    /* right */
@@ -148,9 +154,10 @@ unit_cube (Bool wire)
   glTexCoord2f(1, 0); glVertex3f ( 0.5,  0.5, -0.5);
   glTexCoord2f(0, 0); glVertex3f ( 0.5,  0.5,  0.5);
   glTexCoord2f(0, 1); glVertex3f ( 0.5, -0.5,  0.5);
+  polys++;
   glEnd();
 
-  if (wire) return;
+  if (wire) return polys;
 
   glBegin (wire ? GL_LINE_LOOP : GL_QUADS);    /* top */
   glNormal3f (0, 1, 0);
@@ -158,6 +165,7 @@ unit_cube (Bool wire)
   glTexCoord2f(0, 1); glVertex3f ( 0.5,  0.5, -0.5);
   glTexCoord2f(1, 1); glVertex3f (-0.5,  0.5, -0.5);
   glTexCoord2f(1, 0); glVertex3f (-0.5,  0.5,  0.5);
+  polys++;
   glEnd();
 
   glBegin (wire ? GL_LINE_LOOP : GL_QUADS);    /* bottom */
@@ -166,7 +174,9 @@ unit_cube (Bool wire)
   glTexCoord2f(0, 0); glVertex3f (-0.5, -0.5, -0.5);
   glTexCoord2f(0, 1); glVertex3f ( 0.5, -0.5, -0.5);
   glTexCoord2f(1, 1); glVertex3f ( 0.5, -0.5,  0.5);
+  polys++;
   glEnd();
+  return polys;
 }
 
 
@@ -190,6 +200,14 @@ reshape_cube (ModeInfo *mi, int width, int height)
              0.0, 0.0, 0.0,
              0.0, 1.0, 0.0);
 
+# ifdef HAVE_MOBILE    /* Keep it the same relative size when rotated. */
+  {
+    int o = (int) current_device_rotation();
+    if (o != 0 && o != 180 && o != -180)
+      glScalef (1/h, 1/h, 1/h);
+  }
+# endif
+
   glClear(GL_COLOR_BUFFER_BIT);
 }
 
@@ -298,8 +316,6 @@ init_texture (ModeInfo *mi)
   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);
-  glTexGeni (GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
-  glTexGeni (GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
   glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
   check_gl_error("texture initialization");
 
@@ -326,42 +342,42 @@ shuffle_texture (ModeInfo *mi)
 }
 
 
+static void
+reset_colors (ModeInfo *mi)
+{
+  cube_configuration *cc = &ccs[MI_SCREEN(mi)];
+  double H[3], S[3], V[3];
+  int shift = 60;
+  H[0] = frand(360.0); 
+  H[1] = ((H[0] + shift) < 360) ? (H[0]+shift) : (H[0] + shift - 360);
+  H[2] = ((H[1] + shift) < 360) ? (H[1]+shift) : (H[1] + shift - 360);
+  S[0] = S[1] = S[2] = 1.0;
+  V[0] = V[1] = V[2] = 1.0;
+  make_color_loop(0, 0, 0,
+                  H[0], S[0], V[0], 
+                  H[1], S[1], V[1], 
+                  H[2], S[2], V[2], 
+                  cc->texture_colors, &cc->ncolors,
+                  False, False);
+
+  make_smooth_colormap (0, 0, 0,
+                        cc->cube_colors, &cc->ncolors, 
+                        False, 0, False);
+}
+
+
 ENTRYPOINT Bool
 cube_handle_event (ModeInfo *mi, XEvent *event)
 {
   cube_configuration *cc = &ccs[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
+  if (gltrackball_event_handler (event, cc->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &cc->button_down_p))
+    return True;
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
     {
-      cc->button_down_p = True;
-      gltrackball_start (cc->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)
-    {
-      cc->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 (cc->trackball, event->xbutton.button, 10,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           cc->button_down_p)
-    {
-      gltrackball_track (cc->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
+      reset_colors (mi);
       return True;
     }
 
@@ -376,14 +392,7 @@ init_cube (ModeInfo *mi)
   cube_configuration *cc;
   int wire = MI_IS_WIREFRAME(mi);
 
-  if (!ccs) {
-    ccs = (cube_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (cube_configuration));
-    if (!ccs) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, ccs, NULL);
 
   cc = &ccs[MI_SCREEN(mi)];
 
@@ -436,32 +445,14 @@ init_cube (ModeInfo *mi)
                             1.0,
                             do_wander ? wander_speed : 0,
                             (spinx && spiny && spinz));
-    cc->trackball = gltrackball_init ();
+    cc->trackball = gltrackball_init (True);
   }
 
   cc->ncolors = 256;
   cc->texture_colors = (XColor *) calloc(cc->ncolors, sizeof(XColor));
   cc->cube_colors    = (XColor *) calloc(cc->ncolors, sizeof(XColor));
 
-  {
-    double H[3], S[3], V[3];
-    int shift = 60;
-    H[0] = frand(360.0); 
-    H[1] = ((H[0] + shift) < 360) ? (H[0]+shift) : (H[0] + shift - 360);
-    H[2] = ((H[1] + shift) < 360) ? (H[1]+shift) : (H[1] + shift - 360);
-    S[0] = S[1] = S[2] = 1.0;
-    V[0] = V[1] = V[2] = 1.0;
-    make_color_loop(0, 0,
-                   H[0], S[0], V[0], 
-                   H[1], S[1], V[1], 
-                   H[2], S[2], V[2], 
-                   cc->texture_colors, &cc->ncolors,
-                   False, False);
-
-    make_smooth_colormap (0, 0, 0,
-                          cc->cube_colors, &cc->ncolors, 
-                          False, 0, False);
-  }
+  reset_colors (mi);
 
   cc->ncubes = MI_COUNT (mi);
   cc->cubes = (cube *) calloc (sizeof(cube), cc->ncubes);
@@ -492,7 +483,7 @@ init_cube (ModeInfo *mi)
 
   cc->cube_list = glGenLists (1);
   glNewList (cc->cube_list, GL_COMPILE);
-  unit_cube (wire);
+  cc->cube_polys = unit_cube (wire);
   glEndList ();
 }
 
@@ -531,6 +522,7 @@ draw_cube (ModeInfo *mi)
   if (!cc->glx_context)
     return;
 
+  mi->polygon_count = 0;
   glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cc->glx_context));
 
   glShadeModel(GL_FLAT);
@@ -578,6 +570,7 @@ draw_cube (ModeInfo *mi)
       glScalef (cube->w, cube->h, cube->d);
       glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color);
       glCallList (cc->cube_list);
+      mi->polygon_count += cc->cube_polys;
       glPopMatrix ();
     }