GLUT_GEOMETRY_VISUALIZE_NORMALS is a better name than GLUT_OBJECTS_VISUALIZE_NORMALS

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1407 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h
index da6c7ee..b5dabf4 100644 (file)
--- a/include/GL/freeglut_ext.h
+++ b/include/GL/freeglut_ext.h
@@ -86,7 +86,7 @@
 
 #define  GLUT_SKIP_STALE_MOTION_EVENTS      0x0204
 
-#define  GLUT_OBJECTS_VISUALIZE_NORMALS     0x0205
+#define  GLUT_GEOMETRY_VISUALIZE_NORMALS    0x0205
 
 /*
  * New tokens for glutInitDisplayMode.

diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c
index a9e43a6..b22ee37 100644 (file)
--- a/progs/demos/shapes/shapes.c
+++ b/progs/demos/shapes/shapes.c
@@ -612,7 +612,7 @@ static void display(void)
 
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    glutSetOption(GLUT_OBJECTS_VISUALIZE_NORMALS,visNormals);   /* Normals visualized or not? */
+    glutSetOption(GLUT_GEOMETRY_VISUALIZE_NORMALS,visNormals);  /* Normals visualized or not? */
 
     if (useShader && !shaderReady)
         initShader();

diff --git a/src/fg_state.c b/src/fg_state.c
index 4f369d4..5f8c08a 100644 (file)
--- a/src/fg_state.c
+++ b/src/fg_state.c
@@ -115,7 +115,7 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
       fgState.SkipStaleMotion = value;
       break;
 
-    case GLUT_OBJECTS_VISUALIZE_NORMALS:
+    case GLUT_GEOMETRY_VISUALIZE_NORMALS:
       if( fgStructure.CurrentWindow != NULL )
         fgStructure.CurrentWindow->State.VisualizeNormals = value;
       break;
@@ -210,7 +210,7 @@ int FGAPIENTRY glutGet( GLenum eWhat )
     case GLUT_SKIP_STALE_MOTION_EVENTS:
       return fgState.SkipStaleMotion;
 
-    case GLUT_OBJECTS_VISUALIZE_NORMALS:
+    case GLUT_GEOMETRY_VISUALIZE_NORMALS:
       if( fgStructure.CurrentWindow == NULL )
         return GL_FALSE;
       return fgStructure.CurrentWindow->State.VisualizeNormals;