-/* tube, Copyright (c) 2001 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
* 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 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;
- GLfloat x, y, x0, y0;
+ GLfloat x, y, x0=0, y0=0;
int z = 0;
/* 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;
glVertex3f(x, 1, y);
glVertex3f(x, 0, y);
}
+ polys++;
}
glEnd();
/* End caps
*/
- for (z = 0; z <= 1; z++)
- {
- 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);
- for (i = 0, th = 0; i <= faces; i++)
- {
- GLfloat x = cos (th);
- GLfloat y = sin (th);
- glVertex3f(x, z, y);
- th += step;
- }
- glEnd();
- }
+ if (caps_p)
+ for (z = 0; z <= 1; z++)
+ {
+ glFrontFace(z == 0 ? GL_CCW : GL_CW);
+ glNormal3f(0, (z == 0 ? -1 : 1), 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 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;
/* side walls
*/
glFrontFace(GL_CW);
- glBegin(wire ? GL_LINES : GL_TRIANGLES);
+ glBegin(wire_p ? GL_LINES : GL_TRIANGLES);
th = 0;
x = 1;
if (smooth) glNormal3f(x, 0, y);
glVertex3f(x, 0, y);
+ polys++;
}
glEnd();
/* End cap
*/
- glFrontFace(GL_CCW);
- glNormal3f(0, -1, 0);
- glBegin(wire ? GL_LINE_LOOP : GL_TRIANGLE_FAN);
- if (! wire) glVertex3f(0, 0, 0);
- for (i = 0, th = 0; i <= faces; i++)
+ if (cap_p)
{
- GLfloat x = cos (th);
- GLfloat y = sin (th);
- glVertex3f(x, 0, y);
- th += step;
+ glFrontFace(GL_CCW);
+ glNormal3f(0, -1, 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();
}
- 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 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();
Z = (z2 - z1);
if (X == 0 && Y == 0 && Z == 0)
- return;
+ return 0;
length = sqrt (X*X + Y*Y + Z*Z);
}
if (cone_p)
- unit_cone (faces, smooth, wire);
+ polys = unit_cone (faces, smooth, caps_p, wire_p);
else
- unit_tube (faces, smooth, 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 wire)
+ int faces, int smooth, int caps_p, int wire_p)
{
- tube_1 (x1, y1, z1, x2, y2, z2, diameter, cap_size, faces, smooth, 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 wire)
+ int faces, int smooth, int cap_p, int wire_p)
{
- tube_1 (x1, y1, z1, x2, y2, z2, diameter, cap_size, faces, smooth, wire,
- True);
+ return tube_1 (x1, y1, z1, x2, y2, z2, diameter, cap_size,
+ faces, smooth, cap_p, wire_p,
+ 1);
}