From 9ddfa4b5ee92933e7ff826ea6685cab44d7a04cd Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 19 Jun 2003 20:21:33 +0000 Subject: [PATCH] s/FreeGLUT/freeglut/ git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@86 7f0cb862-5218-0410-a997-914c9d46530a --- doc/freeglut_user_interface.html | 18 +++++++++--------- freeglut-1.3/freeglut_display.c | 2 +- freeglut-1.3/freeglut_ext.c | 2 +- freeglut-1.3/freeglut_internal.h | 2 +- freeglut-1.3/freeglut_main.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/freeglut_user_interface.html b/doc/freeglut_user_interface.html index df666b6..2363341 100644 --- a/doc/freeglut_user_interface.html +++ b/doc/freeglut_user_interface.html @@ -1120,7 +1120,7 @@ These queries do not depend on the current window.
  • GLUT_INIT_STATE - ?
  • GLUT_VERSION - Return value will be X*10000+Y*100+Z where X is the major version, Y is the minor version and Z is the patch level. - This query is only supported in FreeGLUT (version 1.3 or later). + This query is only supported in freeglut (version 1.3 or later). @@ -1134,7 +1134,7 @@ These queries do not depend on the current window.

    13.7  glutGetProcAddress

    glutGetProcAddress returns -a pointer to a named GL or FreeGLUT function.

    +a pointer to a named GL or freeglut function.

    Usage

    void *glutGetProcAddress ( const char *procName ) ;

    @@ -1148,7 +1148,7 @@ functions directly, that application will only link/run with an OpenGL library that supports the extension. By using a function pointer returned from glutGetProcAddress(), the application will avoid this hard dependency and be more portable and interoperate better with various implementations of OpenGL.

    -

    Both OpenGL functions and FreeGLUT +

    Both OpenGL functions and freeglut functions can be queried with this function.

    NOTE: this function is not supported in GLUT.

    @@ -1872,8 +1872,8 @@ GLUT State

    -FreeGLUT users should normally just include GL/glut.h in their programs. -Programs which need FreeGLUT-specific functions should also include +freeglut users should normally just include GL/glut.h in their programs. +Programs which need freeglut-specific functions should also include GL/freeglut_ext.h as follows:

    @@ -1885,12 +1885,12 @@ GL/freeglut_ext.h as follows:

    -Compile-time FreeGLUT version testing can be done as follows: +Compile-time freeglut version testing can be done as follows: 

     #ifdef FREEGLUT_VERSION_1_4
-  code specific to FreeGLUT 1.4 or later here
+  code specific to freeglut 1.4 or later here
 #endif
    @@ -1900,7 +1900,7 @@ be defined. This scheme mimics OpenGL conventions.

    -The FreeGLUT version can be queried at runtime by calling +The freeglut version can be queried at runtime by calling glutGet(GLUT_VERSION). The result will be X*10000+Y*100+Z where X is the major version, Y is the minor version and Z is the patch level. @@ -1911,7 +1911,7 @@ This may be used as follows: 

     if (glutGet(GLUT_VERSION) < 10300) {
-    printf("Sorry, you need FreeGLUT version 1.3.0 or later to run this program.\n");
+    printf("Sorry, you need freeglut version 1.3.0 or later to run this program.\n");
     exit(1);
 }
    diff --git a/freeglut-1.3/freeglut_display.c b/freeglut-1.3/freeglut_display.c index d6ce1cb..834cbc6 100644 --- a/freeglut-1.3/freeglut_display.c +++ b/freeglut-1.3/freeglut_display.c @@ -102,7 +102,7 @@ void FGAPIENTRY glutSwapBuffers( void ) else if (t - fgState.SwapTime > fgState.FPSInterval) { float time = 0.001 * (t - fgState.SwapTime); float fps = (float) fgState.SwapCount / time; - fprintf(stderr, "FreeGLUT: %d frames in %.2f seconds = %.2f FPS\n", + fprintf(stderr, "freeglut: %d frames in %.2f seconds = %.2f FPS\n", fgState.SwapCount, time, fps); fgState.SwapTime = t; fgState.SwapCount = 0; diff --git a/freeglut-1.3/freeglut_ext.c b/freeglut-1.3/freeglut_ext.c index a7897dd..f6a5dad 100644 --- a/freeglut-1.3/freeglut_ext.c +++ b/freeglut-1.3/freeglut_ext.c @@ -155,7 +155,7 @@ static struct name_address_pair glut_functions[] = { { "glutEnterGameMode", (void *) glutEnterGameMode }, { "glutLeaveGameMode", (void *) glutLeaveGameMode }, { "glutGameModeGet", (void *) glutGameModeGet }, - /* FreeGLUT extensions */ + /* freeglut extensions */ { "glutMainLoopEvent", (void *) glutMainLoopEvent }, { "glutLeaveMainLoop", (void *) glutLeaveMainLoop }, { "glutCloseFunc", (void *) glutCloseFunc }, diff --git a/freeglut-1.3/freeglut_internal.h b/freeglut-1.3/freeglut_internal.h index 7b8c9a5..5b9df43 100644 --- a/freeglut-1.3/freeglut_internal.h +++ b/freeglut-1.3/freeglut_internal.h @@ -411,7 +411,7 @@ struct tagSFG_MenuEntry }; /* - * A window, making part of FreeGLUT windows hierarchy. Should be kept portable. + * A window, making part of freeglut windows hierarchy. Should be kept portable. */ typedef struct tagSFG_Window SFG_Window; struct tagSFG_Window diff --git a/freeglut-1.3/freeglut_main.c b/freeglut-1.3/freeglut_main.c index af078a3..1c11f0d 100644 --- a/freeglut-1.3/freeglut_main.c +++ b/freeglut-1.3/freeglut_main.c @@ -447,7 +447,7 @@ static void fgCleanUpGlutsMess( void ) /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ /* - * Executes a single iteration in the FreeGLUT processing loop. + * Executes a single iteration in the freeglut processing loop. */ void FGAPIENTRY glutMainLoopEvent( void ) { @@ -1051,7 +1051,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) } /* - * Enters the FreeGLUT processing loop. Stays until the "ExecState" changes to "GLUT_EXEC_STATE_STOP". + * Enters the freeglut processing loop. Stays until the "ExecState" changes to "GLUT_EXEC_STATE_STOP". */ void FGAPIENTRY glutMainLoop( void ) { @@ -1126,7 +1126,7 @@ void FGAPIENTRY glutMainLoop( void ) } /* - * Leaves the FreeGLUT processing loop. + * Leaves the freeglut processing loop. */ void FGAPIENTRY glutLeaveMainLoop( void ) { -- 1.7.10.4