X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_geometry.c;h=fd799811dde329055e0c4aac1657ae6817769e4c;hb=b7d69172fb2d822b3392600126be8ce8ac5ce027;hp=427a099bcb8ea349f6788de4d16df9dbf435cd39;hpb=bc861a62269504a0f7001548d33626be17b77339;p=freeglut diff --git a/src/fg_geometry.c b/src/fg_geometry.c index 427a099..fd79981 100644 --- a/src/fg_geometry.c +++ b/src/fg_geometry.c @@ -68,35 +68,37 @@ static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, GLsizei n /* Version for OpenGL (ES) >= 2.0 */ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei numFaces, GLsizei numEdgePerFace, - GLint attribute_v_coord, GLint attribute_v_normal) + GLint attribute_v_coord, GLint attribute_v_normal) { - GLuint vbo_coords, vbo_normals; + GLuint vbo_coords = 0, vbo_normals = 0; GLuint numVertices = numFaces * numEdgePerFace; - + + int i; + if (numVertices > 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); + fghGenBuffers(1, &vbo_coords); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); + fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]), + vertices, FGH_STATIC_DRAW); } if (numVertices > 0 && attribute_v_normal != -1) { - fghGenBuffers(1, &vbo_normals); - fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); - fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]), - normals, FGH_STATIC_DRAW); + fghGenBuffers(1, &vbo_normals); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); + fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]), + normals, 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 + 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 */ ); } @@ -104,32 +106,29 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n fghEnableVertexAttribArray(attribute_v_normal); fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); fghVertexAttribPointer( - attribute_v_normal, // 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 + attribute_v_normal, /* 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 */ ); } - - int i; - /* Draw per face (TODO: could use glMultiDrawArrays if available) */ for (i=0; i= 2.0 */ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLubyte *vertIdxs, - GLsizei numVertices, GLsizei numVertIdxs, - GLint attribute_v_coord, GLint attribute_v_normal) + GLsizei numVertices, GLsizei numVertIdxs, + GLint attribute_v_coord, GLint attribute_v_normal) { - GLuint vbo_coords, vbo_normals, ibo_elements; + GLuint vbo_coords = 0, vbo_normals = 0, ibo_elements = 0; if (numVertices > 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); - } + fghGenBuffers(1, &vbo_coords); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); + fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]), + vertices, FGH_STATIC_DRAW); + } if (numVertices > 0 && attribute_v_normal != -1) { - fghGenBuffers(1, &vbo_normals); - fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); - fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]), - normals, FGH_STATIC_DRAW); + fghGenBuffers(1, &vbo_normals); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); + fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]), + 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); + fghGenBuffers(1, &ibo_elements); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements); + fghBufferData(FGH_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]), + vertIdxs, 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 + 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 */ ); }; if (vbo_normals) { - fghEnableVertexAttribArray(attribute_v_normal); - fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); - fghVertexAttribPointer( - attribute_v_normal, // 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 + fghEnableVertexAttribArray(attribute_v_normal); + fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); + fghVertexAttribPointer( + attribute_v_normal, /* 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 */ ); }; if (vertIdxs == NULL) { - glDrawArrays(GL_TRIANGLES, 0, numVertices); + glDrawArrays(GL_TRIANGLES, 0, numVertices); } else { - fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements); - glDrawElements(GL_TRIANGLES, numVertIdxs, GL_UNSIGNED_BYTE, 0); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements); + glDrawElements(GL_TRIANGLES, numVertIdxs, GL_UNSIGNED_BYTE, 0); } + + /* Clean existing bindings before clean-up */ + /* Android showed instability otherwise */ + fghBindBuffer(FGH_ARRAY_BUFFER, 0); + fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, 0); if (vbo_coords != 0) - fghDisableVertexAttribArray(attribute_v_coord); + fghDisableVertexAttribArray(attribute_v_coord); if (vbo_normals != 0) - fghDisableVertexAttribArray(attribute_v_normal); + fghDisableVertexAttribArray(attribute_v_normal); if (vbo_coords != 0) - fghDeleteBuffers(1, &vbo_coords); + fghDeleteBuffers(1, &vbo_coords); if (vbo_normals != 0) - fghDeleteBuffers(1, &vbo_normals); + fghDeleteBuffers(1, &vbo_normals); if (ibo_elements != 0) - fghDeleteBuffers(1, &ibo_elements); + fghDeleteBuffers(1, &ibo_elements); } static void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLubyte *vertIdxs, - GLsizei numVertices, GLsizei numVertIdxs) + GLsizei numVertices, GLsizei numVertIdxs) { GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal; if (fgState.HasOpenGL20 && (attribute_v_coord != -1 || attribute_v_normal != -1)) /* User requested a 2.0 draw */ - fghDrawGeometrySolid20(vertices, normals, vertIdxs, - numVertices, numVertIdxs, - attribute_v_coord, attribute_v_normal); + fghDrawGeometrySolid20(vertices, normals, vertIdxs, + numVertices, numVertIdxs, + attribute_v_coord, attribute_v_normal); #ifndef GL_ES_VERSION_2_0 else - fghDrawGeometrySolid11(vertices, normals, vertIdxs, - numVertices, numVertIdxs); + fghDrawGeometrySolid11(vertices, normals, vertIdxs, + numVertices, numVertIdxs); #endif } @@ -305,7 +309,7 @@ static void fghGenerateGeometryWithIndexArray(int numFaces, int numEdgePerFace, for (i=0; i 65535) /* TODO: must have a better solution than this low limit, at least for architectures where gluint is available */ + fgWarning("fghGenerateSphere: too many slices or stacks requested, indices will wrap"); /* precompute values on unit circle */ fghCircleTable(&sint1,&cost1,-slices,FALSE); @@ -841,7 +853,7 @@ static void fghGenerateSphere(GLfloat radius, GLint slices, GLint stacks, GLfloa /* Allocate vertex and normal buffers, bail out if memory allocation fails */ *vertices = malloc((*nVert)*3*sizeof(GLfloat)); *normals = malloc((*nVert)*3*sizeof(GLfloat)); - if (!(vertices) || !(normals)) + if (!(*vertices) || !(*normals)) { free(*vertices); free(*normals); @@ -890,6 +902,264 @@ static void fghGenerateSphere(GLfloat radius, GLint slices, GLint stacks, GLfloa free(cost2); } +void fghGenerateCone( + GLfloat base, GLfloat height, GLint slices, GLint stacks, /* input */ + GLfloat **vertices, GLfloat **normals, int* nVert /* output */ + ) +{ + int i,j; + int idx = 0; /* idx into vertex/normal buffer */ + + /* Pre-computed circle */ + GLfloat *sint,*cost; + + /* Step in z and radius as stacks are drawn. */ + GLfloat z = 0; + GLfloat r = (GLfloat)base; + + const GLfloat zStep = (GLfloat)height / ( ( stacks > 0 ) ? stacks : 1 ); + const GLfloat rStep = (GLfloat)base / ( ( stacks > 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 */ + + + + /* number of unique vertices */ + if (slices==0 || stacks<1) + { + /* nothing to generate */ + *nVert = 0; + return; + } + *nVert = slices*(stacks+2)+1; /* need an extra stack for closing off bottom with correct normals */ + + if ((*nVert) > 65535) + fgWarning("fghGenerateCone: too many slices or stacks requested, indices will wrap"); + + /* Pre-computed circle */ + fghCircleTable(&sint,&cost,-slices,FALSE); + + /* Allocate vertex and normal buffers, bail out if memory allocation fails */ + *vertices = malloc((*nVert)*3*sizeof(GLfloat)); + *normals = malloc((*nVert)*3*sizeof(GLfloat)); + if (!(*vertices) || !(*normals)) + { + free(*vertices); + free(*normals); + fgError("Failed to allocate memory in fghGenerateSphere"); + } + + /* bottom */ + (*vertices)[0] = 0.f; + (*vertices)[1] = 0.f; + (*vertices)[2] = z; + (*normals )[0] = 0.f; + (*normals )[1] = 0.f; + (*normals )[2] = -1.f; + idx = 3; + /* other on bottom (get normals right) */ + for (j=0; j 0 ) ? stacks : 1 ); + + /* Pre-computed circle */ + GLfloat *sint,*cost; + + /* number of unique vertices */ + if (slices==0 || stacks<1) + { + /* nothing to generate */ + *nVert = 0; + return; + } + *nVert = slices*(stacks+3)+2; /* need two extra stacks for closing off top and bottom with correct normals */ + + if ((*nVert) > 65535) + fgWarning("fghGenerateCylinder: too many slices or stacks requested, indices will wrap"); + + /* Pre-computed circle */ + fghCircleTable(&sint,&cost,-slices,FALSE); + + /* Allocate vertex and normal buffers, bail out if memory allocation fails */ + *vertices = malloc((*nVert)*3*sizeof(GLfloat)); + *normals = malloc((*nVert)*3*sizeof(GLfloat)); + if (!(*vertices) || !(*normals)) + { + free(*vertices); + free(*normals); + fgError("Failed to allocate memory in fghGenerateCylinder"); + } + + z=0; + /* top on Z-axis */ + (*vertices)[0] = 0.f; + (*vertices)[1] = 0.f; + (*vertices)[2] = 0.f; + (*normals )[0] = 0.f; + (*normals )[1] = 0.f; + (*normals )[2] = -1.f; + idx = 3; + /* other on top (get normals right) */ + for (j=0; j 65535) + 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); + + /* Allocate vertex and normal buffers, bail out if memory allocation fails */ + *vertices = malloc((*nVert)*3*sizeof(GLfloat)); + *normals = malloc((*nVert)*3*sizeof(GLfloat)); + if (!(*vertices) || !(*normals)) + { + free(*vertices); + free(*normals); + fgError("Failed to allocate memory in fghGenerateTorus"); + } + + for( j=0; j 65535) - fgWarning("fghSphere: too many slices or stacks requested, indices will wrap"); - /* Generate vertices and normals */ fghGenerateSphere((GLfloat)radius,slices,stacks,&vertices,&normals,&nVert); @@ -1025,17 +1292,11 @@ static void fghSphere( double radius, GLint slices, GLint stacks, GLboolean useW sliceIdx = malloc(slices*(stacks+1)*sizeof(GLushort)); stackIdx = malloc(slices*(stacks-1)*sizeof(GLushort)); - - /* generate for each stack */ - for (i=0,idx=0; i0; j--, idx++) - topIdx[idx] = j; - - bottomIdx[0]=nVert-1; /* zero based index, last element in array... */ - for (j=0, idx=1; j 0 ) ? stacks : 1 ); - const GLfloat rStep = (GLfloat)base / ( ( stacks > 0 ) ? stacks : 1 ); + /* draw */ + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_NORMAL_ARRAY); - /* Scaling factors for vertex normals */ + glVertexPointer(3, GL_FLOAT, 0, vertices); + glNormalPointer(GL_FLOAT, 0, normals); + /*draw slices*/ + glDrawElements(GL_LINES,slices*2,GL_UNSIGNED_SHORT,sliceIdx); + /*draw stacks*/ + for (i=0; i 0 ) ? stacks : 1 ); - const GLfloat rStep = (GLfloat)base / ( ( stacks > 0 ) ? stacks : 1 ); + /* middle stacks: */ + /* Strip indices are relative to first index belonging to strip, NOT relative to first vertex/normal pair in array */ + for (i=0; i 0 ) ? stacks : 1 ); + /* cleanup allocated memory */ + free(vertices); + free(normals); +} - /* Pre-computed circle */ - GLfloat *sint,*cost; +/* -- INTERFACE FUNCTIONS ---------------------------------------------- */ - FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCylinder" ); - fghCircleTable(&sint,&cost,-slices,FALSE); +/* + * Draws a solid sphere + */ +void FGAPIENTRY glutSolidSphere(double radius, GLint slices, GLint stacks) +{ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidSphere" ); - /* Cover the base and top */ + fghSphere( radius, slices, stacks, FALSE ); +} - glBegin(GL_TRIANGLE_FAN); - glNormal3f(0, 0, -1 ); - glVertex3f(0, 0, 0 ); - for (j=0; j<=slices; j++) - glVertex3f(cost[j]*radf, sint[j]*radf, 0); - glEnd(); +/* + * Draws a wire sphere + */ +void FGAPIENTRY glutWireSphere(double radius, GLint slices, GLint stacks) +{ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireSphere" ); - glBegin(GL_TRIANGLE_FAN); - glNormal3f(0, 0, 1 ); - glVertex3f(0, 0, (GLfloat)height); - for (j=slices; j>=0; j--) - glVertex3f(cost[j]*radf, sint[j]*radf, (GLfloat)height); - glEnd(); + fghSphere( radius, slices, stacks, TRUE ); + +} +#endif /* GL_ES_VERSION_2_0 */ - /* Do the stacks */ +#ifndef EGL_VERSION_1_0 +/* + * Draws a solid cone + */ +void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks ) +{ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCone" ); - z0 = 0; - z1 = zStep; + fghCone( base, height, slices, stacks, FALSE ); +} - for (i=1; i<=stacks; i++) - { - if (i==stacks) - z1 = (GLfloat)height; +/* + * Draws a wire cone + */ +void FGAPIENTRY glutWireCone( double base, double height, GLint slices, GLint stacks) +{ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCone" ); - glBegin(GL_TRIANGLE_STRIP); - for (j=0; j<=slices; j++ ) - { - glNormal3f(cost[j], sint[j], 0 ); - glVertex3f(cost[j]*radf, sint[j]*radf, z0 ); - glVertex3f(cost[j]*radf, sint[j]*radf, z1 ); - } - glEnd(); + fghCone( base, height, slices, stacks, TRUE ); +} - z0 = z1; z1 += zStep; - } - /* Release sin and cos tables */ +/* + * Draws a solid cylinder + */ +void FGAPIENTRY glutSolidCylinder(double radius, double height, GLint slices, GLint stacks) +{ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidCylinder" ); - free(sint); - free(cost); + fghCylinder( radius, height, slices, stacks, FALSE ); } /* @@ -1383,58 +1849,9 @@ void FGAPIENTRY glutSolidCylinder(double radius, double height, GLint slices, GL */ void FGAPIENTRY glutWireCylinder(double radius, double height, GLint slices, GLint stacks) { - int i,j; - - /* Step in z and radius as stacks are drawn. */ - GLfloat radf = (GLfloat)radius; - GLfloat z = 0; - const GLfloat zStep = (GLfloat)height / ( ( stacks > 0 ) ? stacks : 1 ); - - /* Pre-computed circle */ - - GLfloat *sint,*cost; - FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireCylinder" ); - fghCircleTable(&sint,&cost,-slices,FALSE); - - /* Draw the stacks... */ - - for (i=0; i<=stacks; i++) - { - if (i==stacks) - z = (GLfloat)height; - - glBegin(GL_LINE_LOOP); - - for( j=0; j