X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=77b09a790678529eba45d7c9afc85e7f4be1cd58;hb=528c1d5f1b59c997928091b30fe33199ff3cc529;hp=a1d683df490d3a9f075af0b0c0503d0619ae64ae;hpb=acdc3f42c8e4ffb6d9a9296ff8391e8338432a93;p=freeglut diff --git a/src/fg_geometry.c b/src/fg_geometry.c index a1d683d..77b09a7 100644 --- a/src/fg_geometry.c +++ b/src/fg_geometry.c @@ -29,35 +29,7 @@ #include "fg_internal.h" /* - * TODO BEFORE THE STABLE RELEASE: - * - * See fghTetrahedron - * - * Following functions have been contributed by Andreas Umbach. - * - * glutWireCube() -- looks OK - * glutSolidCube() -- OK - * - * Those functions have been implemented by John Fay. - * - * glutWireTorus() -- looks OK - * glutSolidTorus() -- looks OK - * glutWireDodecahedron() -- looks OK - * glutSolidDodecahedron() -- looks OK - * glutWireOctahedron() -- looks OK - * glutSolidOctahedron() -- looks OK - * glutWireTetrahedron() -- looks OK - * glutSolidTetrahedron() -- looks OK - * glutWireIcosahedron() -- looks OK - * glutSolidIcosahedron() -- looks OK - * - * The Following functions have been updated by Nigel Stewart, based - * on FreeGLUT 2.0.0 implementations: - * - * glutWireSphere() -- looks OK - * glutSolidSphere() -- looks OK - * glutWireCone() -- looks OK - * glutSolidCone() -- looks OK + * Need more types of polyhedra? See CPolyhedron in MRPT */ @@ -67,38 +39,208 @@ * 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(GLdouble *vertices, GLdouble *normals, GLboolean *edgeFlags, GLsizei numVertices, GLsizei numFaces, GLsizei numEdgePerFace, GLboolean useWireMode) { +# ifdef FREEGLUT_GLES1 + /* Solid drawing is the same for OpenGL 1.x and OpenGL ES 1.x, just + * no edge flags for ES. + * WireFrame drawing will have to be done per face though, using + * GL_LINE_LOOP and issuing one draw call per face. For triangles, + * we use glDrawArrays directly on the vertex data for each face, + * while for shapes that are composed of quads or pentagons, we use + * glDrawElements with index vector {0,1,2,5} or {0,1,2,8,5}, + * respectively. + * We use the first parameter in glDrawArrays or glDrawElements to + * go from face to face. + */ + if (useWireMode) + { + /* setup reading the right elements from vertex array */ + GLubyte vertIdx4[4] = {0,1,2,5}; + GLubyte vertIdx5[5] = {0,1,2,8,5}; + GLubyte *indices = NULL; + int vertStride, i, j; + + switch (numEdgePerFace) + { + case 3: + vertStride = 3; /* there are 3 vertices for each face in the array */ + break; + case 4: + indices = vertIdx4; + vertStride = 6; /* there are 6 vertices for each face in the array */ + break; + case 5: + indices = vertIdx5; + vertStride = 9; /* there are 9 vertices for each face in the array */ + break; + } + + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_NORMAL_ARRAY); + + glVertexPointer(3, GL_DOUBLE, 0, vertices); + glNormalPointer(GL_DOUBLE, 0, normals); + + if (numEdgePerFace==3) + for (i=0; i 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 +696,86 @@ 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(name##_verts,name##_norms,edgeFlags,\ + nameCaps##_VERT_PER_OBJ_TRI,nameCaps##_NUM_FACES,nameCaps##_NUM_EDGE_PER_FACE,\ + 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)); + /* Bail out if memory allocation fails, fgError never returns */ + if (!vertices) + { + free(vertices); + fgError("Failed to allocate memory in fghCube"); + } + for (i=0; i