X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=07e4159160f70c1c56799b6372aa17b2cd588508;hb=4290b0aefec61fb4bd9469cbbdb024d31064a23e;hp=f9c5f62c7dd98e67b34a6493f9155eabc01bfc36;hpb=8c3eab0efb7f82a94014e0c1342c287e19461041;p=freeglut diff --git a/src/fg_geometry.c b/src/fg_geometry.c index f9c5f62..07e4159 100644 --- a/src/fg_geometry.c +++ b/src/fg_geometry.c @@ -34,6 +34,16 @@ * Need more types of polyhedra? See CPolyhedron in MRPT */ +/* VC++6 in C mode doesn't have C99's sinf/cos/sqrtf */ +#ifndef HAVE_SINF +#define sinf(x) (float)sin((double)(x)) +#endif +#ifndef HAVE_COSF +#define cosf(x) (float)cos((double)(x)) +#endif +#ifndef HAVE_SQRTF +#define sqrtf(x) (float)sqrt((double)(x)) +#endif /* General functions for drawing geometry * Solids are drawn by glDrawArrays if composed of triangles, or by @@ -79,15 +89,16 @@ static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, #endif /* Version for OpenGL (ES) >= 2.0 */ -static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, +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 ) { - GLuint vbo_coords = 0, vbo_normals = 0; - GLuint numVertices = numParts * numVertPerPart; - + GLuint vbo_coords = 0, vbo_normals = 0, + ibo_elements = 0, ibo_elements2 = 0; + GLsizei numVertIdxs = numParts * numVertPerPart; + GLsizei numVertIdxs2 = numParts2 * numVertPerPart2; int i; if (numVertices > 0 && attribute_v_coord != -1) { @@ -104,6 +115,22 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, normals, FGH_STATIC_DRAW); } + if (vertIdxs != NULL) { + fghGenBuffers(1, &ibo_elements); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements); + fghBufferData(FGH_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]), + vertIdxs, FGH_STATIC_DRAW); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, 0); + } + + if (vertIdxs2 != NULL) { + fghGenBuffers(1, &ibo_elements2); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements2); + fghBufferData(FGH_ELEMENT_ARRAY_BUFFER, numVertIdxs2 * sizeof(vertIdxs2[0]), + vertIdxs2, FGH_STATIC_DRAW); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, 0); + } + if (vbo_coords) { fghEnableVertexAttribArray(attribute_v_coord); fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); @@ -115,6 +142,7 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, 0, /* no extra data between each position */ 0 /* offset of first element */ ); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); } if (vbo_normals) { @@ -128,12 +156,32 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, 0, /* no extra data between each position */ 0 /* offset of first element */ ); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); } - /* Draw per face (TODO: could use glMultiDrawArrays if available) */ - for (i=0; i 0 && attribute_v_coord != -1) { fghGenBuffers(1, &vbo_coords); fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]), vertices, FGH_STATIC_DRAW); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); } if (numVertices > 0 && attribute_v_normal != -1) { @@ -223,13 +278,15 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLushort fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]), normals, FGH_STATIC_DRAW); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); } if (vertIdxs != NULL) { fghGenBuffers(1, &ibo_elements); fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements); - fghBufferData(FGH_ELEMENT_ARRAY_BUFFER, numVertIdxsPerPart * sizeof(vertIdxs[0]), + fghBufferData(FGH_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]), vertIdxs, FGH_STATIC_DRAW); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, 0); } if (vbo_coords) { @@ -243,6 +300,7 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLushort 0, /* no extra data between each position */ 0 /* offset of first element */ ); + fghBindBuffer(FGH_ARRAY_BUFFER, 0); }; if (vbo_normals) { @@ -256,19 +314,24 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLushort 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); } else { fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements); - glDrawElements(GL_TRIANGLES, numVertIdxsPerPart, GL_UNSIGNED_SHORT, 0); + if (numParts>1) { + for (i=0; i 0 ) ? stacks : 1 ); /* Scaling factors for vertex normals */ -#ifdef __cplusplus const GLfloat cosn = ( (GLfloat)height / sqrtf( height * height + base * base )); const GLfloat sinn = ( (GLfloat)base / sqrtf( height * height + base * base )); -#else - const GLfloat cosn = ( (GLfloat)height / (GLfloat)sqrt( (double)(height * height + base * base) )); - const GLfloat sinn = ( (GLfloat)base / (GLfloat)sqrt( (double)(height * height + base * base) )); -#endif /* __cplusplus */ @@ -1199,7 +1252,7 @@ void fghGenerateTorus( \ if (useWireMode)\ {\ - fghDrawGeometryWire (name##_verts,name##_norms,\ + fghDrawGeometryWire (name##_verts,name##_norms,nameCaps##_VERT_PER_OBJ, \ NULL,nameCaps##_NUM_FACES,nameCaps##_NUM_EDGE_PER_FACE,GL_LINE_LOOP,\ NULL,0,0);\ }\ @@ -1243,7 +1296,7 @@ static void fghCube( GLfloat dSize, GLboolean useWireMode ) vertices = cube_verts; if (useWireMode) - fghDrawGeometryWire(vertices, cube_norms, + fghDrawGeometryWire(vertices, cube_norms, CUBE_VERT_PER_OBJ, NULL,CUBE_NUM_FACES, CUBE_NUM_EDGE_PER_FACE,GL_LINE_LOOP, NULL,0,0); else @@ -1287,7 +1340,7 @@ static void fghSierpinskiSponge ( int numLevels, double offset[3], GLfloat scale /* Draw and cleanup */ if (useWireMode) - fghDrawGeometryWire (vertices,normals, + fghDrawGeometryWire (vertices,normals,numVert, NULL,numFace,TETRAHEDRON_NUM_EDGE_PER_FACE,GL_LINE_LOOP, NULL,0,0); else @@ -1351,7 +1404,7 @@ static void fghSphere( double radius, GLint slices, GLint stacks, GLboolean useW } /* draw */ - fghDrawGeometryWire(vertices,normals, + fghDrawGeometryWire(vertices,normals,nVert, sliceIdx,slices,stacks+1,GL_LINE_STRIP, stackIdx,stacks-1,slices); @@ -1473,7 +1526,7 @@ static void fghCone( double base, double height, GLint slices, GLint stacks, GLb } /* draw */ - fghDrawGeometryWire(vertices,normals, + fghDrawGeometryWire(vertices,normals,nVert, sliceIdx,1,slices*2,GL_LINES, stackIdx,stacks,slices); @@ -1584,7 +1637,7 @@ static void fghCylinder( double radius, double height, GLint slices, GLint stack } /* draw */ - fghDrawGeometryWire(vertices,normals, + fghDrawGeometryWire(vertices,normals,nVert, sliceIdx,1,slices*2,GL_LINES, stackIdx,stacks+1,slices); @@ -1696,7 +1749,7 @@ static void fghTorus( double dInnerRadius, double dOuterRadius, GLint nSides, GL sideIdx[idx] = j * nSides + i; /* draw */ - fghDrawGeometryWire(vertices,normals, + fghDrawGeometryWire(vertices,normals,nVert, ringIdx,nRings,nSides,GL_LINE_LOOP, sideIdx,nSides,nRings);