-/* tube, Copyright (c) 2001 Jamie Zawinski <jwz@jwz.org>
+/* tube, Copyright (c) 2001-2010 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)
+typedef struct { GLfloat x, y, z; } XYZ;
+
+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;
+ int arraysize, out;
+ struct { XYZ p; XYZ n; GLfloat s, t; } *array;
+
+ arraysize = (faces+1) * 6;
+ array = (void *) calloc (arraysize, sizeof(*array));
+ if (! array) abort();
+ out = 0;
+
+
+ /* #### texture coords are currently not being computed */
+
+
/* side walls
*/
- glFrontFace(GL_CCW);
- glBegin (wire ? GL_LINES : (smooth ? GL_QUAD_STRIP : GL_QUADS));
-
th = 0;
x = 1;
y = 0;
for (i = 0; i < faces; i++)
{
+ array[out].p.x = x; /* bottom point A */
+ array[out].p.y = 0;
+ array[out].p.z = y;
+
if (smooth)
- glNormal3f(x, 0, y);
+ array[out].n = array[out].p; /* its own normal */
else
- glNormal3f(x0, 0, y0);
+ {
+ array[out].n.x = x0; /* mid-plane normal */
+ array[out].n.y = 0;
+ array[out].n.z = y0;
+ }
+ out++;
+
+
+ array[out].p.x = x; /* top point A */
+ array[out].p.y = 1;
+ array[out].p.z = y;
+ array[out].n = array[out-1].n; /* same normal */
+ out++;
- glVertex3f(x, 0, y);
- glVertex3f(x, 1, y);
th += step;
x = cos (th);
x0 = cos (th + s2);
y0 = sin (th + s2);
- glVertex3f(x, 1, y);
- glVertex3f(x, 0, y);
+ array[out].p.x = x; /* top point B */
+ array[out].p.y = 1;
+ array[out].p.z = y;
+ array[out].n = array[out-1].n; /* same normal */
+ out++;
+
+
+ array[out] = array[out-3]; /* bottom point A */
+ out++;
+
+ array[out] = array[out-2]; /* top point B */
+ out++;
+
+ array[out].p.x = x; /* bottom point B */
+ array[out].p.y = 0;
+ array[out].p.z = y;
+ array[out].n = array[out-1].n; /* same normal */
+ out++;
+
+ polys++;
}
+
+ polys++;
+ if (out >= arraysize) abort();
}
- glEnd();
+
+ glEnableClientState (GL_VERTEX_ARRAY);
+ glEnableClientState (GL_NORMAL_ARRAY);
+ glEnableClientState (GL_TEXTURE_COORD_ARRAY);
+
+ glVertexPointer (3, GL_FLOAT, sizeof(*array), &array[0].p);
+ glNormalPointer ( GL_FLOAT, sizeof(*array), &array[0].n);
+ glTexCoordPointer (2, GL_FLOAT, sizeof(*array), &array[0].s);
+
+ glDrawArrays ((wire_p ? GL_LINES :
+ (smooth ? GL_TRIANGLE_STRIP : GL_TRIANGLES)),
+ 0, out);
+
/* 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++)
+ {
+ out = 0;
+ if (! wire_p)
+ {
+ array[out].p.x = 0;
+ array[out].p.y = z;
+ array[out].p.z = 0;
+
+ array[out].n.x = 0;
+ array[out].n.y = (z == 0 ? -1 : 1);
+ array[out].n.z = 0;
+ out++;
+ }
+
+ th = 0;
+ for (i = (z == 0 ? 0 : faces);
+ (z == 0 ? i <= faces : i >= 0);
+ i += (z == 0 ? 1 : -1)) {
+ GLfloat x = cos (th);
+ GLfloat y = sin (th);
+
+ array[out] = array[0]; /* same normal and texture */
+ array[out].p.x = x;
+ array[out].p.y = z;
+ array[out].p.z = y;
+ out++;
+
+ th += (z == 0 ? step : -step);
+
+ polys++;
+ if (out >= arraysize) abort();
+ }
+
+ glVertexPointer (3, GL_FLOAT, sizeof(*array), &array[0].p);
+ glNormalPointer ( GL_FLOAT, sizeof(*array), &array[0].n);
+ glTexCoordPointer (2, GL_FLOAT, sizeof(*array), &array[0].s);
+
+ glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
+ }
+
+ 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;
GLfloat x, y, x0, y0;
+ int arraysize, out;
+ struct { XYZ p; XYZ n; GLfloat s, t; } *array;
+
+ arraysize = (faces+1) * 3;
+ array = (void *) calloc (arraysize, sizeof(*array));
+ if (! array) abort();
+ out = 0;
+
+
+ /* #### texture coords are currently not being computed */
+
+
/* side walls
*/
- glFrontFace(GL_CW);
- glBegin(wire ? GL_LINES : GL_TRIANGLES);
th = 0;
x = 1;
for (i = 0; i < faces; i++)
{
- glNormal3f(x0, 0, y0);
- glVertex3f(0, 1, 0);
+ array[out].p.x = x; /* bottom point A */
+ array[out].p.y = 0;
+ array[out].p.z = y;
+
+ if (smooth)
+ array[out].n = array[out].p; /* its own normal */
+ else
+ {
+ array[out].n.x = x0; /* mid-plane normal */
+ array[out].n.y = 0;
+ array[out].n.z = y0;
+ }
+ out++;
+
+
+ array[out].p.x = 0; /* tip point */
+ array[out].p.y = 1;
+ array[out].p.z = 0;
+
+ array[out].n.x = x0; /* mid-plane normal */
+ array[out].n.y = 0;
+ array[out].n.z = y0;
+ out++;
- if (smooth) glNormal3f(x, 0, y);
- glVertex3f(x, 0, y);
th += step;
x0 = cos (th + s2);
x = cos (th);
y = sin (th);
- if (smooth) glNormal3f(x, 0, y);
- glVertex3f(x, 0, y);
+ array[out].p.x = x; /* bottom point B */
+ array[out].p.y = 0;
+ array[out].p.z = y;
+
+ if (smooth)
+ array[out].n = array[out].p; /* its own normal */
+ else
+ array[out].n = array[out-1].n; /* same normal as other two */
+ out++;
+
+
+ if (out >= arraysize) abort();
+ polys++;
}
- glEnd();
+
+ glEnableClientState (GL_VERTEX_ARRAY);
+ glEnableClientState (GL_NORMAL_ARRAY);
+ glEnableClientState (GL_TEXTURE_COORD_ARRAY);
+
+ glVertexPointer (3, GL_FLOAT, sizeof(*array), &array[0].p);
+ glNormalPointer ( GL_FLOAT, sizeof(*array), &array[0].n);
+ glTexCoordPointer (2, GL_FLOAT, sizeof(*array), &array[0].s);
+
+ glDrawArrays ((wire_p ? GL_LINES : GL_TRIANGLES), 0, out);
+
/* 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;
+ out = 0;
+
+ if (! wire_p)
+ {
+ array[out].p.x = 0;
+ array[out].p.y = 0;
+ array[out].p.z = 0;
+
+ array[out].n.x = 0;
+ array[out].n.y = -1;
+ array[out].n.z = 0;
+ out++;
+ }
+
+ for (i = 0, th = 0; i <= faces; i++)
+ {
+ GLfloat x = cos (th);
+ GLfloat y = sin (th);
+
+ array[out] = array[0]; /* same normal and texture */
+ array[out].p.x = x;
+ array[out].p.y = 0;
+ array[out].p.z = y;
+ out++;
+ th += step;
+ polys++;
+ if (out >= arraysize) abort();
+ }
+
+ glVertexPointer (3, GL_FLOAT, sizeof(*array), &array[0].p);
+ glNormalPointer ( GL_FLOAT, sizeof(*array), &array[0].n);
+ glTexCoordPointer (2, GL_FLOAT, sizeof(*array), &array[0].s);
+
+ glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
}
- glEnd();
+
+ free (array);
+
+ 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, angle, a, b, c;
+ GLfloat length, X, Y, Z;
+ int polys = 0;
if (diameter <= 0) abort();
- a = (x2 - x1);
- b = (y2 - y1);
- c = (z2 - z1);
+ X = (x2 - x1);
+ Y = (y2 - y1);
+ Z = (z2 - z1);
- length = sqrt (a*a + b*b + c*c);
- angle = acos (a / length);
+ if (X == 0 && Y == 0 && Z == 0)
+ return 0;
- glPushMatrix();
- glTranslatef(x1, y1, z1);
- glScalef (length, length, length);
+ length = sqrt (X*X + Y*Y + Z*Z);
- if (c == 0 && b == 0)
- glRotatef (angle / (M_PI / 180), 0, 1, 0);
- else
- glRotatef (angle / (M_PI / 180), 0, -c, b);
+ glPushMatrix();
- glRotatef (-90, 0, 0, 1);
- glScalef (diameter/length, 1, diameter/length);
+ glTranslatef(x1, y1, z1);
+ glRotatef (-atan2 (X, Y) * (180 / M_PI), 0, 0, 1);
+ glRotatef ( atan2 (Z, sqrt(X*X + Y*Y)) * (180 / M_PI), 1, 0, 0);
+ glScalef (diameter, length, diameter);
/* extend the endpoints of the tube by the cap size in both directions */
if (cap_size != 0)
}
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);
}
projects / xscreensaver / blobdiff