Adding Visual Studio 2008 solution and project files

[freeglut] / progs / demos / shapes / shapes.c

diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c
index bf7664a..da32e0b 100644 (file)
--- a/progs/demos/shapes/shapes.c
+++ b/progs/demos/shapes/shapes.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef WIN32
+#ifdef _MSC_VER
 /* DUMP MEMORY LEAKS */
 #include <crtdbg.h>
 #endif
@@ -94,9 +94,11 @@ static void drawSolidCone(void)                { glutSolidCone(1,1,slices,stacks
 static void drawWireCone(void)                 { glutWireCone(1,1,slices,stacks);              }
 static void drawSolidCylinder(void)            { glutSolidCylinder(1,1,slices,stacks);         }
 static void drawWireCylinder(void)             { glutWireCylinder(1,1,slices,stacks);          }
+
+#define RADIUS    1.0f
+
 static void drawSolidCuboctahedron(void)
 {
-#define RADIUS    1.0f
   glBegin( GL_TRIANGLES );
     glNormal3d( 0.577350269189, 0.577350269189, 0.577350269189); glVertex3d( RADIUS, RADIUS, 0.0 ); glVertex3d( 0.0, RADIUS, RADIUS ); glVertex3d( RADIUS, 0.0, RADIUS );
     glNormal3d( 0.577350269189, 0.577350269189,-0.577350269189); glVertex3d( RADIUS, RADIUS, 0.0 ); glVertex3d( RADIUS, 0.0,-RADIUS ); glVertex3d( 0.0, RADIUS,-RADIUS );
@@ -112,16 +114,36 @@ static void drawSolidCuboctahedron(void)
     glNormal3d( 1.0, 0.0, 0.0 ); glVertex3d( RADIUS, RADIUS, 0.0 ); glVertex3d( RADIUS, 0.0, RADIUS ); glVertex3d( RADIUS,-RADIUS, 0.0 ); glVertex3d( RADIUS, 0.0,-RADIUS );
     glNormal3d(-1.0, 0.0, 0.0 ); glVertex3d(-RADIUS, RADIUS, 0.0 ); glVertex3d(-RADIUS, 0.0,-RADIUS ); glVertex3d(-RADIUS,-RADIUS, 0.0 ); glVertex3d(-RADIUS, 0.0, RADIUS );
     glNormal3d( 0.0, 1.0, 0.0 ); glVertex3d( RADIUS, RADIUS, 0.0 ); glVertex3d( 0.0, RADIUS,-RADIUS ); glVertex3d(-RADIUS, RADIUS, 0.0 ); glVertex3d( 0.0, RADIUS, RADIUS );
-    glNormal3d( 0.0,-1.0, 0.0 ); glVertex3d(-RADIUS, RADIUS, 0.0 ); glVertex3d( 0.0,-RADIUS, RADIUS ); glVertex3d(-RADIUS,-RADIUS, 0.0 ); glVertex3d( 0.0,-RADIUS,-RADIUS );
+    glNormal3d( 0.0,-1.0, 0.0 ); glVertex3d( RADIUS,-RADIUS, 0.0 ); glVertex3d( 0.0,-RADIUS, RADIUS ); glVertex3d(-RADIUS,-RADIUS, 0.0 ); glVertex3d( 0.0,-RADIUS,-RADIUS );
     glNormal3d( 0.0, 0.0, 1.0 ); glVertex3d( RADIUS, 0.0, RADIUS ); glVertex3d( 0.0, RADIUS, RADIUS ); glVertex3d(-RADIUS, 0.0, RADIUS ); glVertex3d( 0.0,-RADIUS, RADIUS );
     glNormal3d( 0.0, 0.0,-1.0 ); glVertex3d( RADIUS, 0.0,-RADIUS ); glVertex3d( 0.0,-RADIUS,-RADIUS ); glVertex3d(-RADIUS, 0.0,-RADIUS ); glVertex3d( 0.0, RADIUS,-RADIUS );
   glEnd();
-#undef RADIUS
 }
+
 static void drawWireCuboctahedron(void)
 {
+  glBegin( GL_LINE_LOOP );
+    glNormal3d( 1.0, 0.0, 0.0 ); glVertex3d( RADIUS, RADIUS, 0.0 ); glVertex3d( RADIUS, 0.0, RADIUS ); glVertex3d( RADIUS,-RADIUS, 0.0 ); glVertex3d( RADIUS, 0.0,-RADIUS );
+  glEnd();
+  glBegin( GL_LINE_LOOP );
+    glNormal3d(-1.0, 0.0, 0.0 ); glVertex3d(-RADIUS, RADIUS, 0.0 ); glVertex3d(-RADIUS, 0.0,-RADIUS ); glVertex3d(-RADIUS,-RADIUS, 0.0 ); glVertex3d(-RADIUS, 0.0, RADIUS );
+  glEnd();
+  glBegin( GL_LINE_LOOP );
+    glNormal3d( 0.0, 1.0, 0.0 ); glVertex3d( RADIUS, RADIUS, 0.0 ); glVertex3d( 0.0, RADIUS,-RADIUS ); glVertex3d(-RADIUS, RADIUS, 0.0 ); glVertex3d( 0.0, RADIUS, RADIUS );
+  glEnd();
+  glBegin( GL_LINE_LOOP );
+    glNormal3d( 0.0,-1.0, 0.0 ); glVertex3d( RADIUS,-RADIUS, 0.0 ); glVertex3d( 0.0,-RADIUS, RADIUS ); glVertex3d(-RADIUS,-RADIUS, 0.0 ); glVertex3d( 0.0,-RADIUS,-RADIUS );
+  glEnd();
+  glBegin( GL_LINE_LOOP );
+    glNormal3d( 0.0, 0.0, 1.0 ); glVertex3d( RADIUS, 0.0, RADIUS ); glVertex3d( 0.0, RADIUS, RADIUS ); glVertex3d(-RADIUS, 0.0, RADIUS ); glVertex3d( 0.0,-RADIUS, RADIUS );
+  glEnd();
+  glBegin( GL_LINE_LOOP );
+    glNormal3d( 0.0, 0.0,-1.0 ); glVertex3d( RADIUS, 0.0,-RADIUS ); glVertex3d( 0.0,-RADIUS,-RADIUS ); glVertex3d(-RADIUS, 0.0,-RADIUS ); glVertex3d( 0.0, RADIUS,-RADIUS );
+  glEnd();
 }
 
+#undef RADIUS
+
 /*
  * This structure defines an entry in our function-table.
  */
@@ -158,15 +180,6 @@ static const entry table [] =
 
     Limitation: Cannot address pixels.
     Limitation: Renders in screen coords, not model coords.
-
-    \note Uses a fixed, 256-byte array for holding strings.
-          The best way around this would be to use vasprintf(),
-          but that is not available on WIN32, I believe.
-          Another alternative would be to write our own formatter
-          from scratch and emit the characters one at a time to
-          the GLUT bitmap single-character drawing routine.
-          We could also use vsnprintf(), but I'm not sure if
-          that is standard...
 */
 static void shapesPrintf (int row, int col, const char *fmt, ...)
 {
@@ -176,7 +189,11 @@ static void shapesPrintf (int row, int col, const char *fmt, ...)
     va_list args;
 
     va_start(args, fmt);
-    (void) vsprintf (buf, fmt, args);
+#if defined(WIN32) && !defined(__CYGWIN__)
+    (void) _vsnprintf (buf, sizeof(buf), fmt, args);
+#else
+    (void) vsnprintf (buf, sizeof(buf), fmt, args);
+#endif
     va_end(args);
 
     glGetIntegerv(GL_VIEWPORT,viewport);
@@ -347,7 +364,7 @@ main(int argc, char *argv[])
     glutInitWindowSize(640,480);
     glutInitWindowPosition(40,40);
     glutInit(&argc, argv);
-    glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
+    glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
 
     glutCreateWindow("OpenGLUT Shapes");
 
@@ -382,7 +399,7 @@ main(int argc, char *argv[])
 
     glutMainLoop();
 
-#ifdef WIN32
+#ifdef _MSC_VER
     /* DUMP MEMORY LEAK INFORMATION */
     _CrtDumpMemoryLeaks () ;
 #endif