X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=e41f01dbfdf0e6ccc52d4b4480e49ca002967d9b;hb=af47c3f93c7834b4006c49ec9df6a6ffdd3025de;hp=12d1035e93311f5cd3d59273cf5dbbac61f0d408;hpb=6bb70a51b03902c66ab3891f159c99485b6c8ca9;p=freeglut diff --git a/src/fg_geometry.c b/src/fg_geometry.c index 12d1035..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. * @@ -44,28 +44,23 @@ /* 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 ); -static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, +static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices, GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart); -#endif 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 ); -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); /* declare function for generating visualization of normals */ -static void fghGenerateNormalVisualization(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart); -#ifndef GL_ES_VERSION_2_0 +static void fghGenerateNormalVisualization(GLfloat *vertices, GLfloat *normals, GLsizei numVertices); static void fghDrawNormalVisualization11(); -#endif static void fghDrawNormalVisualization20(GLint attribute_v_coord); /* Drawing geometry: @@ -134,7 +129,7 @@ static void fghDrawNormalVisualization20(GLint attribute_v_coord); * * Feel free to contribute better naming ;) */ -static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, +void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode, GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2 ) @@ -148,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) @@ -182,45 +175,42 @@ 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, - vertIdxs, numParts, numVertIdxsPerPart); + 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); + 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); } -#ifndef GL_ES_VERSION_2_0 else { - fghDrawGeometrySolid11(vertices, normals, numVertices, + fghDrawGeometrySolid11(vertices, normals, textcs, numVertices, vertIdxs, numParts, numVertIdxsPerPart); if (fgStructure.CurrentWindow->State.VisualizeNormals) /* draw normals for each vertex as well */ fghDrawNormalVisualization11(); } -#endif } /* 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 @@ -252,7 +242,7 @@ static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, } -static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, +static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLfloat *textcs, GLsizei numVertices, GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart) { int i; @@ -263,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 @@ -274,8 +270,9 @@ 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, @@ -390,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; @@ -413,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); @@ -449,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); @@ -470,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); } @@ -483,52 +506,30 @@ 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 GLushort numNormalVertices = 0; -static void fghGenerateNormalVisualization(GLfloat *vertices, GLfloat *normals, GLsizei numVertices, - GLushort *vertIdxs, GLsizei numParts, GLsizei numVertIdxsPerPart) +static GLsizei numNormalVertices = 0; +static void fghGenerateNormalVisualization(GLfloat *vertices, GLfloat *normals, GLsizei numVertices) { - GLushort i,j; - /* calc number of vertices to generate, allocate. Must be freed by caller - * We do the free at the end of fghDrawNormalVisualization11/fghDrawNormalVisualization20 - */ - if (!vertIdxs) - numNormalVertices = numVertices * 2; - else - numNormalVertices = numParts * numVertIdxsPerPart * 2; + int i,j; + numNormalVertices = numVertices * 2; verticesForNormalVisualization = malloc(numNormalVertices*3 * sizeof(GLfloat)); - /* Now generate vertices for lines to draw the normals */ - if (!vertIdxs) - { - for (i=0,j=0; i= 2.0 */ static void fghDrawNormalVisualization20(GLint attribute_v_coord) @@ -1507,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); \ }\ } @@ -1549,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) @@ -1593,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 ); @@ -1715,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); @@ -1826,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); @@ -1947,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); @@ -2041,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);