From: Sylvain Beucler Date: Sat, 21 Apr 2012 15:02:00 +0000 (+0000) Subject: Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8) X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=a28bca657173033061d5af4fc9846a32597700c0;hp=bdd49e471b6885768dfe49a8d68d60d88db491c1;p=freeglut Really fix tabs->space (Dee's replacement was assuming 4-spaces tabs instead of 8) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1250 7f0cb862-5218-0410-a997-914c9d46530a --- diff --git a/src/fg_geometry.c b/src/fg_geometry.c index 98bc6db..96c712c 100644 --- a/src/fg_geometry.c +++ b/src/fg_geometry.c @@ -68,7 +68,7 @@ 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 numVertices = numFaces * numEdgePerFace; @@ -79,14 +79,14 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n fghGenBuffers(1, &vbo_coords); fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords); fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]), - vertices, FGH_STATIC_DRAW); + 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); + normals, FGH_STATIC_DRAW); } if (vbo_coords) { @@ -117,18 +117,18 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n /* 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); + 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( + 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 @@ -218,9 +218,9 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLubyte }; if (vbo_normals) { - fghEnableVertexAttribArray(attribute_v_normal); - fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals); - fghVertexAttribPointer( + 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 @@ -231,23 +231,23 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLubyte }; 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); } 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, @@ -258,13 +258,13 @@ static void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLubyte *v 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 } @@ -950,11 +950,11 @@ static void fghCube( GLfloat dSize, GLboolean useWireMode ) vertices = cube_verts; if (useWireMode) - fghDrawGeometryWire (vertices, cube_norms, - CUBE_NUM_FACES, CUBE_NUM_EDGE_PER_FACE); + fghDrawGeometryWire(vertices, cube_norms, + CUBE_NUM_FACES, CUBE_NUM_EDGE_PER_FACE); else fghDrawGeometrySolid(vertices, cube_norms, cube_vertIdxs, - CUBE_VERT_PER_OBJ, CUBE_VERT_PER_OBJ_TRI); + CUBE_VERT_PER_OBJ, CUBE_VERT_PER_OBJ_TRI); if (dSize!=1.f) /* cleanup allocated memory */ @@ -1010,7 +1010,7 @@ static void fghSphere( double radius, GLint slices, GLint stacks, GLboolean useW GLfloat *vertices, *normals; if (slices * stacks > 65535) - fgWarning("fghSphere: too many slices or stacks requested, indices will wrap"); + fgWarning("fghSphere: too many slices or stacks requested, indices will wrap"); /* Generate vertices and normals */ fghGenerateSphere((GLfloat)radius,slices,stacks,&vertices,&normals,&nVert);