s/FreeGLUT/freeglut/

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@86 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
brianp 2003-06-19 20:21:33 +00:00
parent 80f65c1d51
commit e5649d1101
5 changed files with 15 additions and 15 deletions

View File

@ -1120,7 +1120,7 @@ These queries do not depend on the current window.
<li>GLUT_INIT_STATE - ? <li>GLUT_INIT_STATE - ?
<li>GLUT_VERSION - Return value will be X*10000+Y*100+Z where X is the <li>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. 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).
</ul> </ul>
@ -1134,7 +1134,7 @@ These queries do not depend on the current window.
<h2> 13.7&nbsp; glutGetProcAddress</h2> <h2> 13.7&nbsp; glutGetProcAddress</h2>
<p><tt>glutGetProcAddress</tt> returns <p><tt>glutGetProcAddress</tt> returns
a pointer to a named GL or FreeGLUT function. </p> a pointer to a named GL or freeglut function. </p>
<p><b>Usage</b></p> <p><b>Usage</b></p>
<p><tt>void *glutGetProcAddress ( const <p><tt>void *glutGetProcAddress ( const
char *procName ) ;</tt></p> char *procName ) ;</tt></p>
@ -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(), 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 the application will avoid this hard dependency and be more portable and interoperate
better with various implementations of OpenGL. </p> better with various implementations of OpenGL. </p>
<p> Both OpenGL functions and FreeGLUT <p> Both OpenGL functions and freeglut
functions can be queried with this function. </p> functions can be queried with this function. </p>
<p><b>NOTE</b>: this function is not supported <p><b>NOTE</b>: this function is not supported
in GLUT. </p> in GLUT. </p>
@ -1872,8 +1872,8 @@ GLUT State</h1>
<p> <p>
FreeGLUT users should normally just include GL/glut.h in their programs. freeglut users should normally just include GL/glut.h in their programs.
Programs which need FreeGLUT-specific functions should also include Programs which need freeglut-specific functions should also include
GL/freeglut_ext.h as follows: GL/freeglut_ext.h as follows:
</p> </p>
@ -1885,12 +1885,12 @@ GL/freeglut_ext.h as follows:
</pre> </pre>
<p> <p>
Compile-time FreeGLUT version testing can be done as follows: Compile-time freeglut version testing can be done as follows:
</p> </p>
<pre> <pre>
#ifdef FREEGLUT_VERSION_1_4 #ifdef FREEGLUT_VERSION_1_4
code specific to FreeGLUT 1.4 or later here code specific to freeglut 1.4 or later here
#endif #endif
</pre> </pre>
@ -1900,7 +1900,7 @@ be defined. This scheme mimics OpenGL conventions.
</p> </p>
<p> <p>
The FreeGLUT version can be queried at runtime by calling The freeglut version can be queried at runtime by calling
glutGet(GLUT_VERSION). glutGet(GLUT_VERSION).
The result will be X*10000+Y*100+Z where X is the major version, Y is the 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. minor version and Z is the patch level.
@ -1911,7 +1911,7 @@ This may be used as follows:
<pre> <pre>
if (glutGet(GLUT_VERSION) < 10300) { 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); exit(1);
} }
</pre> </pre>

View File

@ -102,7 +102,7 @@ void FGAPIENTRY glutSwapBuffers( void )
else if (t - fgState.SwapTime > fgState.FPSInterval) { else if (t - fgState.SwapTime > fgState.FPSInterval) {
float time = 0.001 * (t - fgState.SwapTime); float time = 0.001 * (t - fgState.SwapTime);
float fps = (float) fgState.SwapCount / time; 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.SwapCount, time, fps);
fgState.SwapTime = t; fgState.SwapTime = t;
fgState.SwapCount = 0; fgState.SwapCount = 0;

View File

@ -155,7 +155,7 @@ static struct name_address_pair glut_functions[] = {
{ "glutEnterGameMode", (void *) glutEnterGameMode }, { "glutEnterGameMode", (void *) glutEnterGameMode },
{ "glutLeaveGameMode", (void *) glutLeaveGameMode }, { "glutLeaveGameMode", (void *) glutLeaveGameMode },
{ "glutGameModeGet", (void *) glutGameModeGet }, { "glutGameModeGet", (void *) glutGameModeGet },
/* FreeGLUT extensions */ /* freeglut extensions */
{ "glutMainLoopEvent", (void *) glutMainLoopEvent }, { "glutMainLoopEvent", (void *) glutMainLoopEvent },
{ "glutLeaveMainLoop", (void *) glutLeaveMainLoop }, { "glutLeaveMainLoop", (void *) glutLeaveMainLoop },
{ "glutCloseFunc", (void *) glutCloseFunc }, { "glutCloseFunc", (void *) glutCloseFunc },

View File

@ -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; typedef struct tagSFG_Window SFG_Window;
struct tagSFG_Window struct tagSFG_Window

View File

@ -447,7 +447,7 @@ static void fgCleanUpGlutsMess( void )
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */ /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
/* /*
* Executes a single iteration in the FreeGLUT processing loop. * Executes a single iteration in the freeglut processing loop.
*/ */
void FGAPIENTRY glutMainLoopEvent( void ) 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 ) 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 ) void FGAPIENTRY glutLeaveMainLoop( void )
{ {