http://www.tienza.es/crux/src/www.jwz.org/xscreensaver/xscreensaver-5.04.tar.gz

[xscreensaver] / hacks / glx / tube.c

diff --git a/hacks/glx/tube.c b/hacks/glx/tube.c
index 20f51ed4d2839e165a4266747f4d3f7a6e6e675d..ec7589d15f4fc7e4b6d2a54076706ce1c8cead23 100644 (file)
--- a/hacks/glx/tube.c
+++ b/hacks/glx/tube.c
@@ -1,4 +1,4 @@
-/* tube, Copyright (c) 2001, 2003 Jamie Zawinski <jwz@jwz.org>
+/* tube, Copyright (c) 2001, 2003, 2007 Jamie Zawinski <jwz@jwz.org>
  * Utility functions to create tubes and cones in GL.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -10,16 +10,27 @@
  * implied warranty.
  */
 
-#include "config.h"
-#include <stdlib.h>
 #include <math.h>
-#include <GL/glx.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#ifdef HAVE_COCOA
+# include <OpenGL/gl.h>
+#else
+# include <GL/gl.h>
+#endif
+
 #include "tube.h"
 
-static void
-unit_tube (int faces, Bool smooth, Bool caps_p, Bool wire)
+static int
+unit_tube (int faces, int smooth, int caps_p, int wire_p)
 {
   int i;
+  int polys = 0;
   GLfloat step = M_PI * 2 / faces;
   GLfloat s2 = step/2;
   GLfloat th;
@@ -29,7 +40,7 @@ unit_tube (int faces, Bool smooth, Bool caps_p, Bool wire)
   /* side walls
    */
   glFrontFace(GL_CCW);
-  glBegin (wire ? GL_LINES : (smooth ? GL_QUAD_STRIP : GL_QUADS));
+  glBegin (wire_p ? GL_LINES : (smooth ? GL_QUAD_STRIP : GL_QUADS));
 
   th = 0;
   x = 1;
@@ -65,6 +76,7 @@ unit_tube (int faces, Bool smooth, Bool caps_p, Bool wire)
           glVertex3f(x, 1, y);
           glVertex3f(x, 0, y);
         }
+      polys++;
     }
   glEnd();
 
@@ -75,24 +87,27 @@ unit_tube (int faces, Bool smooth, Bool caps_p, Bool wire)
       {
         glFrontFace(z == 0 ? GL_CCW : GL_CW);
         glNormal3f(0, (z == 0 ? -1 : 1), 0);
-        glBegin(wire ? GL_LINE_LOOP : GL_TRIANGLE_FAN);
-        if (! wire) glVertex3f(0, z, 0);
+        glBegin(wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN);
+        if (! wire_p) glVertex3f(0, z, 0);
         for (i = 0, th = 0; i <= faces; i++)
           {
             GLfloat x = cos (th);
             GLfloat y = sin (th);
             glVertex3f(x, z, y);
             th += step;
+            polys++;
           }
         glEnd();
       }
+  return polys;
 }
 
 
-static void
-unit_cone (int faces, Bool smooth, Bool cap_p, Bool wire)
+static int
+unit_cone (int faces, int smooth, int cap_p, int wire_p)
 {
   int i;
+  int polys = 0;
   GLfloat step = M_PI * 2 / faces;
   GLfloat s2 = step/2;
   GLfloat th;
@@ -101,7 +116,7 @@ unit_cone (int faces, Bool smooth, Bool cap_p, Bool wire)
   /* side walls
    */
   glFrontFace(GL_CW);
-  glBegin(wire ? GL_LINES : GL_TRIANGLES);
+  glBegin(wire_p ? GL_LINES : GL_TRIANGLES);
 
   th = 0;
   x = 1;
@@ -125,6 +140,7 @@ unit_cone (int faces, Bool smooth, Bool cap_p, Bool wire)
 
       if (smooth) glNormal3f(x, 0, y);
       glVertex3f(x, 0, y);
+      polys++;
     }
   glEnd();
 
@@ -134,28 +150,31 @@ unit_cone (int faces, Bool smooth, Bool cap_p, Bool wire)
     {
       glFrontFace(GL_CCW);
       glNormal3f(0, -1, 0);
-      glBegin(wire ? GL_LINE_LOOP : GL_TRIANGLE_FAN);
-      if (! wire) glVertex3f(0, 0, 0);
+      glBegin(wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN);
+      if (! wire_p) glVertex3f(0, 0, 0);
       for (i = 0, th = 0; i <= faces; i++)
         {
           GLfloat x = cos (th);
           GLfloat y = sin (th);
           glVertex3f(x, 0, y);
           th += step;
+          polys++;
         }
       glEnd();
     }
+  return polys;
 }
 
 
-static void
+static int
 tube_1 (GLfloat x1, GLfloat y1, GLfloat z1,
         GLfloat x2, GLfloat y2, GLfloat z2,
         GLfloat diameter, GLfloat cap_size,
-        int faces, Bool smooth, Bool caps_p, Bool wire,
-        Bool cone_p)
+        int faces, int smooth, int caps_p, int wire_p,
+        int cone_p)
 {
   GLfloat length, X, Y, Z;
+  int polys = 0;
 
   if (diameter <= 0) abort();
 
@@ -164,7 +183,7 @@ tube_1 (GLfloat x1, GLfloat y1, GLfloat z1,
   Z = (z2 - z1);
 
   if (X == 0 && Y == 0 && Z == 0)
-    return;
+    return 0;
 
   length = sqrt (X*X + Y*Y + Z*Z);
 
@@ -184,33 +203,34 @@ tube_1 (GLfloat x1, GLfloat y1, GLfloat z1,
     }
 
   if (cone_p)
-    unit_cone (faces, smooth, caps_p, wire);
+    polys = unit_cone (faces, smooth, caps_p, wire_p);
   else
-    unit_tube (faces, smooth, caps_p, wire);
+    polys = unit_tube (faces, smooth, caps_p, wire_p);
 
   glPopMatrix();
+  return polys;
 }
 
 
-void
+int
 tube (GLfloat x1, GLfloat y1, GLfloat z1,
       GLfloat x2, GLfloat y2, GLfloat z2,
       GLfloat diameter, GLfloat cap_size,
-      int faces, Bool smooth, Bool caps_p, Bool wire)
+      int faces, int smooth, int caps_p, int wire_p)
 {
-  tube_1 (x1, y1, z1, x2, y2, z2, diameter, cap_size,
-          faces, smooth, caps_p, wire,
-          False);
+  return tube_1 (x1, y1, z1, x2, y2, z2, diameter, cap_size,
+                 faces, smooth, caps_p, wire_p,
+                 0);
 }
 
 
-void
+int
 cone (GLfloat x1, GLfloat y1, GLfloat z1,
       GLfloat x2, GLfloat y2, GLfloat z2,
       GLfloat diameter, GLfloat cap_size,
-      int faces, Bool smooth, Bool cap_p, Bool wire)
+      int faces, int smooth, int cap_p, int wire_p)
 {
-  tube_1 (x1, y1, z1, x2, y2, z2, diameter, cap_size,
-          faces, smooth, cap_p, wire,
-          True);
+  return tube_1 (x1, y1, z1, x2, y2, z2, diameter, cap_size,
+                 faces, smooth, cap_p, wire_p,
+                 1);
 }