X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=e41f01dbfdf0e6ccc52d4b4480e49ca002967d9b;hb=207c3128bf025b5e025bace5c0425d380dd72aa9;hp=57301a066e7df40c4036180ed7823378a0ccf78d;hpb=bd6ea30351da7505f3ffd923402774c51c1fdb3f;p=freeglut diff --git a/src/fg_geometry.c b/src/fg_geometry.c index 57301a0..e41f01d 100644 --- a/src/fg_geometry.c +++ b/src/fg_geometry.c @@ -1,5 +1,5 @@ /* - * freeglut_geometry.c + * fg_geometry.c * * Freeglut geometry rendering methods. * @@ -30,24 +30,38 @@ #include "fg_gl2.h" #include +/* + * A note: We do not use the GLuint data type for vertex index arrays + * in this code as Open GL ES1 only supports GLushort. This affects the + * cylindrical objects only (Torus, Sphere, Cylinder and Cone) and limits + * their number of vertices to 65535 (2^16-1). Thats about 256*256 + * subdivisions, which is sufficient for just about any usage case, so + * I am not going to worry about it for now. + * One could do compile time detection of the gluint type through CMake, + * but it is likely that we'll eventually move to runtime selection + * of OpenGL or GLES1/2, which would make that strategy useless... + */ + /* declare for drawing using the different OpenGL versions here so we can have a nice code order below */ -#ifndef GL_ES_VERSION_2_0 static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, - GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2 + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, + GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2 ); -static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart); -#endif +static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices, + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart); static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, - GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2, - GLint attribute_v_coord, GLint attribute_v_normal + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, + GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2, + GLint attribute_v_coord, GLint attribute_v_normal ); -static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart, - GLint attribute_v_coord, GLint attribute_v_normal); +static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices, + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart, + GLint attribute_v_coord, GLint attribute_v_normal, GLint attribute_v_texture); +/* declare function for generating visualization of normals */ +static void fghGenerateNormalVisualization(GLfloat *vertices, GLfloat *normals, GLsizei numVertices); +static void fghDrawNormalVisualization11(); +static void fghDrawNormalVisualization20(GLint attribute_v_coord); /* Drawing geometry: * Explanation of the functions has to be separate for the polyhedra and @@ -115,9 +129,9 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLsizei * * Feel free to contribute better naming ;) */ -static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, - GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2 +void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, + GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2 ) { GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; @@ -129,20 +143,18 @@ static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei num vertIdxs, numParts, numVertPerPart, vertexMode, vertIdxs2, numParts2, numVertPerPart2, attribute_v_coord, attribute_v_normal); -#ifndef GL_ES_VERSION_2_0 else fghDrawGeometryWire11(vertices, normals, vertIdxs, numParts, numVertPerPart, vertexMode, vertIdxs2, numParts2, numVertPerPart2); -#endif } /* Draw the geometric shape with filled triangles * * Arguments: - * GLfloat *vertices, GLfloat *normals, GLsizei numVertices - * The vertex coordinate and normal buffers, and the number of entries in - * those + * GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices + * The vertex coordinate, normal and texture coordinate buffers, and the + * number of entries in those * GLushort *vertIdxs * a vertex indices buffer, optional (not passed for the polyhedra with * triangular faces) @@ -163,31 +175,45 @@ static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei num * numParts * numVertPerPart gives the number of entries in the vertex * array vertIdxs */ -static void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart) +void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices, + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart) { - GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; - GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal; + GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; + GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal; + GLint attribute_v_texture = fgStructure.CurrentWindow->Window.attribute_v_texture; + + if (fgStructure.CurrentWindow->State.VisualizeNormals) + /* generate normals for each vertex to be drawn as well */ + fghGenerateNormalVisualization(vertices, normals, numVertices); if (fgState.HasOpenGL20 && (attribute_v_coord != -1 || attribute_v_normal != -1)) + { /* User requested a 2.0 draw */ - fghDrawGeometrySolid20(vertices, normals, numVertices, + fghDrawGeometrySolid20(vertices, normals, textcs, numVertices, vertIdxs, numParts, numVertIdxsPerPart, - attribute_v_coord, attribute_v_normal); -#ifndef GL_ES_VERSION_2_0 + attribute_v_coord, attribute_v_normal, attribute_v_texture); + + if (fgStructure.CurrentWindow->State.VisualizeNormals) + /* draw normals for each vertex as well */ + fghDrawNormalVisualization20(attribute_v_coord); + } else - fghDrawGeometrySolid11(vertices, normals, numVertices, + { + fghDrawGeometrySolid11(vertices, normals, textcs, numVertices, vertIdxs, numParts, numVertIdxsPerPart); -#endif + + if (fgStructure.CurrentWindow->State.VisualizeNormals) + /* draw normals for each vertex as well */ + fghDrawNormalVisualization11(); + } } /* Version for OpenGL (ES) 1.1 */ -#ifndef GL_ES_VERSION_2_0 static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, - GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2 + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, + GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2 ) { int i; @@ -216,8 +242,8 @@ static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, } -static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart) +static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices, + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart) { int i; @@ -227,6 +253,12 @@ static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLsizei glVertexPointer(3, GL_FLOAT, 0, vertices); glNormalPointer(GL_FLOAT, 0, normals); + if (textcs) + { + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FLOAT, 0, textcs); + } + if (!vertIdxs) glDrawArrays(GL_TRIANGLES, 0, numVertices); else @@ -238,15 +270,15 @@ static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLsizei glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_NORMAL_ARRAY); + if (textcs) + glDisableClientState(GL_TEXTURE_COORD_ARRAY); } -#endif /* Version for OpenGL (ES) >= 2.0 */ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, - GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2, - GLint attribute_v_coord, GLint attribute_v_normal - ) + GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, + GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2, + GLint attribute_v_coord, GLint attribute_v_normal) { GLuint vbo_coords = 0, vbo_normals = 0, ibo_elements = 0, ibo_elements2 = 0; @@ -355,11 +387,11 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n /* Version for OpenGL (ES) >= 2.0 */ -static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, +static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices, GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart, - GLint attribute_v_coord, GLint attribute_v_normal) + GLint attribute_v_coord, GLint attribute_v_normal, GLint attribute_v_texture) { - GLuint vbo_coords = 0, vbo_normals = 0, ibo_elements = 0; + GLuint vbo_coords = 0, vbo_normals = 0, vbo_textcs = 0, ibo_elements = 0; GLsizei numVertIdxs = numParts * numVertIdxsPerPart; int i; @@ -378,6 +410,14 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLsizei normals, FGH_STATIC_DRAW); fghBindBuffer(FGH_ARRAY_BUFFER, 0); } + + if (numVertices > 0 && attribute_v_texture != -1 && textcs) { + fghGenBuffers(1, &vbo_textcs); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_textcs); + fghBufferData(FGH_ARRAY_BUFFER, numVertices * 2 * sizeof(textcs[0]), + textcs, FGH_STATIC_DRAW); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); + } if (vertIdxs != NULL) { fghGenBuffers(1, &ibo_elements); @@ -414,6 +454,20 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLsizei ); fghBindBuffer(FGH_ARRAY_BUFFER, 0); }; + + if (vbo_textcs) { + fghEnableVertexAttribArray(attribute_v_texture); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_textcs); + fghVertexAttribPointer( + attribute_v_texture,/* attribute */ + 2, /* number of elements per vertex, here (s,t) */ + GL_FLOAT, /* the type of each element */ + GL_FALSE, /* take our values as-is */ + 0, /* no extra data between each position */ + 0 /* offset of first element */ + ); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); + }; if (vertIdxs == NULL) { glDrawArrays(GL_TRIANGLES, 0, numVertices); @@ -435,11 +489,15 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLsizei fghDisableVertexAttribArray(attribute_v_coord); if (vbo_normals != 0) fghDisableVertexAttribArray(attribute_v_normal); + if (vbo_textcs != 0) + fghDisableVertexAttribArray(attribute_v_texture); if (vbo_coords != 0) fghDeleteBuffers(1, &vbo_coords); if (vbo_normals != 0) fghDeleteBuffers(1, &vbo_normals); + if (vbo_textcs != 0) + fghDeleteBuffers(1, &vbo_textcs); if (ibo_elements != 0) fghDeleteBuffers(1, &ibo_elements); } @@ -447,6 +505,90 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLsizei /** + * Generate vertex indices for visualizing the normals. + * vertices are written into verticesForNormalVisualization. + * This must be freed by caller, we do the free at the + * end of fghDrawNormalVisualization11/fghDrawNormalVisualization20 + */ +static GLfloat *verticesForNormalVisualization; +static GLsizei numNormalVertices = 0; +static void fghGenerateNormalVisualization(GLfloat *vertices, GLfloat *normals, GLsizei numVertices) +{ + int i,j; + numNormalVertices = numVertices * 2; + verticesForNormalVisualization = malloc(numNormalVertices*3 * sizeof(GLfloat)); + + for (i=0,j=0; i= 2.0 */ +static void fghDrawNormalVisualization20(GLint attribute_v_coord) +{ + GLuint vbo_coords = 0; + + if (attribute_v_coord != -1) { + fghGenBuffers(1, &vbo_coords); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); + fghBufferData(FGH_ARRAY_BUFFER, numNormalVertices * 3 * sizeof(verticesForNormalVisualization[0]), + verticesForNormalVisualization, FGH_STATIC_DRAW); + } + + + if (vbo_coords) { + fghEnableVertexAttribArray(attribute_v_coord); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); + fghVertexAttribPointer( + attribute_v_coord, /* attribute */ + 3, /* number of elements per vertex, here (x,y,z) */ + GL_FLOAT, /* the type of each element */ + GL_FALSE, /* take our values as-is */ + 0, /* no extra data between each position */ + 0 /* offset of first element */ + ); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); + } + + glDrawArrays(GL_LINES, 0, numNormalVertices); + + if (vbo_coords != 0) + fghDisableVertexAttribArray(attribute_v_coord); + + if (vbo_coords != 0) + fghDeleteBuffers(1, &vbo_coords); + + /* Done, free memory */ + free(verticesForNormalVisualization); +} + +/** * Generate all combinations of vertices and normals needed to draw object. * Optional shape decomposition to triangles: * We'll use glDrawElements to draw all shapes that are not naturally @@ -521,7 +663,7 @@ static void fghGenerateGeometry(int numFaces, int numEdgePerFace, GLfloat *verti * vertices and normals are unique. */ #define DECLARE_SHAPE_CACHE(name,nameICaps,nameCaps)\ - static GLboolean name##Cached = FALSE;\ + static GLboolean name##Cached = GL_FALSE;\ static GLfloat name##_verts[nameCaps##_VERT_ELEM_PER_OBJ];\ static GLfloat name##_norms[nameCaps##_VERT_ELEM_PER_OBJ];\ static void fgh##nameICaps##Generate()\ @@ -531,7 +673,7 @@ static void fghGenerateGeometry(int numFaces, int numEdgePerFace, GLfloat *verti name##_verts, name##_norms);\ } #define DECLARE_SHAPE_CACHE_DECOMPOSE_TO_TRIANGLE(name,nameICaps,nameCaps)\ - static GLboolean name##Cached = FALSE;\ + static GLboolean name##Cached = GL_FALSE;\ static GLfloat name##_verts[nameCaps##_VERT_ELEM_PER_OBJ];\ static GLfloat name##_norms[nameCaps##_VERT_ELEM_PER_OBJ];\ static GLushort name##_vertIdxs[nameCaps##_VERT_PER_OBJ_TRI];\ @@ -894,7 +1036,18 @@ DECLARE_SHAPE_CACHE(tetrahedron,Tetrahedron,TETRAHEDRON) /* -- Sierpinski Sponge -- */ static unsigned int ipow (int x, unsigned int y) { - return y==0? 1: y==1? x: (y%2? x: 1) * ipow(x*x, y/2); + /* return y==0? 1: y==1? x: (y%2? x: 1) * ipow(x*x, y/2); */ + if (y==0) + return 1; + else + { + if (y==1) + return x; + else + { + return (y%2? x: 1) * ipow(x*x, y/2); + } + } } static void fghSierpinskiSpongeGenerate ( int numLevels, double offset[3], GLfloat scale, GLfloat* vertices, GLfloat* normals ) @@ -1014,15 +1167,13 @@ static void fghGenerateSphere(GLfloat radius, GLint slices, GLint stacks, GLfloa *nVert = slices*(stacks-1)+2; if ((*nVert) > 65535) /* - * limit of glushort, thats 256*256 subdivisions, should be enough in practice. - * But still: - * TODO: must have a better solution than this low limit, at least for architectures where gluint is available + * limit of glushort, thats 256*256 subdivisions, should be enough in practice. See note above */ fgWarning("fghGenerateSphere: too many slices or stacks requested, indices will wrap"); /* precompute values on unit circle */ - fghCircleTable(&sint1,&cost1,-slices,FALSE); - fghCircleTable(&sint2,&cost2, stacks,TRUE); + fghCircleTable(&sint1,&cost1,-slices,GL_FALSE); + fghCircleTable(&sint2,&cost2, stacks,GL_TRUE); /* Allocate vertex and normal buffers, bail out if memory allocation fails */ *vertices = malloc((*nVert)*3*sizeof(GLfloat)); @@ -1111,14 +1262,12 @@ void fghGenerateCone( if ((*nVert) > 65535) /* - * limit of glushort, thats 256*256 subdivisions, should be enough in practice. - * But still: - * TODO: must have a better solution than this low limit, at least for architectures where gluint is available + * limit of glushort, thats 256*256 subdivisions, should be enough in practice. See note above */ fgWarning("fghGenerateCone: too many slices or stacks requested, indices will wrap"); /* Pre-computed circle */ - fghCircleTable(&sint,&cost,-slices,FALSE); + fghCircleTable(&sint,&cost,-slices,GL_FALSE); /* Allocate vertex and normal buffers, bail out if memory allocation fails */ *vertices = malloc((*nVert)*3*sizeof(GLfloat)); @@ -1157,9 +1306,9 @@ void fghGenerateCone( (*vertices)[idx ] = cost[j]*r; (*vertices)[idx+1] = sint[j]*r; (*vertices)[idx+2] = z; - (*normals )[idx ] = cost[j]*sinn; - (*normals )[idx+1] = sint[j]*sinn; - (*normals )[idx+2] = cosn; + (*normals )[idx ] = cost[j]*cosn; + (*normals )[idx+1] = sint[j]*cosn; + (*normals )[idx+2] = sinn; } z += zStep; @@ -1198,14 +1347,12 @@ void fghGenerateCylinder( if ((*nVert) > 65535) /* - * limit of glushort, thats 256*256 subdivisions, should be enough in practice. - * But still: - * TODO: must have a better solution than this low limit, at least for architectures where gluint is available + * limit of glushort, thats 256*256 subdivisions, should be enough in practice. See note above */ fgWarning("fghGenerateCylinder: too many slices or stacks requested, indices will wrap"); /* Pre-computed circle */ - fghCircleTable(&sint,&cost,-slices,FALSE); + fghCircleTable(&sint,&cost,-slices,GL_FALSE); /* Allocate vertex and normal buffers, bail out if memory allocation fails */ *vertices = malloc((*nVert)*3*sizeof(GLfloat)); @@ -1302,15 +1449,13 @@ void fghGenerateTorus( if ((*nVert) > 65535) /* - * limit of glushort, thats 256*256 subdivisions, should be enough in practice. - * But still: - * TODO: must have a better solution than this low limit, at least for architectures where gluint is available + * limit of glushort, thats 256*256 subdivisions, should be enough in practice. See note above */ fgWarning("fghGenerateTorus: too many slices or stacks requested, indices will wrap"); /* precompute values on unit circle */ - fghCircleTable(&spsi,&cpsi, nRings,FALSE); - fghCircleTable(&sphi,&cphi,-nSides,FALSE); + fghCircleTable(&spsi,&cpsi, nRings,GL_FALSE); + fghCircleTable(&sphi,&cphi,-nSides,GL_FALSE); /* Allocate vertex and normal buffers, bail out if memory allocation fails */ *vertices = malloc((*nVert)*3*sizeof(GLfloat)); @@ -1362,7 +1507,7 @@ void fghGenerateTorus( }\ else\ {\ - fghDrawGeometrySolid(name##_verts,name##_norms,nameCaps##_VERT_PER_OBJ,\ + fghDrawGeometrySolid(name##_verts,name##_norms,NULL,nameCaps##_VERT_PER_OBJ,\ vertIdxs, 1, nameCaps##_VERT_PER_OBJ_TRI); \ }\ } @@ -1404,7 +1549,7 @@ static void fghCube( GLfloat dSize, GLboolean useWireMode ) NULL,CUBE_NUM_FACES, CUBE_NUM_EDGE_PER_FACE,GL_LINE_LOOP, NULL,0,0); else - fghDrawGeometrySolid(vertices, cube_norms, CUBE_VERT_PER_OBJ, + fghDrawGeometrySolid(vertices, cube_norms, NULL, CUBE_VERT_PER_OBJ, cube_vertIdxs, 1, CUBE_VERT_PER_OBJ_TRI); if (dSize!=1.f) @@ -1448,7 +1593,7 @@ static void fghSierpinskiSponge ( int numLevels, double offset[3], GLfloat scale NULL,numFace,TETRAHEDRON_NUM_EDGE_PER_FACE,GL_LINE_LOOP, NULL,0,0); else - fghDrawGeometrySolid(vertices,normals,numVert,NULL,1,0); + fghDrawGeometrySolid(vertices,normals,NULL,numVert,NULL,1,0); free(vertices); free(normals ); @@ -1570,7 +1715,7 @@ static void fghSphere( GLfloat radius, GLint slices, GLint stacks, GLboolean use /* draw */ - fghDrawGeometrySolid(vertices,normals,nVert,stripIdx,stacks,(slices+1)*2); + fghDrawGeometrySolid(vertices,normals,NULL,nVert,stripIdx,stacks,(slices+1)*2); /* cleanup allocated memory */ free(stripIdx); @@ -1681,7 +1826,7 @@ static void fghCone( GLfloat base, GLfloat height, GLint slices, GLint stacks, G } /* draw */ - fghDrawGeometrySolid(vertices,normals,nVert,stripIdx,stacks+1,(slices+1)*2); + fghDrawGeometrySolid(vertices,normals,NULL,nVert,stripIdx,stacks+1,(slices+1)*2); /* cleanup allocated memory */ free(stripIdx); @@ -1802,7 +1947,7 @@ static void fghCylinder( GLfloat radius, GLfloat height, GLint slices, GLint sta stripIdx[idx+1] = nVert-1; /* repeat first slice's idx for closing off shape */ /* draw */ - fghDrawGeometrySolid(vertices,normals,nVert,stripIdx,stacks+2,(slices+1)*2); + fghDrawGeometrySolid(vertices,normals,NULL,nVert,stripIdx,stacks+2,(slices+1)*2); /* cleanup allocated memory */ free(stripIdx); @@ -1896,7 +2041,7 @@ static void fghTorus( GLfloat dInnerRadius, GLfloat dOuterRadius, GLint nSides, } /* draw */ - fghDrawGeometrySolid(vertices,normals,nVert,stripIdx,nSides,(nRings+1)*2); + fghDrawGeometrySolid(vertices,normals,NULL,nVert,stripIdx,nSides,(nRings+1)*2); /* cleanup allocated memory */ free(stripIdx); @@ -1917,7 +2062,7 @@ static void fghTorus( GLfloat dInnerRadius, GLfloat dOuterRadius, GLint nSides, void FGAPIENTRY glutSolidSphere(double radius, GLint slices, GLint stacks) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidSphere" ); - fghSphere((GLfloat)radius, slices, stacks, FALSE ); + fghSphere((GLfloat)radius, slices, stacks, GL_FALSE ); } /* @@ -1926,7 +2071,7 @@ void FGAPIENTRY glutSolidSphere(double radius, GLint slices, GLint stacks) void FGAPIENTRY glutWireSphere(double radius, GLint slices, GLint stacks) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireSphere" ); - fghSphere((GLfloat)radius, slices, stacks, TRUE ); + fghSphere((GLfloat)radius, slices, stacks, GL_TRUE ); } @@ -1936,7 +2081,7 @@ void FGAPIENTRY glutWireSphere(double radius, GLint slices, GLint stacks) void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCone" ); - fghCone((GLfloat)base, (GLfloat)height, slices, stacks, FALSE ); + fghCone((GLfloat)base, (GLfloat)height, slices, stacks, GL_FALSE ); } /* @@ -1945,7 +2090,7 @@ void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint s void FGAPIENTRY glutWireCone( double base, double height, GLint slices, GLint stacks) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCone" ); - fghCone((GLfloat)base, (GLfloat)height, slices, stacks, TRUE ); + fghCone((GLfloat)base, (GLfloat)height, slices, stacks, GL_TRUE ); } @@ -1955,7 +2100,7 @@ void FGAPIENTRY glutWireCone( double base, double height, GLint slices, GLint st void FGAPIENTRY glutSolidCylinder(double radius, double height, GLint slices, GLint stacks) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCylinder" ); - fghCylinder((GLfloat)radius, (GLfloat)height, slices, stacks, FALSE ); + fghCylinder((GLfloat)radius, (GLfloat)height, slices, stacks, GL_FALSE ); } /* @@ -1964,7 +2109,7 @@ void FGAPIENTRY glutSolidCylinder(double radius, double height, GLint slices, GL void FGAPIENTRY glutWireCylinder(double radius, double height, GLint slices, GLint stacks) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCylinder" ); - fghCylinder((GLfloat)radius, (GLfloat)height, slices, stacks, TRUE ); + fghCylinder((GLfloat)radius, (GLfloat)height, slices, stacks, GL_TRUE ); } /* @@ -1973,7 +2118,7 @@ void FGAPIENTRY glutWireCylinder(double radius, double height, GLint slices, GLi void FGAPIENTRY glutWireTorus( double dInnerRadius, double dOuterRadius, GLint nSides, GLint nRings ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireTorus" ); - fghTorus((GLfloat)dInnerRadius, (GLfloat)dOuterRadius, nSides, nRings, TRUE); + fghTorus((GLfloat)dInnerRadius, (GLfloat)dOuterRadius, nSides, nRings, GL_TRUE); } /* @@ -1982,7 +2127,7 @@ void FGAPIENTRY glutWireTorus( double dInnerRadius, double dOuterRadius, GLint n void FGAPIENTRY glutSolidTorus( double dInnerRadius, double dOuterRadius, GLint nSides, GLint nRings ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidTorus" ); - fghTorus((GLfloat)dInnerRadius, (GLfloat)dOuterRadius, nSides, nRings, FALSE); + fghTorus((GLfloat)dInnerRadius, (GLfloat)dOuterRadius, nSides, nRings, GL_FALSE); } @@ -1993,23 +2138,23 @@ void FGAPIENTRY glutSolidTorus( double dInnerRadius, double dOuterRadius, GLint void FGAPIENTRY glutWire##nameICaps( void )\ {\ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWire"#nameICaps );\ - fgh##nameICaps( TRUE );\ + fgh##nameICaps( GL_TRUE );\ }\ void FGAPIENTRY glutSolid##nameICaps( void )\ {\ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolid"#nameICaps );\ - fgh##nameICaps( FALSE );\ + fgh##nameICaps( GL_FALSE );\ } void FGAPIENTRY glutWireCube( double dSize ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCube" ); - fghCube( (GLfloat)dSize, TRUE ); + fghCube( (GLfloat)dSize, GL_TRUE ); } void FGAPIENTRY glutSolidCube( double dSize ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCube" ); - fghCube( (GLfloat)dSize, FALSE ); + fghCube( (GLfloat)dSize, GL_FALSE ); } DECLARE_SHAPE_INTERFACE(Dodecahedron) @@ -2020,12 +2165,12 @@ DECLARE_SHAPE_INTERFACE(RhombicDodecahedron) void FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, double offset[3], double scale ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireSierpinskiSponge" ); - fghSierpinskiSponge ( num_levels, offset, (GLfloat)scale, TRUE ); + fghSierpinskiSponge ( num_levels, offset, (GLfloat)scale, GL_TRUE ); } void FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, double offset[3], double scale ) { FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidSierpinskiSponge" ); - fghSierpinskiSponge ( num_levels, offset, (GLfloat)scale, FALSE ); + fghSierpinskiSponge ( num_levels, offset, (GLfloat)scale, GL_FALSE ); } DECLARE_SHAPE_INTERFACE(Tetrahedron)