John Fay: A bug fix re: behavior of the code when the user clicks the "x" to close...

[freeglut] / src / freeglut_geometry.c

diff --git a/src/freeglut_geometry.c b/src/freeglut_geometry.c
index 36f6a78..5468551 100644 (file)
--- a/src/freeglut_geometry.c
+++ b/src/freeglut_geometry.c
@@ -29,9 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
-
-
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*
@@ -199,7 +197,7 @@ void FGAPIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks)
         glVertex3d(0,0,radius);
 
         for (j=slices; j>=0; j--)
-        {       
+        {
             glNormal3d(cost1[j]*r1,        sint1[j]*r1,        z1       );
             glVertex3d(cost1[j]*r1*radius, sint1[j]*r1*radius, z1*radius);
         }
@@ -253,7 +251,7 @@ void FGAPIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks)
 }
 
 /*
- * Draws a solid sphere
+ * Draws a wire sphere
  */
 void FGAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
 {
@@ -265,7 +263,7 @@ void FGAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
     double x,y,z;
 
     /* Pre-computed circle */
-        
+
     double *sint1,*cost1;
     double *sint2,*cost2;
     circleTable(&sint1,&cost1,-slices  );
@@ -531,7 +529,7 @@ void FGAPIENTRY glutSolidCylinder(GLdouble radius, GLdouble height, GLint slices
 
 /*
  * Draws a wire cylinder
-   */
+ */
 void FGAPIENTRY glutWireCylinder(GLdouble radius, GLdouble height, GLint slices, GLint stacks)
 {
     int i,j;
@@ -586,7 +584,7 @@ void FGAPIENTRY glutWireCylinder(GLdouble radius, GLdouble height, GLint slices,
 }
 
 /*
- *
+ * Draws a wire torus
  */
 void FGAPIENTRY glutWireTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLint nSides, GLint nRings )
 {
@@ -664,7 +662,7 @@ void FGAPIENTRY glutWireTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLi
 }
 
 /*
- *
+ * Draws a solid torus
  */
 void FGAPIENTRY glutSolidTorus( GLdouble dInnerRadius, GLdouble dOuterRadius, GLint nSides, GLint nRings )
 {