X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=doc%2Ffreeglut_user_interface.html;h=397ebc5d084c44c885e53352567eea917028c995;hb=2fdc022726e934ebfb5c09cf4c40be25738f70c1;hp=df666b632171cf5d6b22b89a57b5218513e1d375;hpb=197163df226c7ea86693a71c0ea15f4f4add81d1;p=freeglut diff --git a/doc/freeglut_user_interface.html b/doc/freeglut_user_interface.html index df666b6..397ebc5 100644 --- a/doc/freeglut_user_interface.html +++ b/doc/freeglut_user_interface.html @@ -19,7 +19,7 @@
@@ -323,7 +323,7 @@ There was no way for an application to loop in GLUT for a while, possibly
as a subloop while a specific window was open, and then return to the calling
function. A new function, "glutMainLoopEvent", has been added
to allow this functionality. Another function, "glutLeaveMainLoop
-", has also been added to allow the application to tell freeglut to clean
+", has also been added to allow the application to tell freeglut to clean
up and close down.
-The following state variables may be queried with glutGet. +The following state variables may be queried with "glutGet". The returned value is an integer.
@@ -1120,7 +1120,7 @@ These queries do not depend on the current window.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,10 +1148,13 @@ 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.
+Changes From GLUT
+ +GLUT does not include this function. +
+-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: +Application programmers who are porting their GLUT programs to freeglut may continue +to include <GL/glut.h> in their programs. +Programs which use the freeglut-specific extensions to GLUT should include +<GL/freeglut.h>. One possible arrangement is as follows:
-#include <GL/glut.h> #ifdef FREEGLUT #include <GL/freeglut_ext.h> +#else +#include <GL/glut.h> #endif
-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 +#ifdef FREEGLUT_VERSION_2_0 + code specific to freeglut 2.0 or later here #endif
-In future releases, FREEGLUT_VERSION_1_5, FREEGLUT_VERSION_1_6, etc will +In future releases, FREEGLUT_VERSION_2_1, FREEGLUT_VERSION_2_2, etc will 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. @@ -1910,8 +1915,8 @@ 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"); +if (glutGet(GLUT_VERSION) < 20001) { + printf("Sorry, you need freeglut version 2.0.1 or later to run this program.\n"); exit(1); }