X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=4d5d40630887987068eec24484f175656b20e5bb;hb=759436698a49b7a734325735c57ffcdffa2f4379;hp=743909d63d0aa059c0cab0691695e4d6a9f7ea5b;hpb=5de2f0e3013d4906bf05343dee518929ef979bcc;p=freeglut

diff --git a/src/fg_geometry.c b/src/fg_geometry.c
index 743909d..4d5d406 100644
--- a/src/fg_geometry.c
+++ b/src/fg_geometry.c
@@ -67,7 +67,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, GLsizei numVertices, GLboolean useWireMode)
 {
     if (useWireMode)
     {
@@ -75,15 +75,31 @@ static void fghDrawGeometry(GLenum vertexMode, double* vertices, double* normals
         glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
     }
 
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_NORMAL_ARRAY);
+    if (1)
+    {
+        glEnableClientState(GL_VERTEX_ARRAY);
+        glEnableClientState(GL_NORMAL_ARRAY);
 
-    glVertexPointer(3, GL_DOUBLE, 0, vertices);
-    glNormalPointer(GL_DOUBLE, 0, normals);
-    glDrawArrays(vertexMode,0,numVertices);
+        glVertexPointer(3, GL_DOUBLE, 0, vertices);
+        glNormalPointer(GL_DOUBLE, 0, normals);
+        glDrawArrays(vertexMode, 0, numVertices);
 
-    glDisableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
+        glDisableClientState(GL_VERTEX_ARRAY);
+        glDisableClientState(GL_NORMAL_ARRAY);
+    }
+    else
+    {
+        int i;
+        glBegin(vertexMode);
+            for(i=0; i<numVertices; 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)
     {
@@ -128,6 +144,17 @@ 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_VERT_PER_FACE,\
+                            name##_v, name##_vi, name##_n,\
+                            name##_verts, name##_norms);\
+    }
 /*
  * In general, we build arrays with all vertices or normals.
  * We cant compress this and use glDrawElements as all combinations of
@@ -138,8 +165,8 @@ static unsigned int ipow (int x, unsigned int y)
 #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_VERT_PER_OBJ       CUBE_NUM_FACES*CUBE_NUM_VERT_PER_FACE
+#define CUBE_VERT_ELEM_PER_OBJ  CUBE_VERT_PER_OBJ*3
 /* Vertex Coordinates */
 static GLdouble cube_v[CUBE_NUM_VERT*3] =
 {
@@ -164,7 +191,7 @@ static GLdouble cube_n[CUBE_NUM_FACES*3] =
 };
 
 /* 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,
@@ -173,16 +200,53 @@ static GLubyte cube_vi[CUBE_NUM_FACES*CUBE_NUM_VERT_PER_FACE] =
     7,4,3,2,
     4,7,6,5
 };
+DECLARE_SHAPE_CACHE(cube,Cube,CUBE);
 
-/* 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];
+/* -- Octahedron -- */
+#define OCTAHEDRON_NUM_VERT           6
+#define OCTAHEDRON_NUM_FACES          8
+#define OCTAHEDRON_NUM_VERT_PER_FACE  3
+#define OCTAHEDRON_VERT_PER_OBJ       OCTAHEDRON_NUM_FACES*OCTAHEDRON_NUM_VERT_PER_FACE
+#define OCTAHEDRON_VERT_ELEM_PER_OBJ  OCTAHEDRON_VERT_PER_OBJ*3
 
-static void fghCubeGenerate()
+/* Vertex Coordinates */
+static GLdouble octahedron_v[OCTAHEDRON_NUM_VERT*3] =
 {
-    fghGenerateGeometry(CUBE_NUM_FACES, CUBE_NUM_VERT_PER_FACE, cube_v, cube_vi, cube_n, cube_verts, cube_norms);
-}
+     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);
 
 /* -- Tetrahedron -- */
 /* Magic Numbers:  r0 = ( 1, 0, 0 )
@@ -194,14 +258,14 @@ 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_VERT_PER_FACE   3
+#define TETRAHEDRON_VERT_PER_OBJ        TETRAHEDRON_NUM_FACES*TETRAHEDRON_NUM_VERT_PER_FACE
+#define TETRAHEDRON_VERT_ELEM_PER_OBJ   TETRAHEDRON_VERT_PER_OBJ*3
 
 /* Vertex Coordinates */
-static GLdouble tetr_v[TETR_NUM_VERT*3] =
+static GLdouble tetrahedron_v[TETRAHEDRON_NUM_VERT*3] =
 {
                 1.0,             0.0,             0.0,
     -0.333333333333,  0.942809041582,             0.0,
@@ -209,7 +273,7 @@ static GLdouble tetr_v[TETR_NUM_VERT*3] =
     -0.333333333333, -0.471404520791, -0.816496580928
 };
 /* Normal Vectors */
-static GLdouble tetr_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,
@@ -218,60 +282,51 @@ static GLdouble tetr_n[CUBE_NUM_FACES*3] =
 };
 
 /* Vertex indices */
