X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_state.c;h=9ddfdd9186de9116f38fc4d963dfe079050f9081;hb=4a451851ec51ea7c3b79534fa5faebadceedf4df;hp=4f369d4e2738f25e62e6b67ede7979393ef8b31d;hpb=ea5dc8a10beb55cd972c34d6b531158101b6773f;p=freeglut diff --git a/src/fg_state.c b/src/fg_state.c index 4f369d4..9ddfdd9 100644 --- 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; @@ -136,6 +136,12 @@ int FGAPIENTRY glutGet( GLenum eWhat ) case GLUT_INIT_STATE: return fgState.Initialised; + /* Although internally the time store is 64bits wide, the return value + * here still wraps every 49.7 days. Integer overflows cancel however + * when subtracting an initial start time, unless the total time exceeds + * 32-bit, so you can still work with this. + * XXX: a glutGet64 to return the time might be an idea... + */ case GLUT_ELAPSED_TIME: return (int) fgElapsedTime(); } @@ -210,7 +216,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;