X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=49164327b39dc66273b1c5c28a33f8bc55112033;hb=4bccc79f4b895ec88fec28c49471d04a025804fe;hp=a1d683df490d3a9f075af0b0c0503d0619ae64ae;hpb=acdc3f42c8e4ffb6d9a9296ff8391e8338432a93;p=freeglut

diff --git a/src/fg_geometry.c b/src/fg_geometry.c
index a1d683d..4916432 100644
--- a/src/fg_geometry.c
+++ b/src/fg_geometry.c
@@ -29,6 +29,9 @@
 #include "fg_internal.h"
 
 /*
+ *
+ * Need more types of polyhedra? See CPolyhedron in MRPT
+ * 
  * TODO BEFORE THE STABLE RELEASE:
  *
  * See fghTetrahedron
@@ -67,7 +70,7 @@
  * useWireMode controls the drawing of solids (false) or wire frame
  * versions (TRUE) of the geometry you pass
  */
-static void fghDrawGeometry(GLenum vertexMode, double* vertices, double* normals, GLsizei numVertices, GLboolean useWireMode)
+static void fghDrawGeometry(GLenum vertexMode, GLdouble *vertices, GLdouble *normals, GLboolean *edgeFlags, GLsizei numVertices, GLboolean useWireMode)
 {
     if (useWireMode)
     {
@@ -75,15 +78,38 @@ static void fghDrawGeometry(GLenum vertexMode, double* vertices, double* normals
         glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
     }
 
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_NORMAL_ARRAY);
-
-    glVertexPointer(3, GL_DOUBLE, 0, vertices);
-    glNormalPointer(GL_DOUBLE, 0, normals);
-    glDrawArrays(vertexMode,0,numVertices);
-
-    glDisableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
+    if (1)
+    {
+        glEnableClientState(GL_VERTEX_ARRAY);
+        glEnableClientState(GL_NORMAL_ARRAY);
+        if (edgeFlags)
+            glEnableClientState(GL_EDGE_FLAG_ARRAY);
+
+        glVertexPointer(3, GL_DOUBLE, 0, vertices);
+        glNormalPointer(GL_DOUBLE, 0, normals);
+        if (edgeFlags)
+            glEdgeFlagPointer(0,edgeFlags);
+        glDrawArrays(vertexMode, 0, numVertices);
+
+        glDisableClientState(GL_VERTEX_ARRAY);
+        glDisableClientState(GL_NORMAL_ARRAY);
+        if (edgeFlags)
+            glDisableClientState(GL_EDGE_FLAG_ARRAY);
+    }
+    else
+    {
+        int i;
+        glBegin(vertexMode);
+            for(i=0; i<numVertices; i++)
+            {
+                glEdgeFlag(edgeFlags[i]);
+                glNormal3dv(normals+i*3);
+                printf("n(%i) = (%1.4f,%1.4f,%1.4f)\n",i,*(normals+i*3),*(normals+i*3+1),*(normals+i*3+2));
+                glVertex3dv(vertices+i*3);
+                printf("v(%i) = (%1.4f,%1.4f,%1.4f)\n",i,*(vertices+i*3),*(vertices+i*3+1),*(vertices+i*3+2));
+            }
+        glEnd();
+    }
 
     if (useWireMode)
     {
@@ -91,6 +117,74 @@ static void fghDrawGeometry(GLenum vertexMode, double* vertices, double* normals
     }
 }
 
+/* triangle decomposition and associated edgeFlags
+ * be careful to keep winding of all triangles counter-clockwise,
+ * assuming that input has correct winding...
+ */
+static GLubyte   vertSamp3[3] = {0,1,2};
+static GLubyte   vertSamp4[6] = {0,1,2, 0,2,3};             /* quad    : 4 input vertices, 6 output (2 triangles) */
+static GLubyte   vertSamp5[9] = {0,1,2, 0,2,4, 4,2,3};      /* pentagon: 5 input vertices, 9 output (3 triangles) */
+static GLboolean edgeFlag3[3] = {1,1,1};                    /* triangles remain triangles, all edges are external */
+static GLboolean edgeFlag4[6] = {1,1,0, 0,1,1};
+static GLboolean edgeFlag5[9] = {1,1,0, 0,0,1, 0,1,1};
+
+static void fghGenerateGeometryWithEdgeFlag(int numFaces, int numEdgePerFaceIn, GLdouble *vertices, GLubyte *vertIndices, GLdouble *normals, GLdouble *vertOut, GLdouble *normOut, GLboolean *edgeFlagsOut)
+{
+    int i,j,numEdgePerFaceOut;
+    GLubyte   *vertSamps = NULL;
+    GLboolean *edgeFlags = NULL;
+    switch (numEdgePerFaceIn)
+    {
+    case 3:
+        vertSamps = vertSamp3;
+        edgeFlags = edgeFlag3;
+        numEdgePerFaceOut = 3;      /* 3 output vertices for each face */
+        break;
+    case 4:
+        vertSamps = vertSamp4;
+        edgeFlags = edgeFlag4;
+        numEdgePerFaceOut = 6;      /* 6 output vertices for each face */
+        break;
+    case 5:
+        vertSamps = vertSamp5;
+        edgeFlags = edgeFlag5;
+        numEdgePerFaceOut = 9;      /* 9 output vertices for each face */
+        break;
+    }
+    /*
+     * Build array with vertices from vertex coordinates and vertex indices 
+     * Do same for normals.
+     * Need to do this because of different normals at shared vertices
+     * (and because normals' coordinates need to be negated).
+     */
+    for (i=0; i<numFaces; i++)
+    {
+        int normIdx         = i*3;
+        int faceIdxVertIdx  = i*numEdgePerFaceIn; // index to first element of "row" in vertex indices
+        for (j=0; j<numEdgePerFaceOut; j++)
+        {
+            int outIdx  = i*numEdgePerFaceOut*3+j*3;
+            int vertIdx = vertIndices[faceIdxVertIdx+vertSamps[j]]*3;
+
+            vertOut[outIdx  ] = vertices[vertIdx  ];
+            vertOut[outIdx+1] = vertices[vertIdx+1];
+            vertOut[outIdx+2] = vertices[vertIdx+2];
+
+            normOut[outIdx  ] = normals [normIdx  ];
+            normOut[outIdx+1] = normals [normIdx+1];
+            normOut[outIdx+2] = normals [normIdx+2];
+
+            if (edgeFlagsOut)
+                edgeFlagsOut[i*numEdgePerFaceOut+j] = edgeFlags[j];
+        }
+    }
+}
+
+static void fghGenerateGeometry(int numFaces, int numEdgePerFace, GLdouble *vertices, GLubyte *vertIndices, GLdouble *normals, GLdouble *vertOut, GLdouble *normOut)
+{
+    fghGenerateGeometryWithEdgeFlag(numFaces, numEdgePerFace, vertices, vertIndices, normals, vertOut, normOut, NULL);
+}
+
 
 /* -- INTERNAL SETUP OF GEOMETRY --------------------------------------- */
 static unsigned int ipow (int x, unsigned int y)
@@ -99,6 +193,28 @@ static unsigned int ipow (int x, unsigned int y)
 }
 
 /* -- stuff that can be cached -- */
