X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fshapes%2Fshapes.c;h=da32e0bed4af06573b092681cada83cb6ceace08;hb=f2582ac6c7d21fb7f96818f7c4f21d14f43cfa4d;hp=4928260e884cc6ce5d469f6e452ada3d23f1a0de;hpb=32ee0c1e2137eee3f3879c7a246efd0558be71ee;p=freeglut diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c index 4928260..da32e0b 100644 --- a/progs/demos/shapes/shapes.c +++ b/progs/demos/shapes/shapes.c @@ -12,6 +12,7 @@ Keys: - Esc   Quit - q Q   Quit + - i I   Show info - = +   Increase \a slices - - _   Decreate \a slices - , <   Decreate \a stacks @@ -40,8 +41,9 @@ #include #include -#ifdef WIN32 -#include // DUMP MEMORY LEAKS +#ifdef _MSC_VER +/* DUMP MEMORY LEAKS */ +#include #endif /* @@ -61,7 +63,7 @@ static double irad = .25; static double orad = 1.0; static int depth = 4; static double offset[ 3 ] = { 0, 0, 0 }; - +static GLboolean show_info = GL_TRUE; /* * These one-liners draw particular objects, fetching appropriate @@ -92,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 ); @@ -110,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. */ @@ -156,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, ...) { @@ -174,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); @@ -193,7 +212,7 @@ static void shapesPrintf (int row, int col, const char *fmt, ...) glutBitmapWidth(font, ' ') * col, - glutBitmapHeight(font) * (row+2) + viewport[3] ); - glutBitmapString (font, buf); + glutBitmapString (font, (unsigned char*)buf); glPopMatrix(); glMatrixMode(GL_MODELVIEW); @@ -226,8 +245,6 @@ static void display(void) glEnable(GL_LIGHTING); - printf ( "Shape %d slides %d stacks %d\n", function_index, slices, stacks ) ; - glColor3d(1,0,0); glPushMatrix(); @@ -247,13 +264,17 @@ static void display(void) glDisable(GL_LIGHTING); glColor3d(0.1,0.1,0.4); -/* shapesPrintf (1, 3, "Shape PgUp PgDn: %s", table [function_index].name); - shapesPrintf (2, 3, " Slices +-: %d Stacks <>: %d", slices, stacks); - shapesPrintf (3, 3, " nSides +-: %d nRings <>: %d", slices, stacks); - shapesPrintf (4, 3, " Depth (): %d", depth); - shapesPrintf (5, 3, " Outer radius Up Down : %f", orad); - shapesPrintf (6, 3, " Inner radius Left Right: %f", irad); -*/ + if( show_info ) { + shapesPrintf (1, 3, "Shape PgUp PgDn: %s", table [function_index].name); + shapesPrintf (2, 3, "Slices +-: %d Stacks <>: %d", slices, stacks); + shapesPrintf (3, 3, "nSides +-: %d nRings <>: %d", slices, stacks); + shapesPrintf (4, 3, "Depth (): %d", depth); + shapesPrintf (5, 3, "Outer radius Up Down : %f", orad); + shapesPrintf (6, 3, "Inner radius Left Right: %f", irad); + } else { + printf ( "Shape %d slides %d stacks %d\n", function_index, slices, stacks ) ; + } + glutSwapBuffers(); } @@ -267,6 +288,9 @@ key(unsigned char key, int x, int y) case 'Q': case 'q': glutLeaveMainLoop () ; break; + case 'I': + case 'i': show_info = ( show_info == GL_TRUE ) ? GL_FALSE : GL_TRUE; break; + case '=': case '+': slices++; break; @@ -340,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"); @@ -375,8 +399,9 @@ main(int argc, char *argv[]) glutMainLoop(); -#ifdef WIN32 - _CrtDumpMemoryLeaks () ; // DUMP MEMORY LEAK INFORMATION +#ifdef _MSC_VER + /* DUMP MEMORY LEAK INFORMATION */ + _CrtDumpMemoryLeaks () ; #endif return EXIT_SUCCESS;