-static GLubyte tetr_vi[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
 };
-
-/* 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()
-{
-    fghGenerateGeometry(TETR_NUM_FACES, TETR_NUM_VERT_PER_FACE, tetr_v, tetr_vi, tetr_n, tetr_verts, tetr_norms);
-}
+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++)
         {
             int normIdx         = i*3;
-            int faceIdxVertIdx  = i*TETR_NUM_VERT_PER_FACE;
-            for (j=0; j<TETR_NUM_VERT_PER_FACE; j++)
+            int faceIdxVertIdx  = i*TETRAHEDRON_NUM_VERT_PER_FACE;
+            for (j=0; j<TETRAHEDRON_NUM_VERT_PER_FACE; j++)
             {
-                int outIdx  = i*TETR_NUM_VERT_PER_FACE*3+j*3;
-                int vertIdx = tetr_vi[faceIdxVertIdx+j]*3;
+                int outIdx  = i*TETRAHEDRON_NUM_VERT_PER_FACE*3+j*3;
+                int vertIdx = tetrahedron_vi[faceIdxVertIdx+j]*3;
 
-                vertices[outIdx  ] = offset[0] + scale * tetr_v[vertIdx  ];
-                vertices[outIdx+1] = offset[1] + scale * tetr_v[vertIdx+1];
-                vertices[outIdx+2] = offset[2] + scale * tetr_v[vertIdx+2];
+                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  ] = tetr_n[normIdx  ];
-                normals [outIdx+1] = tetr_n[normIdx+1];
-                normals [outIdx+2] = tetr_n[normIdx+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++ )
         {
             int idx         = i*3;
-            local_offset[0] = offset[0] + scale * tetr_v[idx  ];
-            local_offset[1] = offset[1] + scale * tetr_v[idx+1];
-            local_offset[2] = offset[2] + scale * tetr_v[idx+2];
+            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 );
         }
     }
@@ -332,6 +387,16 @@ static void fghCircleTable(double **sint,double **cost,const int n)
 
 
 /* -- INTERNAL DRAWING functions to avoid code duplication ------------- */
+#define DECLARE_INTERNAL_DRAW(name,nameICaps,nameCaps)\
+    static void fgh##nameICaps( GLboolean useWireMode )\
+    {\
+        if (!name##Cached)\
+        {\
+            fgh##nameICaps##Generate();\
+            name##Cached = TRUE;\
+        }\
+        fghDrawGeometry(GL_TRIANGLES,name##_verts,name##_norms,nameCaps##_VERT_PER_OBJ,useWireMode);\
+    }
 
 static void fghCube( GLdouble dSize, GLboolean useWireMode )
 {
@@ -343,36 +408,33 @@ static void fghCube( GLdouble dSize, GLboolean useWireMode )
 
     if (dSize!=1.)
     {
-        /* Need to build new */
-        fghDrawGeometry(GL_QUADS,cube_verts,cube_norms,CUBE_VERT_PER_TETR,useWireMode);
-    }
-    else
-        fghDrawGeometry(GL_QUADS,cube_verts,cube_norms,CUBE_VERT_PER_TETR,useWireMode);
-}
+        int i;
 
-static void fghTetrahedron( GLboolean useWireMode )
-{
-    if (!tetrCached)
-    {
-        fghTetrahedronGenerate();
-        tetrCached = TRUE;
-    }
+        /* 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,tetr_verts,tetr_norms,TETR_VERT_PER_TETR,useWireMode);
+        fghDrawGeometry(GL_QUADS,vertices  ,cube_norms,CUBE_VERT_PER_OBJ,useWireMode);
+    }
+    else
+        fghDrawGeometry(GL_QUADS,cube_verts,cube_norms,CUBE_VERT_PER_OBJ,useWireMode);
 }
+DECLARE_INTERNAL_DRAW(octahedron,Octahedron,OCTAHEDRON);
+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 );
@@ -1090,48 +1152,6 @@ void FGAPIENTRY glutSolidDodecahedron( void )
 /*
  *
  */
-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            },
@@ -1323,15 +1343,15 @@ void FGAPIENTRY glutSolidCube( GLdouble dSize )
     fghCube( dSize, FALSE );
 }
 
-void FGAPIENTRY glutWireTetrahedron( void )
+void FGAPIENTRY glutWireOctahedron( void )
 {
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireTetrahedron" );
-    fghTetrahedron( TRUE );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireOctahedron" );
+    fghOctahedron( TRUE );
 }
-void FGAPIENTRY glutSolidTetrahedron( void )
+void FGAPIENTRY glutSolidOctahedron( void )
 {
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidTetrahedron" );
-    fghTetrahedron( FALSE );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidOctahedron" );
+    fghOctahedron( FALSE );
 }
 
 void FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale )
@@ -1345,5 +1365,16 @@ void FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, GLdouble offset[3],
     fghSierpinskiSponge ( num_levels, offset, scale, 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 );
+}
+
 
 /*** END OF FILE ***/