+/* Cache of input to glDrawArrays */
+#define DECLARE_SHAPE_CACHE(name,nameICaps,nameCaps)\
+    static GLboolean name##Cached = FALSE;\
+    static GLdouble name##_verts[nameCaps##_VERT_ELEM_PER_OBJ];\
+    static GLdouble name##_norms[nameCaps##_VERT_ELEM_PER_OBJ];\
+    static void fgh##nameICaps##Generate()\
+    {\
+        fghGenerateGeometry(nameCaps##_NUM_FACES, nameCaps##_NUM_EDGE_PER_FACE,\
+                            name##_v, name##_vi, name##_n,\
+                            name##_verts, name##_norms);\
+    }
+#define DECLARE_SHAPE_CACHE_DECOMPOSE_TO_TRIANGLE(name,nameICaps,nameCaps)\
+    static GLboolean name##Cached = FALSE;\
+    static GLdouble  name##_verts[nameCaps##_VERT_ELEM_PER_OBJ];\
+    static GLdouble  name##_norms[nameCaps##_VERT_ELEM_PER_OBJ];\
+    static GLboolean name##_edgeFlags[nameCaps##_VERT_PER_OBJ_TRI];\
+    static void fgh##nameICaps##Generate()\
+    {\
+        fghGenerateGeometryWithEdgeFlag(nameCaps##_NUM_FACES, nameCaps##_NUM_EDGE_PER_FACE,\
+                                        name##_v, name##_vi, name##_n,\
+                                        name##_verts, name##_norms, name##_edgeFlags);\
+    }
 /*
  * In general, we build arrays with all vertices or normals.
  * We cant compress this and use glDrawElements as all combinations of
@@ -108,61 +224,230 @@ static unsigned int ipow (int x, unsigned int y)
 /* -- Cube -- */
 #define CUBE_NUM_VERT           8
 #define CUBE_NUM_FACES          6
-#define CUBE_NUM_VERT_PER_FACE  4
-#define CUBE_VERT_PER_TETR      CUBE_NUM_FACES*CUBE_NUM_VERT_PER_FACE
-#define CUBE_VERT_ELEM_PER_TETR CUBE_VERT_PER_TETR*3
+#define CUBE_NUM_EDGE_PER_FACE  4
+#define CUBE_VERT_PER_OBJ       (CUBE_NUM_FACES*CUBE_NUM_EDGE_PER_FACE)
+#define CUBE_VERT_PER_OBJ_TRI   (CUBE_VERT_PER_OBJ+CUBE_NUM_FACES*2)    /* 2 extra edges per face when drawing quads as triangles */
+#define CUBE_VERT_ELEM_PER_OBJ  (CUBE_VERT_PER_OBJ_TRI*3)
 /* Vertex Coordinates */
-static GLdouble cube_v[CUBE_NUM_VERT][3] =
+static GLdouble cube_v[CUBE_NUM_VERT*3] =
 {
-    { .5, .5, .5},
-    {-.5, .5, .5},
-    {-.5,-.5, .5},
-    { .5,-.5, .5},
-    { .5,-.5,-.5},
-    { .5, .5,-.5},
-    {-.5, .5,-.5},
-    {-.5,-.5,-.5}
+     .5, .5, .5,
+    -.5, .5, .5,
+    -.5,-.5, .5,
+     .5,-.5, .5,
+     .5,-.5,-.5,
+     .5, .5,-.5,
+    -.5, .5,-.5,
+    -.5,-.5,-.5
 };
 /* Normal Vectors */
-static GLdouble cube_n[CUBE_NUM_FACES][3] =
+static GLdouble cube_n[CUBE_NUM_FACES*3] =
 {
-    { 0.0, 0.0, 1.0},
-    { 1.0, 0.0, 0.0},
-    { 0.0, 1.0, 0.0},
-    {-1.0, 0.0, 0.0},
-    { 0.0,-1.0, 0.0},
-    { 0.0, 0.0,-1.0}
+     0.0, 0.0, 1.0,
+     1.0, 0.0, 0.0,
+     0.0, 1.0, 0.0,
+    -1.0, 0.0, 0.0,
+     0.0,-1.0, 0.0,
+     0.0, 0.0,-1.0
 };
 
 /* Vertex indices */
-static GLubyte cube_vi[CUBE_NUM_FACES][CUBE_NUM_VERT_PER_FACE] =
+static GLubyte cube_vi[CUBE_VERT_PER_OBJ] =
+{
+    0,1,2,3,
+    0,3,4,5,
+    0,5,6,1,
+    1,6,7,2,
+    7,4,3,2,
+    4,7,6,5
+};
+DECLARE_SHAPE_CACHE_DECOMPOSE_TO_TRIANGLE(cube,Cube,CUBE);
+
+/* Icosahedron */
+#define ICOSAHEDRON_NUM_VERT           12
+#define ICOSAHEDRON_NUM_FACES          20
+#define ICOSAHEDRON_NUM_EDGE_PER_FACE  3
+#define ICOSAHEDRON_VERT_PER_OBJ       (ICOSAHEDRON_NUM_FACES*ICOSAHEDRON_NUM_EDGE_PER_FACE)
+#define ICOSAHEDRON_VERT_PER_OBJ_TRI   ICOSAHEDRON_VERT_PER_OBJ
+#define ICOSAHEDRON_VERT_ELEM_PER_OBJ  (ICOSAHEDRON_VERT_PER_OBJ_TRI*3)
+/* Vertex Coordinates */
+static GLdouble icosahedron_v[ICOSAHEDRON_NUM_VERT*3] =
 {
-    {0,1,2,3}, {0,3,4,5}, {0,5,6,1}, {1,6,7,2}, {7,4,3,2}, {4,7,6,5}
+     1.0,             0.0,             0.0           ,
+     0.447213595500,  0.894427191000,  0.0           ,
+     0.447213595500,  0.276393202252,  0.850650808354,
+     0.447213595500, -0.723606797748,  0.525731112119,
+     0.447213595500, -0.723606797748, -0.525731112119,
+     0.447213595500,  0.276393202252, -0.850650808354,
+    -0.447213595500, -0.894427191000,  0.0           ,
+    -0.447213595500, -0.276393202252,  0.850650808354,
+    -0.447213595500,  0.723606797748,  0.525731112119,
+    -0.447213595500,  0.723606797748, -0.525731112119,
+    -0.447213595500, -0.276393202252, -0.850650808354,
+    -1.0,             0.0,             0.0           
+};
+/* Normal Vectors:
+ * icosahedron_n[i][0] = ( icosahedron_v[icosahedron_vi[i][1]][1] - icosahedron_v[icosahedron_vi[i][0]][1] ) * ( icosahedron_v[icosahedron_vi[i][2]][2] - icosahedron_v[icosahedron_vi[i][0]][2] ) - ( icosahedron_v[icosahedron_vi[i][1]][2] - icosahedron_v[icosahedron_vi[i][0]][2] ) * ( icosahedron_v[icosahedron_vi[i][2]][1] - icosahedron_v[icosahedron_vi[i][0]][1] ) ;
+ * icosahedron_n[i][1] = ( icosahedron_v[icosahedron_vi[i][1]][2] - icosahedron_v[icosahedron_vi[i][0]][2] ) * ( icosahedron_v[icosahedron_vi[i][2]][0] - icosahedron_v[icosahedron_vi[i][0]][0] ) - ( icosahedron_v[icosahedron_vi[i][1]][0] - icosahedron_v[icosahedron_vi[i][0]][0] ) * ( icosahedron_v[icosahedron_vi[i][2]][2] - icosahedron_v[icosahedron_vi[i][0]][2] ) ;
+ * icosahedron_n[i][2] = ( icosahedron_v[icosahedron_vi[i][1]][0] - icosahedron_v[icosahedron_vi[i][0]][0] ) * ( icosahedron_v[icosahedron_vi[i][2]][1] - icosahedron_v[icosahedron_vi[i][0]][1] ) - ( icosahedron_v[icosahedron_vi[i][1]][1] - icosahedron_v[icosahedron_vi[i][0]][1] ) * ( icosahedron_v[icosahedron_vi[i][2]][0] - icosahedron_v[icosahedron_vi[i][0]][0] ) ;
+*/
+static GLdouble icosahedron_n[ICOSAHEDRON_NUM_FACES*3] =
+{
+     0.760845213037948,  0.470228201835026,  0.341640786498800,
+     0.760845213036861, -0.179611190632978,  0.552786404500000,
+     0.760845213033849, -0.581234022404097,                  0,
+     0.760845213036861, -0.179611190632978, -0.552786404500000,
+     0.760845213037948,  0.470228201835026, -0.341640786498800,
+     0.179611190628666,  0.760845213037948,  0.552786404498399,
+     0.179611190634277, -0.290617011204044,  0.894427191000000,
+     0.179611190633958, -0.940456403667806,                  0,
+     0.179611190634278, -0.290617011204044, -0.894427191000000,
+     0.179611190628666,  0.760845213037948, -0.552786404498399,
+    -0.179611190633958,  0.940456403667806,                  0,
+    -0.179611190634277,  0.290617011204044,  0.894427191000000,
+    -0.179611190628666, -0.760845213037948,  0.552786404498399,
+    -0.179611190628666, -0.760845213037948, -0.552786404498399,
+    -0.179611190634277,  0.290617011204044, -0.894427191000000,
+    -0.760845213036861,  0.179611190632978, -0.552786404500000,
+    -0.760845213033849,  0.581234022404097,                  0,
+    -0.760845213036861,  0.179611190632978,  0.552786404500000,
+    -0.760845213037948, -0.470228201835026,  0.341640786498800,
+    -0.760845213037948, -0.470228201835026, -0.341640786498800,
 };
 
-/* Cache of input to glDrawArrays */
-static GLboolean cubeCached = FALSE;
-static double cube_verts[CUBE_VERT_ELEM_PER_TETR];
-static double cube_norms[CUBE_VERT_ELEM_PER_TETR];
+/* Vertex indices */
+static GLubyte icosahedron_vi[ICOSAHEDRON_VERT_PER_OBJ] =
+{
+    0,   1,  2 ,
+    0,   2,  3 ,
+    0,   3,  4 ,
+    0,   4,  5 ,
+    0,   5,  1 ,
+    1,   8,  2 ,
+    2,   7,  3 ,
+    3,   6,  4 ,
+    4,  10,  5 ,
+    5,   9,  1 ,
+    1,   9,  8 ,
+    2,   8,  7 ,
+    3,   7,  6 ,
+    4,   6, 10 ,
+    5,  10,  9 ,
+    11,  9, 10 ,
+    11,  8,  9 ,
+    11,  7,  8 ,
+    11,  6,  7 ,
+    11, 10,  6 
+};
+DECLARE_SHAPE_CACHE(icosahedron,Icosahedron,ICOSAHEDRON);
 
-static void fghCubeGenerate()
-{   
-    int i,j;
-    for (i=0; i<CUBE_NUM_FACES; i++)
-    {
-        for (j=0; j<CUBE_NUM_VERT_PER_FACE; j++)
-        {
-            int idx = i*CUBE_NUM_VERT_PER_FACE*3+j*3;
-            cube_verts[idx  ] = cube_v[cube_vi[i][j]][0];
-            cube_verts[idx+1] = cube_v[cube_vi[i][j]][1];
-            cube_verts[idx+2] = cube_v[cube_vi[i][j]][2];
-
-            cube_norms[idx  ] = cube_n[i][0];
-            cube_norms[idx+1] = cube_n[i][1];
-            cube_norms[idx+2] = cube_n[i][2];
-        }
-    }
-}
+/* -- Octahedron -- */
+#define OCTAHEDRON_NUM_VERT           6
+#define OCTAHEDRON_NUM_FACES          8
+#define OCTAHEDRON_NUM_EDGE_PER_FACE  3
+#define OCTAHEDRON_VERT_PER_OBJ       (OCTAHEDRON_NUM_FACES*OCTAHEDRON_NUM_EDGE_PER_FACE)
+#define OCTAHEDRON_VERT_PER_OBJ_TRI   OCTAHEDRON_VERT_PER_OBJ
+#define OCTAHEDRON_VERT_ELEM_PER_OBJ  (OCTAHEDRON_VERT_PER_OBJ_TRI*3)
+
+/* Vertex Coordinates */
+static GLdouble octahedron_v[OCTAHEDRON_NUM_VERT*3] =
+{
+     1.,  0.,  0.,
+     0.,  1.,  0.,
+     0.,  0.,  1.,
+    -1.,  0.,  0.,
+     0., -1.,  0.,
+     0.,  0., -1.,
+
+};
+/* Normal Vectors */
+static GLdouble octahedron_n[OCTAHEDRON_NUM_FACES*3] =
+{
+     0.577350269189, 0.577350269189, 0.577350269189,    /* sqrt(1/3) */
+     0.577350269189, 0.577350269189,-0.577350269189,
+     0.577350269189,-0.577350269189, 0.577350269189,
+     0.577350269189,-0.577350269189,-0.577350269189,
+    -0.577350269189, 0.577350269189, 0.577350269189,
+    -0.577350269189, 0.577350269189,-0.577350269189,
+    -0.577350269189,-0.577350269189, 0.577350269189,
+    -0.577350269189,-0.577350269189,-0.577350269189
+
+};
+
+/* Vertex indices */
+static GLubyte octahedron_vi[OCTAHEDRON_VERT_PER_OBJ] =
+{
+    0, 1, 2,
+    0, 5, 1,
+    0, 2, 4,
+    0, 4, 5,
+    3, 2, 1,
+    3, 1, 5,
+    3, 4, 2,
+    3, 5, 4
+};
+DECLARE_SHAPE_CACHE(octahedron,Octahedron,OCTAHEDRON);
+
+/* -- RhombicDodecahedron -- */
+#define RHOMBICDODECAHEDRON_NUM_VERT            14
+#define RHOMBICDODECAHEDRON_NUM_FACES           12
+#define RHOMBICDODECAHEDRON_NUM_EDGE_PER_FACE   4
+#define RHOMBICDODECAHEDRON_VERT_PER_OBJ       (RHOMBICDODECAHEDRON_NUM_FACES*RHOMBICDODECAHEDRON_NUM_EDGE_PER_FACE)
+#define RHOMBICDODECAHEDRON_VERT_PER_OBJ_TRI   (RHOMBICDODECAHEDRON_VERT_PER_OBJ+RHOMBICDODECAHEDRON_NUM_FACES*2)    /* 2 extra edges per face when drawing quads as triangles */
+#define RHOMBICDODECAHEDRON_VERT_ELEM_PER_OBJ  (RHOMBICDODECAHEDRON_VERT_PER_OBJ_TRI*3)
+
+/* Vertex Coordinates */
+static GLdouble rhombicdodecahedron_v[RHOMBICDODECAHEDRON_NUM_VERT*3] =
+{
+     0.0,             0.0,             1.0,
+     0.707106781187,  0.0           ,  0.5,
+     0.0           ,  0.707106781187,  0.5,
+    -0.707106781187,  0.0           ,  0.5,
+     0.0           , -0.707106781187,  0.5,
+     0.707106781187,  0.707106781187,  0.0,
+    -0.707106781187,  0.707106781187,  0.0,
+    -0.707106781187, -0.707106781187,  0.0,
+     0.707106781187, -0.707106781187,  0.0,
+     0.707106781187,  0.0           , -0.5,
+     0.0           ,  0.707106781187, -0.5,
+    -0.707106781187,  0.0           , -0.5,
+     0.0           , -0.707106781187, -0.5,
+     0.0,             0.0,            -1.0
+};
+/* Normal Vectors */
+static GLdouble rhombicdodecahedron_n[RHOMBICDODECAHEDRON_NUM_FACES*3] =
+{
+     0.353553390594,  0.353553390594,  0.5,
+    -0.353553390594,  0.353553390594,  0.5,
+    -0.353553390594, -0.353553390594,  0.5,
+     0.353553390594, -0.353553390594,  0.5,
+     0.0           ,  1.0           ,  0.0,
+    -1.0           ,  0.0           ,  0.0,
+     0.0           , -1.0           ,  0.0,
+     1.0           ,  0.0           ,  0.0,
+     0.353553390594,  0.353553390594, -0.5,
+    -0.353553390594,  0.353553390594, -0.5,
+    -0.353553390594, -0.353553390594, -0.5,
+     0.353553390594, -0.353553390594, -0.5
+};
+
+/* Vertex indices */
+static GLubyte rhombicdodecahedron_vi[RHOMBICDODECAHEDRON_VERT_PER_OBJ] =
+{
+    0,  1,  5,  2,
+    0,  2,  6,  3,
+    0,  3,  7,  4,
+    0,  4,  8,  1,
+    5, 10,  6,  2,
+    6, 11,  7,  3,
+    7, 12,  8,  4,
+    8,  9,  5,  1,
+    5,  9, 13, 10,
+    6, 10, 13, 11,
+    7, 11, 13, 12,
+    8, 12, 13,  9
+};
+DECLARE_SHAPE_CACHE_DECOMPOSE_TO_TRIANGLE(rhombicdodecahedron,RhombicDodecahedron,RHOMBICDODECAHEDRON);
 
 /* -- Tetrahedron -- */
 /* Magic Numbers:  r0 = ( 1, 0, 0 )
@@ -174,96 +459,76 @@ static void fghCubeGenerate()
  *
  * Normals:  The unit normals are simply the negative of the coordinates of the point not on the surface.
  */
-#define TETR_NUM_VERT           4
-#define TETR_NUM_FACES          4
-#define TETR_NUM_VERT_PER_FACE  3
-#define TETR_VERT_PER_TETR      TETR_NUM_FACES*TETR_NUM_VERT_PER_FACE
-#define TETR_VERT_ELEM_PER_TETR TETR_VERT_PER_TETR*3
+#define TETRAHEDRON_NUM_VERT            4
+#define TETRAHEDRON_NUM_FACES           4
+#define TETRAHEDRON_NUM_EDGE_PER_FACE   3
+#define TETRAHEDRON_VERT_PER_OBJ        (TETRAHEDRON_NUM_FACES*TETRAHEDRON_NUM_EDGE_PER_FACE)
+#define TETRAHEDRON_VERT_PER_OBJ_TRI    TETRAHEDRON_VERT_PER_OBJ
+#define TETRAHEDRON_VERT_ELEM_PER_OBJ   (TETRAHEDRON_VERT_PER_OBJ_TRI*3)
 
 /* Vertex Coordinates */
-static GLdouble tet_r[TETR_NUM_VERT][3] =
+static GLdouble tetrahedron_v[TETRAHEDRON_NUM_VERT*3] =
 {
-    {             1.0,             0.0,             0.0 },
-    { -0.333333333333,  0.942809041582,             0.0 },
-    { -0.333333333333, -0.471404520791,  0.816496580928 },
-    { -0.333333333333, -0.471404520791, -0.816496580928 }
+                1.0,             0.0,             0.0,
+    -0.333333333333,  0.942809041582,             0.0,
+    -0.333333333333, -0.471404520791,  0.816496580928,
+    -0.333333333333, -0.471404520791, -0.816496580928
 };
 /* Normal Vectors */
-static GLdouble tet_n[CUBE_NUM_FACES][3] =
+static GLdouble tetrahedron_n[TETRAHEDRON_NUM_FACES*3] =
 {
-    { -           1.0,             0.0,             0.0 },
-    {  0.333333333333, -0.942809041582,             0.0 },
-    {  0.333333333333,  0.471404520791, -0.816496580928 },
-    {  0.333333333333,  0.471404520791,  0.816496580928 }
+    -           1.0,             0.0,             0.0,
+     0.333333333333, -0.942809041582,             0.0,
+     0.333333333333,  0.471404520791, -0.816496580928,
+     0.333333333333,  0.471404520791,  0.816496580928
 };
 
 /* Vertex indices */
-static GLubyte tet_i[TETR_NUM_FACES][TETR_NUM_VERT_PER_FACE] =
+static GLubyte tetrahedron_vi[TETRAHEDRON_VERT_PER_OBJ] =
 {
-    { 1, 3, 2 }, { 0, 2, 3 }, { 0, 3, 1 }, { 0, 1, 2 }
+    1, 3, 2,
+    0, 2, 3,
+    0, 3, 1,
+    0, 1, 2
 };
-
-/* Cache of input to glDrawArrays */
-static GLboolean tetrCached = FALSE;
-static double tetr_verts[TETR_VERT_ELEM_PER_TETR];
-static double tetr_norms[TETR_VERT_ELEM_PER_TETR];
-
-static void fghTetrahedronGenerate()
-{
-    int i,j;
-    /*
-     * Build array with vertices from vertex coordinates and vertex indices 
-     * Do same for normals.
-     * Need to do this because of different normals at shared vertices
-     * (and because normals' coordinates need to be negated).
-     */
-    for (i=0; i<TETR_NUM_FACES; i++)
-    {
-        for (j=0; j<TETR_NUM_VERT_PER_FACE; j++)
-        {
-            int idx = i*TETR_NUM_VERT_PER_FACE*3+j*3;
-            tetr_verts[idx  ] =  tet_r[tet_i[i][j]][0];
-            tetr_verts[idx+1] =  tet_r[tet_i[i][j]][1];
-            tetr_verts[idx+2] =  tet_r[tet_i[i][j]][2];
-
-            tetr_norms[idx  ] =  tet_n[i][0];
-            tetr_norms[idx+1] =  tet_n[i][1];
-            tetr_norms[idx+2] =  tet_n[i][2];
-        }
-    }
-}
+DECLARE_SHAPE_CACHE(tetrahedron,Tetrahedron,TETRAHEDRON);
 
 /* -- Sierpinski Sponge -- */
-static void fghSierpinskiSpongeGenerate ( int numLevels, GLdouble offset[3], GLdouble scale, double* vertices, double* normals )
+static void fghSierpinskiSpongeGenerate ( int numLevels, GLdouble offset[3], GLdouble scale, GLdouble* vertices, GLdouble* normals )
 {
     int i, j;
     if ( numLevels == 0 )
     {
-        for ( i = 0 ; i < TETR_NUM_FACES ; i++ )
+        for (i=0; i<TETRAHEDRON_NUM_FACES; i++)
         {
-            for ( j = 0; j < TETR_NUM_VERT_PER_FACE; j++ )
+            int normIdx         = i*3;
+            int faceIdxVertIdx  = i*TETRAHEDRON_NUM_EDGE_PER_FACE;
+            for (j=0; j<TETRAHEDRON_NUM_EDGE_PER_FACE; j++)
             {
-                int idx = i*TETR_NUM_VERT_PER_FACE*3+j*3;
-                vertices[idx  ] =  offset[0] + scale * tet_r[tet_i[i][j]][0];
-                vertices[idx+1] =  offset[1] + scale * tet_r[tet_i[i][j]][1];
-                vertices[idx+2] =  offset[2] + scale * tet_r[tet_i[i][j]][2];
-
-                normals [idx  ] = -tet_r[i][0];
-                normals [idx+1] = -tet_r[i][1];
-                normals [idx+2] = -tet_r[i][2];
+                int outIdx  = i*TETRAHEDRON_NUM_EDGE_PER_FACE*3+j*3;
+                int vertIdx = tetrahedron_vi[faceIdxVertIdx+j]*3;
+
+                vertices[outIdx  ] = offset[0] + scale * tetrahedron_v[vertIdx  ];
+                vertices[outIdx+1] = offset[1] + scale * tetrahedron_v[vertIdx+1];
+                vertices[outIdx+2] = offset[2] + scale * tetrahedron_v[vertIdx+2];
+
+                normals [outIdx  ] = tetrahedron_n[normIdx  ];
+                normals [outIdx+1] = tetrahedron_n[normIdx+1];
+                normals [outIdx+2] = tetrahedron_n[normIdx+2];
             }
         }
     }
     else if ( numLevels > 0 )
     {
         GLdouble local_offset[3] ;  /* Use a local variable to avoid buildup of roundoff errors */
-        unsigned int stride = ipow(4,--numLevels)*TETR_VERT_ELEM_PER_TETR;
+        unsigned int stride = ipow(4,--numLevels)*TETRAHEDRON_VERT_ELEM_PER_OBJ;
         scale /= 2.0 ;
-        for ( i = 0 ; i < TETR_NUM_FACES ; i++ )
+        for ( i = 0 ; i < TETRAHEDRON_NUM_FACES ; i++ )
         {
-            local_offset[0] = offset[0] + scale * tet_r[i][0];
-            local_offset[1] = offset[1] + scale * tet_r[i][1];
-            local_offset[2] = offset[2] + scale * tet_r[i][2];
+            int idx         = i*3;
+            local_offset[0] = offset[0] + scale * tetrahedron_v[idx  ];
+            local_offset[1] = offset[1] + scale * tetrahedron_v[idx+1];
+            local_offset[2] = offset[2] + scale * tetrahedron_v[idx+2];
             fghSierpinskiSpongeGenerate ( numLevels, local_offset, scale, vertices+i*stride, normals+i*stride );
         }
     }
@@ -323,54 +588,66 @@ static void fghCircleTable(double **sint,double **cost,const int n)
 }
 
 
-/* -- INTERNAL DRAWING functions to avoid code duplication ------------- */
+/* -- INTERNAL DRAWING functions --------------------------------------- */
+#define _DECLARE_INTERNAL_DRAW_DO_DECLARE(name,nameICaps,nameCaps,edgeFlags)\
+    static void fgh##nameICaps( GLboolean useWireMode )\
+    {\
+        if (!name##Cached)\
+        {\
+            fgh##nameICaps##Generate();\
+            name##Cached = GL_TRUE;\
+        }\
+        fghDrawGeometry(GL_TRIANGLES,name##_verts,name##_norms,edgeFlags,nameCaps##_VERT_PER_OBJ_TRI,useWireMode);\
+    }
+#define DECLARE_INTERNAL_DRAW(name,nameICaps,nameCaps) _DECLARE_INTERNAL_DRAW_DO_DECLARE(name,nameICaps,nameCaps,NULL)
+#define DECLARE_INTERNAL_DRAW_DECOMPOSED_TO_TRIANGLE(name,nameICaps,nameCaps) _DECLARE_INTERNAL_DRAW_DO_DECLARE(name,nameICaps,nameCaps,name##_edgeFlags)
 
 static void fghCube( GLdouble dSize, GLboolean useWireMode )
 {
     if (!cubeCached)
     {
         fghCubeGenerate();
-        cubeCached = TRUE;
+        cubeCached = GL_TRUE;
     }
 
     if (dSize!=1.)
     {
-        /* Need to build new */
-        fghDrawGeometry(GL_QUADS,cube_verts,cube_norms,CUBE_VERT_PER_TETR,useWireMode);
+        int i;
+
+        /* Need to build new vertex list containing vertices for cube of different size */
+        GLdouble *vertices = malloc(CUBE_VERT_ELEM_PER_OBJ * sizeof(GLdouble));
+        for (i=0; i<CUBE_VERT_ELEM_PER_OBJ; i++)
+            vertices[i] = dSize*cube_verts[i];
+
+        fghDrawGeometry(GL_TRIANGLES,vertices  ,cube_norms,cube_edgeFlags,CUBE_VERT_PER_OBJ_TRI,useWireMode);
     }
     else
-        fghDrawGeometry(GL_QUADS,cube_verts,cube_norms,CUBE_VERT_PER_TETR,useWireMode);
+        fghDrawGeometry(GL_TRIANGLES,cube_verts,cube_norms,cube_edgeFlags,CUBE_VERT_PER_OBJ_TRI,useWireMode);
 }
 
-static void fghTetrahedron( GLboolean useWireMode )
-{
-    if (!tetrCached)
-    {
-        fghTetrahedronGenerate();
-        tetrCached = TRUE;
-    }
-
-    fghDrawGeometry(GL_TRIANGLES,tetr_verts,tetr_norms,TETR_VERT_PER_TETR,useWireMode);
-}
+DECLARE_INTERNAL_DRAW(icosahedron,Icosahedron,ICOSAHEDRON);
+DECLARE_INTERNAL_DRAW(octahedron,Octahedron,OCTAHEDRON);
+DECLARE_INTERNAL_DRAW_DECOMPOSED_TO_TRIANGLE(rhombicdodecahedron,RhombicDodecahedron,RHOMBICDODECAHEDRON);
+DECLARE_INTERNAL_DRAW(tetrahedron,Tetrahedron,TETRAHEDRON);
 
 static void fghSierpinskiSponge ( int numLevels, GLdouble offset[3], GLdouble scale, GLboolean useWireMode )
 {
-    double      *vertices;
-    double      * normals;
-    unsigned int  numTetr = numLevels<0? 0 : ipow(4,numLevels); /* No sponge for numLevels below 0 */
-    unsigned int  numVert = numTetr*TETR_VERT_PER_TETR;
+    GLdouble *vertices;
+    GLdouble * normals;
+    GLsizei    numTetr = numLevels<0? 0 : ipow(4,numLevels); /* No sponge for numLevels below 0 */
+    GLsizei    numVert = numTetr*TETRAHEDRON_VERT_PER_OBJ;
 
     if (numTetr)
     {
         /* Allocate memory */
-        vertices = malloc(numVert*3 * sizeof(double));
-        normals  = malloc(numVert*3 * sizeof(double));
+        vertices = malloc(numVert*3 * sizeof(GLdouble));
+        normals  = malloc(numVert*3 * sizeof(GLdouble));
 
         /* Generate elements */
         fghSierpinskiSpongeGenerate ( numLevels, offset, scale, vertices, normals );
 
         /* Draw and cleanup */
-        fghDrawGeometry(GL_TRIANGLES,vertices,normals,numVert,useWireMode);
+        fghDrawGeometry(GL_TRIANGLES,vertices,normals,NULL,numVert,useWireMode);
         free(vertices);
         free(normals );
     }
@@ -1079,231 +1356,22 @@ void FGAPIENTRY glutSolidDodecahedron( void )
   glEnd () ;
 }
 
-/*
- *
- */
-void FGAPIENTRY glutWireOctahedron( void )
-{
-  FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireOctahedron" );
-
-#define RADIUS    1.0f
-  glBegin( GL_LINE_LOOP );
-    glNormal3d( 0.577350269189, 0.577350269189, 0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, RADIUS, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS );
-    glNormal3d( 0.577350269189, 0.577350269189,-0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS ); glVertex3d( 0.0, RADIUS, 0.0 );
-    glNormal3d( 0.577350269189,-0.577350269189, 0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS ); glVertex3d( 0.0,-RADIUS, 0.0 );
-    glNormal3d( 0.577350269189,-0.577350269189,-0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0,-RADIUS, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS );
-    glNormal3d(-0.577350269189, 0.577350269189, 0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS ); glVertex3d( 0.0, RADIUS, 0.0 );
-    glNormal3d(-0.577350269189, 0.577350269189,-0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, RADIUS, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS );
-    glNormal3d(-0.577350269189,-0.577350269189, 0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0,-RADIUS, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS );
-    glNormal3d(-0.577350269189,-0.577350269189,-0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS ); glVertex3d( 0.0,-RADIUS, 0.0 );
-  glEnd();
-#undef RADIUS
-}
-
-/*
- *
- */
-void FGAPIENTRY glutSolidOctahedron( void )
-{
-  FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidOctahedron" );
-
-#define RADIUS    1.0f
-  glBegin( GL_TRIANGLES );
-    glNormal3d( 0.577350269189, 0.577350269189, 0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, RADIUS, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS );
-    glNormal3d( 0.577350269189, 0.577350269189,-0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS ); glVertex3d( 0.0, RADIUS, 0.0 );
-    glNormal3d( 0.577350269189,-0.577350269189, 0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS ); glVertex3d( 0.0,-RADIUS, 0.0 );
-    glNormal3d( 0.577350269189,-0.577350269189,-0.577350269189); glVertex3d( RADIUS, 0.0, 0.0 ); glVertex3d( 0.0,-RADIUS, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS );
-    glNormal3d(-0.577350269189, 0.577350269189, 0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS ); glVertex3d( 0.0, RADIUS, 0.0 );
-    glNormal3d(-0.577350269189, 0.577350269189,-0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, RADIUS, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS );
-    glNormal3d(-0.577350269189,-0.577350269189, 0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0,-RADIUS, 0.0 ); glVertex3d( 0.0, 0.0, RADIUS );
-    glNormal3d(-0.577350269189,-0.577350269189,-0.577350269189); glVertex3d(-RADIUS, 0.0, 0.0 ); glVertex3d( 0.0, 0.0,-RADIUS ); glVertex3d( 0.0,-RADIUS, 0.0 );
-  glEnd();
-#undef RADIUS
-}
-
-/*
- *
- */
-static double icos_r[12][3] = {
-    {  1.0,             0.0,             0.0            },
-    {  0.447213595500,  0.894427191000,  0.0            },
-    {  0.447213595500,  0.276393202252,  0.850650808354 },
-    {  0.447213595500, -0.723606797748,  0.525731112119 },
-    {  0.447213595500, -0.723606797748, -0.525731112119 },
-    {  0.447213595500,  0.276393202252, -0.850650808354 },
-    { -0.447213595500, -0.894427191000,  0.0 },
-    { -0.447213595500, -0.276393202252,  0.850650808354 },
-    { -0.447213595500,  0.723606797748,  0.525731112119 },
-    { -0.447213595500,  0.723606797748, -0.525731112119 },
-    { -0.447213595500, -0.276393202252, -0.850650808354 },
-    { -1.0,             0.0,             0.0            }
-};
-
-static int icos_v [20][3] = {
-    {  0,  1,  2 },
-    {  0,  2,  3 },
-    {  0,  3,  4 },
-    {  0,  4,  5 },
-    {  0,  5,  1 },
-    {  1,  8,  2 },
-    {  2,  7,  3 },
-    {  3,  6,  4 },
-    {  4, 10,  5 },
-    {  5,  9,  1 },
-    {  1,  9,  8 },
-    {  2,  8,  7 },
-    {  3,  7,  6 },
-    {  4,  6, 10 },
-    {  5, 10,  9 },
-    { 11,  9, 10 },
-    { 11,  8,  9 },
-    { 11,  7,  8 },
-    { 11,  6,  7 },
-    { 11, 10,  6 }
-};
-
-void FGAPIENTRY glutWireIcosahedron( void )
-{
-  int i ;
-
-  FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireIcosahedron" );
-
-  for ( i = 0; i < 20; i++ )
-  {
-    double normal[3] ;
-    normal[0] = ( icos_r[icos_v[i][1]][1] - icos_r[icos_v[i][0]][1] ) * ( icos_r[icos_v[i][2]][2] - icos_r[icos_v[i][0]][2] ) - ( icos_r[icos_v[i][1]][2] - icos_r[icos_v[i][0]][2] ) * ( icos_r[icos_v[i][2]][1] - icos_r[icos_v[i][0]][1] ) ;
-    normal[1] = ( icos_r[icos_v[i][1]][2] - icos_r[icos_v[i][0]][2] ) * ( icos_r[icos_v[i][2]][0] - icos_r[icos_v[i][0]][0] ) - ( icos_r[icos_v[i][1]][0] - icos_r[icos_v[i][0]][0] ) * ( icos_r[icos_v[i][2]][2] - icos_r[icos_v[i][0]][2] ) ;
-    normal[2] = ( icos_r[icos_v[i][1]][0] - icos_r[icos_v[i][0]][0] ) * ( icos_r[icos_v[i][2]][1] - icos_r[icos_v[i][0]][1] ) - ( icos_r[icos_v[i][1]][1] - icos_r[icos_v[i][0]][1] ) * ( icos_r[icos_v[i][2]][0] - icos_r[icos_v[i][0]][0] ) ;
-    glBegin ( GL_LINE_LOOP ) ;
-      glNormal3dv ( normal ) ;
-      glVertex3dv ( icos_r[icos_v[i][0]] ) ;
-      glVertex3dv ( icos_r[icos_v[i][1]] ) ;
-      glVertex3dv ( icos_r[icos_v[i][2]] ) ;
-    glEnd () ;
-  }
-}
-
-/*
- *
- */
-void FGAPIENTRY glutSolidIcosahedron( void )
-{
-  int i ;
-
-  FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidIcosahedron" );
-
-  glBegin ( GL_TRIANGLES ) ;
-  for ( i = 0; i < 20; i++ )
-  {
-    double normal[3] ;
-    normal[0] = ( icos_r[icos_v[i][1]][1] - icos_r[icos_v[i][0]][1] ) * ( icos_r[icos_v[i][2]][2] - icos_r[icos_v[i][0]][2] ) - ( icos_r[icos_v[i][1]][2] - icos_r[icos_v[i][0]][2] ) * ( icos_r[icos_v[i][2]][1] - icos_r[icos_v[i][0]][1] ) ;
-    normal[1] = ( icos_r[icos_v[i][1]][2] - icos_r[icos_v[i][0]][2] ) * ( icos_r[icos_v[i][2]][0] - icos_r[icos_v[i][0]][0] ) - ( icos_r[icos_v[i][1]][0] - icos_r[icos_v[i][0]][0] ) * ( icos_r[icos_v[i][2]][2] - icos_r[icos_v[i][0]][2] ) ;
-    normal[2] = ( icos_r[icos_v[i][1]][0] - icos_r[icos_v[i][0]][0] ) * ( icos_r[icos_v[i][2]][1] - icos_r[icos_v[i][0]][1] ) - ( icos_r[icos_v[i][1]][1] - icos_r[icos_v[i][0]][1] ) * ( icos_r[icos_v[i][2]][0] - icos_r[icos_v[i][0]][0] ) ;
-      glNormal3dv ( normal ) ;
-      glVertex3dv ( icos_r[icos_v[i][0]] ) ;
-      glVertex3dv ( icos_r[icos_v[i][1]] ) ;
-      glVertex3dv ( icos_r[icos_v[i][2]] ) ;
-  }
-
-  glEnd () ;
-}
-
-/*
- *
- */
-static double rdod_r[14][3] = {
-    {  0.0,             0.0,             1.0 },
-    {  0.707106781187,  0.000000000000,  0.5 },
-    {  0.000000000000,  0.707106781187,  0.5 },
-    { -0.707106781187,  0.000000000000,  0.5 },
-    {  0.000000000000, -0.707106781187,  0.5 },
-    {  0.707106781187,  0.707106781187,  0.0 },
-    { -0.707106781187,  0.707106781187,  0.0 },
-    { -0.707106781187, -0.707106781187,  0.0 },
-    {  0.707106781187, -0.707106781187,  0.0 },
-    {  0.707106781187,  0.000000000000, -0.5 },
-    {  0.000000000000,  0.707106781187, -0.5 },
-    { -0.707106781187,  0.000000000000, -0.5 },
-    {  0.000000000000, -0.707106781187, -0.5 },
-    {  0.0,             0.0,            -1.0 }
-} ;
-
-static int rdod_v [12][4] = {
-    { 0,  1,  5,  2 },
-    { 0,  2,  6,  3 },
-    { 0,  3,  7,  4 },
-    { 0,  4,  8,  1 },
-    { 5, 10,  6,  2 },
-    { 6, 11,  7,  3 },
-    { 7, 12,  8,  4 },
-    { 8,  9,  5,  1 },
-    { 5,  9, 13, 10 },
-    { 6, 10, 13, 11 },
-    { 7, 11, 13, 12 },
-    { 8, 12, 13,  9 }
-};
-
-static double rdod_n[12][3] = {
-    {  0.353553390594,  0.353553390594,  0.5 },
-    { -0.353553390594,  0.353553390594,  0.5 },
-    { -0.353553390594, -0.353553390594,  0.5 },
-    {  0.353553390594, -0.353553390594,  0.5 },
-    {  0.000000000000,  1.000000000000,  0.0 },
-    { -1.000000000000,  0.000000000000,  0.0 },
-    {  0.000000000000, -1.000000000000,  0.0 },
-    {  1.000000000000,  0.000000000000,  0.0 },
-    {  0.353553390594,  0.353553390594, -0.5 },
-    { -0.353553390594,  0.353553390594, -0.5 },
-    { -0.353553390594, -0.353553390594, -0.5 },
-    {  0.353553390594, -0.353553390594, -0.5 }
-};
-
-void FGAPIENTRY glutWireRhombicDodecahedron( void )
-{
-  int i ;
-
-  FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireRhombicDodecahedron" );
-
-  for ( i = 0; i < 12; i++ )
-  {
-    glBegin ( GL_LINE_LOOP ) ;
-      glNormal3dv ( rdod_n[i] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][0]] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][1]] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][2]] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][3]] ) ;
-    glEnd () ;
-  }
-}
-
-/*
- *
- */
-void FGAPIENTRY glutSolidRhombicDodecahedron( void )
-{
-  int i ;
-
-  FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidRhombicDodecahedron" );
-
-  glBegin ( GL_QUADS ) ;
-  for ( i = 0; i < 12; i++ )
-  {
-      glNormal3dv ( rdod_n[i] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][0]] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][1]] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][2]] ) ;
-      glVertex3dv ( rdod_r[rdod_v[i][3]] ) ;
-  }
-
-  glEnd () ;
-}
-
 
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-/*
- * Draws a wireframed cube.
- */
+/* Macro to generate interface functions */
+#define DECLARE_SHAPE_INTERFACE(nameICaps)\
+    void FGAPIENTRY glutWire##nameICaps( void )\
+    {\
+        FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWire"#nameICaps );\
+        fgh##nameICaps( TRUE );\
+    }\
+    void FGAPIENTRY glutSolid##nameICaps( void )\
+    {\
+        FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolid"#nameICaps );\
+        fgh##nameICaps( FALSE );\
+    }
+
 void FGAPIENTRY glutWireCube( GLdouble dSize )
 {
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCube" );
@@ -1315,16 +1383,9 @@ void FGAPIENTRY glutSolidCube( GLdouble dSize )
     fghCube( dSize, FALSE );
 }
 
-void FGAPIENTRY glutWireTetrahedron( void )
-{
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireTetrahedron" );
-    fghTetrahedron( TRUE );
-}
-void FGAPIENTRY glutSolidTetrahedron( void )
-{
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidTetrahedron" );
-    fghTetrahedron( FALSE );
-}
+DECLARE_SHAPE_INTERFACE(Icosahedron);
+DECLARE_SHAPE_INTERFACE(Octahedron);
+DECLARE_SHAPE_INTERFACE(RhombicDodecahedron);
 
 void FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale )
 {
@@ -1337,5 +1398,7 @@ void FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, GLdouble offset[3],
     fghSierpinskiSponge ( num_levels, offset, scale, FALSE );
 }
 
+DECLARE_SHAPE_INTERFACE(Tetrahedron);
+
 
 /*** END OF FILE ***/