| glut.h | glut.h | |||
|---|---|---|---|---|
| skipping to change at line 32 | skipping to change at line 32 | |||
| or additions). | or additions). | |||
| 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, | ||||
| glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic | ||||
| video resize subAPI (NOT FINALIZED!). | ||||
| **/ | **/ | |||
| #ifndef GLUT_API_VERSION /* allow this to be overriden */ | #ifndef GLUT_API_VERSION /* allow this to be overriden */ | |||
| #define GLUT_API_VERSION 4 /* VERSION 4 API NOT FINALIZED */ | #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). | |||
| 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 60 | skipping to change at line 63 | |||
| 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 | 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 | ||||
| nes. | ||||
| **/ | **/ | |||
| #ifndef GLUT_XLIB_IMPLEMENTATION /* Allow this to be overriden. */ | #ifndef GLUT_XLIB_IMPLEMENTATION /* Allow this to be overriden. */ | |||
| #define GLUT_XLIB_IMPLEMENTATION 7 | #define GLUT_XLIB_IMPLEMENTATION 9 | |||
| #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 239 | skipping to change at line 244 | |||
| #if (GLUT_API_VERSION >= 3) | #if (GLUT_API_VERSION >= 3) | |||
| /* glutLayerGet parameters. */ | /* glutLayerGet parameters. */ | |||
| #define GLUT_OVERLAY_POSSIBLE 800 | #define GLUT_OVERLAY_POSSIBLE 800 | |||
| #define GLUT_LAYER_IN_USE 801 | #define GLUT_LAYER_IN_USE 801 | |||
| #define GLUT_HAS_OVERLAY 802 | #define GLUT_HAS_OVERLAY 802 | |||
| #define GLUT_TRANSPARENT_INDEX 803 | #define GLUT_TRANSPARENT_INDEX 803 | |||
| #define GLUT_NORMAL_DAMAGED 804 | #define GLUT_NORMAL_DAMAGED 804 | |||
| #define GLUT_OVERLAY_DAMAGED 805 | #define GLUT_OVERLAY_DAMAGED 805 | |||
| #if (GLUT_API_VERSION >= 4) | #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | |||
| /* glutVideoResizeGet parameters. */ | /* glutVideoResizeGet parameters. */ | |||
| #define GLUT_VIDEO_RESIZE_POSSIBLE 900 | #define GLUT_VIDEO_RESIZE_POSSIBLE 900 | |||
| #define GLUT_VIDEO_RESIZE_IN_USE 901 | #define GLUT_VIDEO_RESIZE_IN_USE 901 | |||
| #define GLUT_VIDEO_RESIZE_X_DELTA 902 | #define GLUT_VIDEO_RESIZE_X_DELTA 902 | |||
| #define GLUT_VIDEO_RESIZE_Y_DELTA 903 | #define GLUT_VIDEO_RESIZE_Y_DELTA 903 | |||
| #define GLUT_VIDEO_RESIZE_WIDTH_DELTA 904 | #define GLUT_VIDEO_RESIZE_WIDTH_DELTA 904 | |||
| #define GLUT_VIDEO_RESIZE_HEIGHT_DELTA 905 | #define GLUT_VIDEO_RESIZE_HEIGHT_DELTA 905 | |||
| #define GLUT_VIDEO_RESIZE_X 906 | #define GLUT_VIDEO_RESIZE_X 906 | |||
| #define GLUT_VIDEO_RESIZE_Y 907 | #define GLUT_VIDEO_RESIZE_Y 907 | |||
| #define GLUT_VIDEO_RESIZE_WIDTH 908 | #define GLUT_VIDEO_RESIZE_WIDTH 908 | |||
| skipping to change at line 298 | skipping to change at line 303 | |||
| #define GLUT_CURSOR_INHERIT 100 | #define GLUT_CURSOR_INHERIT 100 | |||
| /* Blank cursor. */ | /* Blank cursor. */ | |||
| #define GLUT_CURSOR_NONE 101 | #define GLUT_CURSOR_NONE 101 | |||
| /* Fullscreen crosshair (if available). */ | /* Fullscreen crosshair (if available). */ | |||
| #define GLUT_CURSOR_FULL_CROSSHAIR 102 | #define GLUT_CURSOR_FULL_CROSSHAIR 102 | |||
| #endif | #endif | |||
| /* GLUT initialization sub-API. */ | /* GLUT initialization sub-API. */ | |||
| extern void glutInit(int *argcp, char **argv); | extern void glutInit(int *argcp, char **argv); | |||
| extern void glutInitDisplayMode(unsigned int mode); | extern void glutInitDisplayMode(unsigned int mode); | |||
| #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | ||||
| extern void glutInitDisplayString(const char *string); | ||||
| #endif | ||||
| extern void glutInitWindowPosition(int x, int y); | extern void glutInitWindowPosition(int x, int y); | |||
| extern void glutInitWindowSize(int width, int height); | extern void glutInitWindowSize(int width, int height); | |||
| extern void glutMainLoop(void); | extern void glutMainLoop(void); | |||
| /* GLUT window sub-API. */ | /* GLUT window sub-API. */ | |||
| extern int glutCreateWindow(char *title); | extern int glutCreateWindow(const char *title); | |||
| extern int glutCreateSubWindow(int win, int x, int y, int width, int height ); | extern int glutCreateSubWindow(int win, int x, int y, int width, int height ); | |||
| extern void glutDestroyWindow(int win); | extern void glutDestroyWindow(int win); | |||
| extern void glutPostRedisplay(void); | extern void glutPostRedisplay(void); | |||
| extern void glutSwapBuffers(void); | extern void glutSwapBuffers(void); | |||
| extern int glutGetWindow(void); | extern int glutGetWindow(void); | |||
| extern void glutSetWindow(int win); | extern void glutSetWindow(int win); | |||
| extern void glutSetWindowTitle(char *title); | extern void glutSetWindowTitle(const char *title); | |||
| extern void glutSetIconTitle(char *title); | extern void glutSetIconTitle(const char *title); | |||
| 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) | #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | |||
| extern void glutWarpPointer(int x, int y); | extern void glutWarpPointer(int x, int y); | |||
| #endif | #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 | |||
| /* GLUT menu sub-API. */ | /* GLUT menu sub-API. */ | |||
| extern int glutCreateMenu(void (*)(int)); | extern int glutCreateMenu(void (*)(int)); | |||
| extern void glutDestroyMenu(int menu); | extern void glutDestroyMenu(int menu); | |||
| extern int glutGetMenu(void); | extern int glutGetMenu(void); | |||
| extern void glutSetMenu(int menu); | extern void glutSetMenu(int menu); | |||
| extern void glutAddMenuEntry(char *label, int value); | extern void glutAddMenuEntry(const char *label, int value); | |||
| extern void glutAddSubMenu(char *label, int submenu); | extern void glutAddSubMenu(const char *label, int submenu); | |||
| extern void glutChangeToMenuEntry(int item, char *label, int value); | extern void glutChangeToMenuEntry(int item, const char *label, int value); | |||
| extern void glutChangeToSubMenu(int item, char *label, int submenu); | extern void glutChangeToSubMenu(int item, const char *label, int submenu); | |||
| extern void glutRemoveMenuItem(int item); | extern void glutRemoveMenuItem(int item); | |||
| extern void glutAttachMenu(int button); | extern void glutAttachMenu(int button); | |||
| extern void glutDetachMenu(int button); | extern void glutDetachMenu(int button); | |||
| /* GLUT callback sub-API. */ | /* GLUT callback sub-API. */ | |||
| extern void glutDisplayFunc(void (*)(void)); | extern void glutDisplayFunc(void (*)(void)); | |||
| extern void glutReshapeFunc(void (*)(int width, int height)); | extern void glutReshapeFunc(void (*)(int width, int height)); | |||
| extern void glutKeyboardFunc(void (*)(unsigned char key, int x, int y)); | extern void glutKeyboardFunc(void (*)(unsigned char key, int x, int y)); | |||
| extern void glutMouseFunc(void (*)(int button, int state, int x, int y)); | extern void glutMouseFunc(void (*)(int button, int state, int x, int y)); | |||
| extern void glutMotionFunc(void (*)(int x, int y)); | extern void glutMotionFunc(void (*)(int x, int y)); | |||
| skipping to change at line 372 | skipping to change at line 380 | |||
| extern void glutSpaceballMotionFunc(void (*)(int x, int y, int z)); | extern void glutSpaceballMotionFunc(void (*)(int x, int y, int z)); | |||
| extern void glutSpaceballRotateFunc(void (*)(int x, int y, int z)); | extern void glutSpaceballRotateFunc(void (*)(int x, int y, int z)); | |||
| extern void glutSpaceballButtonFunc(void (*)(int button, int state)); | extern void glutSpaceballButtonFunc(void (*)(int button, int state)); | |||
| extern void glutButtonBoxFunc(void (*)(int button, int state)); | extern void glutButtonBoxFunc(void (*)(int button, int state)); | |||
| extern void glutDialsFunc(void (*)(int dial, int value)); | extern void glutDialsFunc(void (*)(int dial, int value)); | |||
| extern void glutTabletMotionFunc(void (*)(int x, int y)); | extern void glutTabletMotionFunc(void (*)(int x, int y)); | |||
| extern void glutTabletButtonFunc(void (*)(int button, int state, int x, int y)); | extern void glutTabletButtonFunc(void (*)(int button, int state, int x, int y)); | |||
| #if (GLUT_API_VERSION >= 3) | #if (GLUT_API_VERSION >= 3) | |||
| extern void glutMenuStatusFunc(void (*)(int status, int x, int y)); | extern void glutMenuStatusFunc(void (*)(int status, int x, int y)); | |||
| extern void glutOverlayDisplayFunc(void (*)(void)); | extern void glutOverlayDisplayFunc(void (*)(void)); | |||
| #if (GLUT_API_VERSION >= 4) | #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | |||
| extern void glutWindowStatusFunc(void (*)(int state)); | extern void glutWindowStatusFunc(void (*)(int state)); | |||
| #endif | #endif | |||
| #endif | #endif | |||
| #endif | #endif | |||
| /* GLUT color index sub-API. */ | /* GLUT color index sub-API. */ | |||
| extern void glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue); | extern void glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue); | |||
| extern GLfloat glutGetColor(int ndx, int component); | extern GLfloat glutGetColor(int ndx, int component); | |||
| extern void glutCopyColormap(int win); | extern void glutCopyColormap(int win); | |||
| /* GLUT state retrieval sub-API. */ | /* GLUT state retrieval sub-API. */ | |||
| extern int glutGet(GLenum type); | extern int glutGet(GLenum type); | |||
| extern int glutDeviceGet(GLenum type); | extern int glutDeviceGet(GLenum type); | |||
| #if (GLUT_API_VERSION >= 2) | #if (GLUT_API_VERSION >= 2) | |||
| /* GLUT extension support sub-API */ | /* GLUT extension support sub-API */ | |||
| extern int glutExtensionSupported(char *name); | extern int glutExtensionSupported(const char *name); | |||
| #endif | #endif | |||
| #if (GLUT_API_VERSION >= 3) | #if (GLUT_API_VERSION >= 3) | |||
| extern int glutGetModifiers(void); | extern int glutGetModifiers(void); | |||
| extern int glutLayerGet(GLenum type); | extern int glutLayerGet(GLenum type); | |||
| #endif | #endif | |||
| /* GLUT font sub-API */ | /* GLUT font sub-API */ | |||
| extern void glutBitmapCharacter(void *font, int character); | extern void glutBitmapCharacter(void *font, int character); | |||
| extern int glutBitmapWidth(void *font, int character); | extern int glutBitmapWidth(void *font, int character); | |||
| extern void glutStrokeCharacter(void *font, int character); | extern void glutStrokeCharacter(void *font, int character); | |||
| extern int glutStrokeWidth(void *font, int character); | extern int glutStrokeWidth(void *font, int character); | |||
| #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | ||||
| extern int glutBitmapLength(void *font, const unsigned char *string); | ||||
| extern int glutStrokeLength(void *font, const unsigned char *string); | ||||
| #endif | ||||
| /* GLUT pre-built models sub-API */ | /* GLUT pre-built models sub-API */ | |||
| extern void glutWireSphere(GLdouble radius, GLint slices, GLint stacks); | extern void glutWireSphere(GLdouble radius, GLint slices, GLint stacks); | |||
| extern void glutSolidSphere(GLdouble radius, GLint slices, GLint stacks); | extern void glutSolidSphere(GLdouble radius, GLint slices, GLint stacks); | |||
| extern void glutWireCone(GLdouble base, GLdouble height, GLint slices, GLin t stacks); | extern void glutWireCone(GLdouble base, GLdouble height, GLint slices, GLin t stacks); | |||
| extern void glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLi nt stacks); | extern void glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLi nt stacks); | |||
| extern void glutWireCube(GLdouble size); | extern void glutWireCube(GLdouble size); | |||
| extern void glutSolidCube(GLdouble size); | extern void glutSolidCube(GLdouble size); | |||
| extern void glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); | extern void glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); | |||
| extern void glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLin t sides, GLint rings); | extern void glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLin t sides, GLint rings); | |||
| skipping to change at line 421 | skipping to change at line 433 | |||
| extern void glutSolidDodecahedron(void); | extern void glutSolidDodecahedron(void); | |||
| extern void glutWireTeapot(GLdouble size); | extern void glutWireTeapot(GLdouble size); | |||
| extern void glutSolidTeapot(GLdouble size); | extern void glutSolidTeapot(GLdouble size); | |||
| extern void glutWireOctahedron(void); | extern void glutWireOctahedron(void); | |||
| extern void glutSolidOctahedron(void); | extern void glutSolidOctahedron(void); | |||
| extern void glutWireTetrahedron(void); | extern void glutWireTetrahedron(void); | |||
| extern void glutSolidTetrahedron(void); | extern void glutSolidTetrahedron(void); | |||
| extern void glutWireIcosahedron(void); | extern void glutWireIcosahedron(void); | |||
| extern void glutSolidIcosahedron(void); | extern void glutSolidIcosahedron(void); | |||
| #if (GLUT_API_VERSION >= 4) | #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) | |||
| /* GLUT video resize sub-API. */ | ||||
| extern int glutVideoResizeGet(GLenum param); | extern int glutVideoResizeGet(GLenum param); | |||
| extern void glutSetupVideoResizing(void); | extern void glutSetupVideoResizing(void); | |||
| extern void glutStopVideoResizing(void); | extern void glutStopVideoResizing(void); | |||
| extern void glutVideoResize(int x, int y, int width, int height); | extern void glutVideoResize(int x, int y, int width, int height); | |||
| extern void glutVideoPan(int x, int y, int width, int height); | extern void glutVideoPan(int x, int y, int width, int height); | |||
| /* GLUT debugging sub-API. */ | ||||
| extern void glutReportErrors(void); | ||||
| #endif | #endif | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| } | } | |||
| #endif | #endif | |||
| #endif /* __glut_h__ */ | #endif /* __glut_h__ */ | |||
| End of changes. 15 change blocks. | ||||
| 14 lines changed or deleted | 31 lines changed or added | |||