| glut.h | glut.h | |||
|---|---|---|---|---|
| skipping to change at line 44 | skipping to change at line 44 | |||
| GLUT_API_VERSION=1 First public release of GLUT. 11/29/94 | GLUT_API_VERSION=1 First public release of GLUT. 11/29/94 | |||
| GLUT_API_VERSION=2 Added support for OpenGL/GLX multisampling, | GLUT_API_VERSION=2 Added support for OpenGL/GLX multisampling, | |||
| extension. Supports new input devices like tablet, dial and button | extension. Supports new input devices like tablet, dial and button | |||
| box, and Spaceball. Easy to query OpenGL extensions. | box, and Spaceball. Easy to query OpenGL extensions. | |||
| GLUT_API_VERSION=3 glutMenuStatus added. | GLUT_API_VERSION=3 glutMenuStatus added. | |||
| GLUT_API_VERSION=4 glutInitDisplayString, glutWarpPointer, | GLUT_API_VERSION=4 glutInitDisplayString, glutWarpPointer, | |||
| glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic | glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic | |||
| video resize subAPI (NOT FINALIZED!). | video resize subAPI, glutPostWindowRedisplay (NOT FINALIZED!). | |||
| **/ | **/ | |||
| #ifndef GLUT_API_VERSION /* allow this to be overriden */ | #ifndef GLUT_API_VERSION /* allow this to be overriden */ | |||
| #define GLUT_API_VERSION 3 | #define GLUT_API_VERSION 3 | |||
| #endif | #endif | |||
| /** | /** | |||
| GLUT implementation revision history: | GLUT implementation revision history: | |||
| GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT | GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT | |||
| API revisions and implementation revisions (ie, bug fixes). | API revisions and implementation revisions (ie, bug fixes). | |||
| skipping to change at line 74 | skipping to change at line 74 | |||
| GLUT_XLIB_IMPLEMENTATION=4 mjk's GLUT 2.3 images. 6/?/95 | GLUT_XLIB_IMPLEMENTATION=4 mjk's GLUT 2.3 images. 6/?/95 | |||
| GLUT_XLIB_IMPLEMENTATION=5 mjk's GLUT 3.0 images. 10/?/95 | GLUT_XLIB_IMPLEMENTATION=5 mjk's GLUT 3.0 images. 10/?/95 | |||
| GLUT_XLIB_IMPLEMENTATION=7 mjk's GLUT 3.1+ with glutWarpPoitner. 7/24/96 | GLUT_XLIB_IMPLEMENTATION=7 mjk's GLUT 3.1+ with glutWarpPoitner. 7/24/96 | |||
| GLUT_XLIB_IMPLEMENTATION=8 mjk's GLUT 3.1+ with glutWarpPoitner | GLUT_XLIB_IMPLEMENTATION=8 mjk's GLUT 3.1+ with glutWarpPoitner | |||
| and video resize. 1/3/97 | and video resize. 1/3/97 | |||
| GLUT_XLIB_IMPLEMENTATION=9 mjk's GLUT 3.4 release with early GLUT 4 routi | GLUT_XLIB_IMPLEMENTATION=9 mjk's GLUT 3.4 release with early GLUT 4 routin | |||
| nes. | es. | |||
| GLUT_XLIB_IMPLEMENTATION=11 Mesa 2.5's GLUT 3.6 release. | ||||
| GLUT_XLIB_IMPLEMENTATION=12 mjk's GLUT 3.6 release with early GLUT 4 routi | ||||
| nes + signal handling. | ||||
| **/ | **/ | |||
| #ifndef GLUT_XLIB_IMPLEMENTATION /* Allow this to be overriden. */ | #ifndef GLUT_XLIB_IMPLEMENTATION /* Allow this to be overriden. */ | |||
| #define GLUT_XLIB_IMPLEMENTATION 9 | #define GLUT_XLIB_IMPLEMENTATION 12 | |||
| #endif | #endif | |||
| /* Display mode bit masks. */ | /* Display mode bit masks. */ | |||
| #define GLUT_RGB 0 | #define GLUT_RGB 0 | |||
| #define GLUT_RGBA GLUT_RGB | #define GLUT_RGBA GLUT_RGB | |||
| #define GLUT_INDEX 1 | #define GLUT_INDEX 1 | |||
| #define GLUT_SINGLE 0 | #define GLUT_SINGLE 0 | |||
| #define GLUT_DOUBLE 2 | #define GLUT_DOUBLE 2 | |||
| #define GLUT_ACCUM 4 | #define GLUT_ACCUM 4 | |||
| #define GLUT_ALPHA 8 | #define GLUT_ALPHA 8 | |||
| skipping to change at line 342 | skipping to change at line 346 | |||
| #endif | #endif | |||
| extern void APIENTRY glutInitWindowPosition(int x, int y); | extern void APIENTRY glutInitWindowPosition(int x, int y); | |||
| extern void APIENTRY glutInitWindowSize(int width, int height); | extern void APIENTRY glutInitWindowSize(int width, int height); | |||
| extern void APIENTRY glutMainLoop(void); | extern void APIENTRY glutMainLoop(void); | |||
| /* GLUT window sub-API. */ | /* GLUT window sub-API. */ | |||
| extern int APIENTRY glutCreateWindow(const char *title); | extern int APIENTRY glutCreateWindow(const char *title); | |||
| extern int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, i nt height); | extern int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, i nt height); | |||
| extern void APIENTRY glutDestroyWindow(int win); | extern void APIENTRY glutDestroyWindow(int win); | |||
| extern void APIENTRY glutPostRedisplay(void); | extern void APIENTRY glutPostRedisplay(void); | |||
| #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) | ||||
| extern void APIENTRY glutPostWindowRedisplay(int win); | ||||
| #endif | ||||
| extern void APIENTRY glutSwapBuffers(void); | extern void APIENTRY glutSwapBuffers(void); | |||
| extern int APIENTRY glutGetWindow(void); | extern int APIENTRY glutGetWindow(void); | |||
| extern void APIENTRY glutSetWindow(int win); | extern void APIENTRY glutSetWindow(int win); | |||
| extern void APIENTRY glutSetWindowTitle(const char *title); | extern void APIENTRY glutSetWindowTitle(const char *title); | |||
| extern void APIENTRY glutSetIconTitle(const char *title); | extern void APIENTRY glutSetIconTitle(const char *title); | |||
| extern void APIENTRY glutPositionWindow(int x, int y); | extern void APIENTRY glutPositionWindow(int x, int y); | |||
| extern void APIENTRY glutReshapeWindow(int width, int height); | extern void APIENTRY glutReshapeWindow(int width, int height); | |||
| extern void APIENTRY glutPopWindow(void); | extern void APIENTRY glutPopWindow(void); | |||
| extern void APIENTRY glutPushWindow(void); | extern void APIENTRY glutPushWindow(void); | |||
| extern void APIENTRY glutIconifyWindow(void); | extern void APIENTRY glutIconifyWindow(void); | |||
| skipping to change at line 366 | skipping to change at line 373 | |||
| extern void APIENTRY glutSetCursor(int cursor); | extern void APIENTRY glutSetCursor(int cursor); | |||
| #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | |||
| extern void APIENTRY glutWarpPointer(int x, int y); | extern void APIENTRY glutWarpPointer(int x, int y); | |||
| #endif | #endif | |||
| /* GLUT overlay sub-API. */ | /* GLUT overlay sub-API. */ | |||
| extern void APIENTRY glutEstablishOverlay(void); | extern void APIENTRY glutEstablishOverlay(void); | |||
| extern void APIENTRY glutRemoveOverlay(void); | extern void APIENTRY glutRemoveOverlay(void); | |||
| extern void APIENTRY glutUseLayer(GLenum layer); | extern void APIENTRY glutUseLayer(GLenum layer); | |||
| extern void APIENTRY glutPostOverlayRedisplay(void); | extern void APIENTRY glutPostOverlayRedisplay(void); | |||
| #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) | ||||
| extern void APIENTRY glutPostWindowOverlayRedisplay(int win); | ||||
| #endif | ||||
| extern void APIENTRY glutShowOverlay(void); | extern void APIENTRY glutShowOverlay(void); | |||
| extern void APIENTRY glutHideOverlay(void); | extern void APIENTRY glutHideOverlay(void); | |||
| #endif | #endif | |||
| /* GLUT menu sub-API. */ | /* GLUT menu sub-API. */ | |||
| extern int APIENTRY glutCreateMenu(void (*)(int)); | extern int APIENTRY glutCreateMenu(void (*)(int)); | |||
| extern void APIENTRY glutDestroyMenu(int menu); | extern void APIENTRY glutDestroyMenu(int menu); | |||
| extern int APIENTRY glutGetMenu(void); | extern int APIENTRY glutGetMenu(void); | |||
| extern void APIENTRY glutSetMenu(int menu); | extern void APIENTRY glutSetMenu(int menu); | |||
| extern void APIENTRY glutAddMenuEntry(const char *label, int value); | extern void APIENTRY glutAddMenuEntry(const char *label, int value); | |||
| End of changes. 5 change blocks. | ||||
| 4 lines changed or deleted | 15 lines changed or added | |||