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

Need to also set glDisable(GL_CULL_FACE) when drawing wireframe to match what was

Browse Source 
produced before


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1167 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2012-03-17 02:11:49 +00:00
parent 445fd29338
commit 5818920c5c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ static void fghDrawGeometry(GLenum vertexMode, GLdouble *vertices, GLdouble *nor
{ {
glPushAttrib(GL_POLYGON_BIT); glPushAttrib(GL_POLYGON_BIT);
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
glDisable(GL_CULL_FACE);
} }
if (1) if (1)
@ -187,11 +188,6 @@ static void fghGenerateGeometry(int numFaces, int numEdgePerFace, GLdouble *vert
/* -- INTERNAL SETUP OF GEOMETRY --------------------------------------- */ /* -- INTERNAL SETUP OF GEOMETRY --------------------------------------- */
static unsigned int ipow (int x, unsigned int y)
{
return y==0? 1: y==1? x: (y%2? x: 1) * ipow(x*x, y/2);
}
/* -- stuff that can be cached -- */ /* -- stuff that can be cached -- */
/* Cache of input to glDrawArrays */ /* Cache of input to glDrawArrays */
#define DECLARE_SHAPE_CACHE(name,nameICaps,nameCaps)\ #define DECLARE_SHAPE_CACHE(name,nameICaps,nameCaps)\
@ -571,6 +567,11 @@ static GLubyte tetrahedron_vi[TETRAHEDRON_VERT_PER_OBJ] =
DECLARE_SHAPE_CACHE(tetrahedron,Tetrahedron,TETRAHEDRON); DECLARE_SHAPE_CACHE(tetrahedron,Tetrahedron,TETRAHEDRON);
/* -- Sierpinski Sponge -- */ /* -- Sierpinski Sponge -- */
static unsigned int ipow (int x, unsigned int y)
{
return y==0? 1: y==1? x: (y%2? x: 1) * ipow(x*x, y/2);
}
static void fghSierpinskiSpongeGenerate ( int numLevels, GLdouble offset[3], GLdouble scale, GLdouble* vertices, GLdouble* normals ) static void fghSierpinskiSpongeGenerate ( int numLevels, GLdouble offset[3], GLdouble scale, GLdouble* vertices, GLdouble* normals )
{ {
int i, j; int i, j;