X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fshapes%2Fshapes.c;h=3b1e98e58f9da52e2f6da740002e4b3d81b54d72;hb=b744f1401b990f642e96d4c65cc86eca5224efd1;hp=eb4544fcab230b5b7d000bd76c1ea7a10d842ae8;hpb=ba18146fd9c60026c42e2dac896222b781fb588b;p=freeglut

diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c
index eb4544f..3b1e98e 100644
--- a/progs/demos/shapes/shapes.c
+++ b/progs/demos/shapes/shapes.c
@@ -66,7 +66,7 @@ static int depth = 4;
 static double offset[ 3 ] = { 0, 0, 0 };
 static GLboolean show_info = GL_TRUE;
 static float ar;
-static int persProject = 1;
+static GLboolean persProject = GL_TRUE;
 
 /*
  * These one-liners draw particular objects, fetching appropriate
@@ -87,8 +87,6 @@ static void drawSolidIcosahedron(void)         { glutSolidIcosahedron ();
 static void drawWireIcosahedron(void)          { glutWireIcosahedron ();                         }
 static void drawSolidSierpinskiSponge(void)    { glutSolidSierpinskiSponge (depth, offset, orad);}  /* orad doubles as size input */
 static void drawWireSierpinskiSponge(void)     { glutWireSierpinskiSponge (depth, offset, orad); }  /* orad doubles as size input */
-static void drawSolidTeapot(void)              { glutSolidTeapot(orad);                          }  /* orad doubles as size input */
-static void drawWireTeapot(void)               { glutWireTeapot(orad);                           }  /* orad doubles as size input */
 static void drawSolidTorus(void)               { glutSolidTorus(irad,orad,slices,stacks);        }
 static void drawWireTorus(void)                { glutWireTorus (irad,orad,slices,stacks);        }
 static void drawSolidSphere(void)              { glutSolidSphere(orad,slices,stacks);            }  /* orad doubles as size input */
@@ -97,6 +95,24 @@ static void drawSolidCone(void)                { glutSolidCone(orad,orad,slices,
 static void drawWireCone(void)                 { glutWireCone(orad,orad,slices,stacks);          }  /* orad doubles as size input */
 static void drawSolidCylinder(void)            { glutSolidCylinder(orad,orad,slices,stacks);     }  /* orad doubles as size input */
 static void drawWireCylinder(void)             { glutWireCylinder(orad,orad,slices,stacks);      }  /* orad doubles as size input */
+static void drawSolidTeapot(void)
+{
+    /* per Glut manpage, it should be noted that the teapot is rendered
+     * with clockwise winding for front facing polygons...
+     */
+    glFrontFace(GL_CW);
+    glutSolidTeapot(orad);  /* orad doubles as size input */
+    glFrontFace(GL_CCW);
+}
+static void drawWireTeapot(void)
+{
+    /* per Glut manpage, it should be noted that the teapot is rendered
+     * with clockwise winding for front facing polygons...
+     */
+    glFrontFace(GL_CW);
+    glutWireTeapot(orad);  /* orad doubles as size input */
+    glFrontFace(GL_CCW);
+}
 
 #define RADIUS    1.0f