| glut.h | glut.h | |||
|---|---|---|---|---|
| skipping to change at line 34 | skipping to change at line 34 | |||
| * 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. | |||
| * | * | |||
| */ | */ | |||
| #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 4 /* VERSION 4 API NOT FINALIZED */ | |||
| #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). | |||
| * | * | |||
| * GLUT_XLIB_IMPLEMENTATION=1 mjk's first public release of | * GLUT_XLIB_IMPLEMENTATION=1 mjk's first public release of | |||
| * GLUT Xlib-based implementation. 11/29/94 | * GLUT Xlib-based implementation. 11/29/94 | |||
| skipping to change at line 56 | skipping to change at line 56 | |||
| * GLUT_XLIB_IMPLEMENTATION=2 mjk's second public release of | * GLUT_XLIB_IMPLEMENTATION=2 mjk's second public release of | |||
| * GLUT Xlib-based implementation providing GLUT version 2 | * GLUT Xlib-based implementation providing GLUT version 2 | |||
| * interfaces. | * interfaces. | |||
| * | * | |||
| * GLUT_XLIB_IMPLEMENTATION=3 mjk's GLUT 2.2 images. 4/17/95 | * GLUT_XLIB_IMPLEMENTATION=3 mjk's GLUT 2.2 images. 4/17/95 | |||
| * | * | |||
| * 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 | ||||
| */ | */ | |||
| #ifndef GLUT_XLIB_IMPLEMENTATION /* allow this to be overriden */ | #ifndef GLUT_XLIB_IMPLEMENTATION /* allow this to be overriden */ | |||
| #define GLUT_XLIB_IMPLEMENTATION 5 | #define GLUT_XLIB_IMPLEMENTATION 7 | |||
| #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 298 | skipping to change at line 299 | |||
| extern void glutPositionWindow(int x, int y); | extern void glutPositionWindow(int x, int y); | |||
| extern void glutReshapeWindow(int width, int height); | extern void glutReshapeWindow(int width, int height); | |||
| extern void glutPopWindow(void); | extern void glutPopWindow(void); | |||
| extern void glutPushWindow(void); | extern void glutPushWindow(void); | |||
| extern void glutIconifyWindow(void); | extern void glutIconifyWindow(void); | |||
| extern void glutShowWindow(void); | extern void glutShowWindow(void); | |||
| extern void glutHideWindow(void); | extern void glutHideWindow(void); | |||
| #if (GLUT_API_VERSION >= 3) | #if (GLUT_API_VERSION >= 3) | |||
| extern void glutFullScreen(void); | extern void glutFullScreen(void); | |||
| extern void glutSetCursor(int cursor); | extern void glutSetCursor(int cursor); | |||
| #if (GLUT_API_VERSION >= 4) | ||||
| extern void glutWarpPointer(int x, int y); | ||||
| #endif | ||||
| /* GLUT overlay sub-API */ | /* GLUT overlay sub-API */ | |||
| extern void glutEstablishOverlay(void); | extern void glutEstablishOverlay(void); | |||
| extern void glutRemoveOverlay(void); | extern void glutRemoveOverlay(void); | |||
| extern void glutUseLayer(GLenum layer); | extern void glutUseLayer(GLenum layer); | |||
| extern void glutPostOverlayRedisplay(void); | extern void glutPostOverlayRedisplay(void); | |||
| extern void glutShowOverlay(void); | extern void glutShowOverlay(void); | |||
| extern void glutHideOverlay(void); | extern void glutHideOverlay(void); | |||
| #endif | #endif | |||
| End of changes. 4 change blocks. | ||||
| 2 lines changed or deleted | 6 lines changed or added | |||