FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix previous commit, I made a confusion when merging my changes with the trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1223 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-03-31 21:43:06 +00:00
parent 6d98aacd0d
commit 3da140426f
1 changed files with 27 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
freeglut/freeglut/src/fg_geometry.c
View File

@ -48,72 +48,20 @@
#ifndef GL_ES_VERSION_2_0 #ifndef GL_ES_VERSION_2_0
static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, GLsizei numFaces, GLsizei numEdgePerFace) static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals, GLsizei numFaces, GLsizei numEdgePerFace)
{ {
GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; int i;
GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal;
if (fgState.HasOpenGL20 && (attribute_v_coord != -1 || attribute_v_normal != -1)) { glEnableClientState(GL_VERTEX_ARRAY);
GLuint vbo_coords, vbo_normals; glEnableClientState(GL_NORMAL_ARRAY);
GLuint numVertices = numFaces * numEdgePerFace;
glVertexPointer(3, GL_FLOAT, 0, vertices);
glNormalPointer(GL_FLOAT, 0, normals);
if (numVertices > 0 && attribute_v_coord != -1) { /* Draw per face (TODO: could use glMultiDrawArrays if available) */
fghGenBuffers(1, &vbo_coords); for (i=0; i<numFaces; i++)
fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords); glDrawArrays(GL_LINE_LOOP, i*numEdgePerFace, numEdgePerFace);
fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
vertices, GL_STATIC_DRAW);
}
if (numVertices > 0 && attribute_v_normal != -1) { glDisableClientState(GL_VERTEX_ARRAY);
fghGenBuffers(1, &vbo_normals); glDisableClientState(GL_NORMAL_ARRAY);
fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
normals, GL_STATIC_DRAW);
}
if (vbo_coords) {
fghEnableVertexAttribArray(attribute_v_coord);
fghBindBuffer(GL_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(GL_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
);
}
int i;
/* Draw per face (TODO: could use glMultiDrawArrays if available) */
for (i=0; i<numFaces; i++)
glDrawArrays(GL_LINE_LOOP, i*numEdgePerFace, numEdgePerFace);
if (vbo_coords != 0)
fghDisableVertexAttribArray(attribute_v_coord);
if (vbo_normals != 0)
fghDisableVertexAttribArray(attribute_v_normal);
if (vbo_coords != 0)
fghDeleteBuffers(1, &vbo_coords);
if (vbo_normals != 0)
fghDeleteBuffers(1, &vbo_normals);
}
} }
#endif #endif
@ -185,7 +133,6 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei numFaces, GLsizei numEdgePerFace) static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei numFaces, GLsizei numEdgePerFace)
{ {
#ifndef GL_ES_VERSION_2_0
GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord;
GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal; GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal;
@ -193,9 +140,10 @@ static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei num
/* User requested a 2.0 draw */ /* User requested a 2.0 draw */
fghDrawGeometryWire20(vertices, normals, numFaces, numEdgePerFace, fghDrawGeometryWire20(vertices, normals, numFaces, numEdgePerFace,
attribute_v_coord, attribute_v_normal); attribute_v_coord, attribute_v_normal);
#ifndef GL_ES_VERSION_2_0
else else
#endif
fghDrawGeometryWire11(vertices, normals, numFaces, numEdgePerFace); fghDrawGeometryWire11(vertices, normals, numFaces, numEdgePerFace);
#endif
} }
@ -213,78 +161,18 @@ static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei num
static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLubyte *vertIdxs, static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLubyte *vertIdxs,
GLsizei numVertices, GLsizei numVertIdxs) GLsizei numVertices, GLsizei numVertIdxs)
{ {
GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; glEnableClientState(GL_VERTEX_ARRAY);
GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal; glEnableClientState(GL_NORMAL_ARRAY);
if (fgState.HasOpenGL20 && (attribute_v_coord != -1 || attribute_v_normal != -1)) { glVertexPointer(3, GL_FLOAT, 0, vertices);
GLuint vbo_coords, vbo_normals, ibo_elements; glNormalPointer(GL_FLOAT, 0, normals);
if (vertIdxs == NULL)
glDrawArrays(GL_TRIANGLES, 0, numVertices);
else
glDrawElements(GL_TRIANGLES, numVertIdxs, GL_UNSIGNED_BYTE, vertIdxs);
if (numVertices > 0 && attribute_v_coord != -1) { glDisableClientState(GL_VERTEX_ARRAY);
fghGenBuffers(1, &vbo_coords); glDisableClientState(GL_NORMAL_ARRAY);
fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
vertices, GL_STATIC_DRAW);
}
if (numVertices > 0 && attribute_v_normal != -1) {
fghGenBuffers(1, &vbo_normals);
fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
normals, GL_STATIC_DRAW);
}
if (vertIdxs != NULL) {
fghGenBuffers(1, &ibo_elements);
fghBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_elements);
fghBufferData(GL_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]),
vertIdxs, GL_STATIC_DRAW);
}
if (vbo_coords) {
fghEnableVertexAttribArray(attribute_v_coord);
fghBindBuffer(GL_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(GL_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);
} else {
fghBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_elements);
glDrawElements(GL_TRIANGLES, numVertIdxs, GL_UNSIGNED_BYTE, 0);
}
if (vbo_coords != 0)
fghDisableVertexAttribArray(attribute_v_coord);
if (vbo_normals != 0)
fghDisableVertexAttribArray(attribute_v_normal);
if (vbo_coords != 0)
fghDeleteBuffers(1, &vbo_coords);
if (vbo_normals != 0)
fghDeleteBuffers(1, &vbo_normals);
if (ibo_elements != 0)
fghDeleteBuffers(1, &ibo_elements);
}
} }
#endif #endif
@ -365,7 +253,6 @@ static void fghDrawGeometrySolid20(GLfloat *vertices, GLfloat *normals, GLubyte
static void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLubyte *vertIdxs, static void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLubyte *vertIdxs,
GLsizei numVertices, GLsizei numVertIdxs) GLsizei numVertices, GLsizei numVertIdxs)
{ {
#ifndef GL_ES_VERSION_2_0
GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord; GLint attribute_v_coord = fgStructure.CurrentWindow->Window.attribute_v_coord;
GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal; GLint attribute_v_normal = fgStructure.CurrentWindow->Window.attribute_v_normal;
@ -374,10 +261,11 @@ static void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLubyte *v
fghDrawGeometrySolid20(vertices, normals, vertIdxs, fghDrawGeometrySolid20(vertices, normals, vertIdxs,
numVertices, numVertIdxs, numVertices, numVertIdxs,
attribute_v_coord, attribute_v_normal); attribute_v_coord, attribute_v_normal);
#ifndef GL_ES_VERSION_2_0
else else
#endif
fghDrawGeometrySolid11(vertices, normals, vertIdxs, fghDrawGeometrySolid11(vertices, normals, vertIdxs,
numVertices, numVertIdxs); numVertices, numVertIdxs);
#endif
} }
/* Shape decomposition to triangles /* Shape decomposition to triangles