fglut.h   fglut.h 
skipping to change at line 310 skipping to change at line 310
parameter ( GLUT_CURSOR_BOTTOM_LEFT_CORNER = 19 ) parameter ( GLUT_CURSOR_BOTTOM_LEFT_CORNER = 19 )
integer*4 GLUT_CURSOR_INHERIT integer*4 GLUT_CURSOR_INHERIT
parameter ( GLUT_CURSOR_INHERIT = 100 ) parameter ( GLUT_CURSOR_INHERIT = 100 )
integer*4 GLUT_CURSOR_NONE integer*4 GLUT_CURSOR_NONE
parameter ( GLUT_CURSOR_NONE = 101 ) parameter ( GLUT_CURSOR_NONE = 101 )
integer*4 GLUT_CURSOR_FULL_CROSSHAIR integer*4 GLUT_CURSOR_FULL_CROSSHAIR
parameter ( GLUT_CURSOR_FULL_CROSSHAIR = 102 ) parameter ( GLUT_CURSOR_FULL_CROSSHAIR = 102 )
C GLUT functions C GLUT functions
integer*4 glutcreatewindow integer*4 glutcreatewindow
integer*4 glutcreatesubwindow
integer*4 glutgetwindow integer*4 glutgetwindow
integer*4 glutcreatemenu integer*4 glutcreatemenu
integer*4 glutgetmenu integer*4 glutgetmenu
real glutgetcolor real glutgetcolor
integer*4 glutget integer*4 glutget
integer*4 glutdeviceget integer*4 glutdeviceget
integer*4 glutextensionsupported integer*4 glutextensionsupported
C GLUT NULL name C GLUT NULL name
external glutnull external glutnull
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 glut.h   glut.h 
#ifndef __glut_h__ #ifndef __glut_h__
#define __glut_h__ #define __glut_h__
/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996. */ /* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996. */
/* This program is freely distributable without licensing fees and is /* This program is freely distributable without licensing fees and is
provided without guarantee or warrantee expressed or implied. This provided without guarantee or warrantee expressed or implied. This
program is -not- in the public domain. */ program is -not- in the public domain. */
#if defined(WIN32)
#include <windows.h>
#pragma warning (disable:4244) /* disable bogus conversion warnings
*/
#endif
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
/* define APIENTRY and CALLBACK to null string if we aren't on Win32 */
#if !defined(WIN32)
#define APIENTRY
#define CALLBACK
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
GLUT API revision history: GLUT API revision history:
GLUT_API_VERSION is updated to reflect incompatible GLUT GLUT_API_VERSION is updated to reflect incompatible GLUT
API changes (interface changes, semantic changes, deletions, API changes (interface changes, semantic changes, deletions,
or additions). or additions).
skipping to change at line 93 skipping to change at line 103
#endif #endif
#if (GLUT_API_VERSION >= 3) #if (GLUT_API_VERSION >= 3)
#define GLUT_LUMINANCE 512 #define GLUT_LUMINANCE 512
#endif #endif
/* Mouse buttons. */ /* Mouse buttons. */
#define GLUT_LEFT_BUTTON 0 #define GLUT_LEFT_BUTTON 0
#define GLUT_MIDDLE_BUTTON 1 #define GLUT_MIDDLE_BUTTON 1
#define GLUT_RIGHT_BUTTON 2 #define GLUT_RIGHT_BUTTON 2
/* Mouse button callback state. */ /* Mouse button state. */
#define GLUT_DOWN 0 #define GLUT_DOWN 0
#define GLUT_UP 1 #define GLUT_UP 1
#if (GLUT_API_VERSION >= 2) #if (GLUT_API_VERSION >= 2)
/* function keys */ /* function keys */
#define GLUT_KEY_F1 1 #define GLUT_KEY_F1 1
#define GLUT_KEY_F2 2 #define GLUT_KEY_F2 2
#define GLUT_KEY_F3 3 #define GLUT_KEY_F3 3
#define GLUT_KEY_F4 4 #define GLUT_KEY_F4 4
#define GLUT_KEY_F5 5 #define GLUT_KEY_F5 5
skipping to change at line 123 skipping to change at line 133
#define GLUT_KEY_UP 101 #define GLUT_KEY_UP 101
#define GLUT_KEY_RIGHT 102 #define GLUT_KEY_RIGHT 102
#define GLUT_KEY_DOWN 103 #define GLUT_KEY_DOWN 103
#define GLUT_KEY_PAGE_UP 104 #define GLUT_KEY_PAGE_UP 104
#define GLUT_KEY_PAGE_DOWN 105 #define GLUT_KEY_PAGE_DOWN 105
#define GLUT_KEY_HOME 106 #define GLUT_KEY_HOME 106
#define GLUT_KEY_END 107 #define GLUT_KEY_END 107
#define GLUT_KEY_INSERT 108 #define GLUT_KEY_INSERT 108
#endif #endif
/* Entry/exit callback state. */ /* Entry/exit state. */
#define GLUT_LEFT 0 #define GLUT_LEFT 0
#define GLUT_ENTERED 1 #define GLUT_ENTERED 1
/* Menu usage callback state. */ /* Menu usage state. */
#define GLUT_MENU_NOT_IN_USE 0 #define GLUT_MENU_NOT_IN_USE 0
#define GLUT_MENU_IN_USE 1 #define GLUT_MENU_IN_USE 1
/* Visibility callback state. */ /* Visibility state. */
#define GLUT_NOT_VISIBLE 0 #define GLUT_NOT_VISIBLE 0
#define GLUT_VISIBLE 1 #define GLUT_VISIBLE 1
/* Window status callback state. */ /* Window status state. */
#define GLUT_HIDDEN 0 #define GLUT_HIDDEN 0
#define GLUT_FULLY_RETAINED 1 #define GLUT_FULLY_RETAINED 1
#define GLUT_PARTIALLY_RETAINED 2 #define GLUT_PARTIALLY_RETAINED 2
#define GLUT_FULLY_COVERED 3 #define GLUT_FULLY_COVERED 3
/* Color index component selection values. */ /* Color index component selection values. */
#define GLUT_RED 0 #define GLUT_RED 0
#define GLUT_GREEN 1 #define GLUT_GREEN 1
#define GLUT_BLUE 2 #define GLUT_BLUE 2
/* Layers for use. */ /* Layers for use. */
#define GLUT_NORMAL 0 #define GLUT_NORMAL 0
#define GLUT_OVERLAY 1 #define GLUT_OVERLAY 1
#if defined(WIN32)
/* Stroke font constants (use these in GLUT program). */
#define GLUT_STROKE_ROMAN ((void*)0)
#define GLUT_STROKE_MONO_ROMAN ((void*)1)
/* Bitmap font constants (use these in GLUT program). */
#define GLUT_BITMAP_9_BY_15 ((void*)2)
#define GLUT_BITMAP_8_BY_13 ((void*)3)
#define GLUT_BITMAP_TIMES_ROMAN_10 ((void*)4)
#define GLUT_BITMAP_TIMES_ROMAN_24 ((void*)5)
#if (GLUT_API_VERSION >= 3)
#define GLUT_BITMAP_HELVETICA_10 ((void*)6)
#define GLUT_BITMAP_HELVETICA_12 ((void*)7)
#define GLUT_BITMAP_HELVETICA_18 ((void*)8)
#endif
#else
/* Stroke font opaque addresses (use constants instead in source code). */ /* Stroke font opaque addresses (use constants instead in source code). */
extern void *glutStrokeRoman; extern void *glutStrokeRoman;
extern void *glutStrokeMonoRoman; extern void *glutStrokeMonoRoman;
/* Stroke font constants (use these in GLUT program). */ /* Stroke font constants (use these in GLUT program). */
#define GLUT_STROKE_ROMAN (&glutStrokeRoman) #define GLUT_STROKE_ROMAN (&glutStrokeRoman)
#define GLUT_STROKE_MONO_ROMAN (&glutStrokeMonoRoman) #define GLUT_STROKE_MONO_ROMAN (&glutStrokeMonoRoman)
/* Bitmap font opaque addresses (use constants instead in source code). */ /* Bitmap font opaque addresses (use constants instead in source code). */
extern void *glutBitmap9By15; extern void *glutBitmap9By15;
skipping to change at line 177 skipping to change at line 203
/* Bitmap font constants (use these in GLUT program). */ /* Bitmap font constants (use these in GLUT program). */
#define GLUT_BITMAP_9_BY_15 (&glutBitmap9By15) #define GLUT_BITMAP_9_BY_15 (&glutBitmap9By15)
#define GLUT_BITMAP_8_BY_13 (&glutBitmap8By13) #define GLUT_BITMAP_8_BY_13 (&glutBitmap8By13)
#define GLUT_BITMAP_TIMES_ROMAN_10 (&glutBitmapTimesRoman10) #define GLUT_BITMAP_TIMES_ROMAN_10 (&glutBitmapTimesRoman10)
#define GLUT_BITMAP_TIMES_ROMAN_24 (&glutBitmapTimesRoman24) #define GLUT_BITMAP_TIMES_ROMAN_24 (&glutBitmapTimesRoman24)
#if (GLUT_API_VERSION >= 3) #if (GLUT_API_VERSION >= 3)
#define GLUT_BITMAP_HELVETICA_10 (&glutBitmapHelvetica10) #define GLUT_BITMAP_HELVETICA_10 (&glutBitmapHelvetica10)
#define GLUT_BITMAP_HELVETICA_12 (&glutBitmapHelvetica12) #define GLUT_BITMAP_HELVETICA_12 (&glutBitmapHelvetica12)
#define GLUT_BITMAP_HELVETICA_18 (&glutBitmapHelvetica18) #define GLUT_BITMAP_HELVETICA_18 (&glutBitmapHelvetica18)
#endif #endif
#endif
/* glutGet parameters. */ /* glutGet parameters. */
#define GLUT_WINDOW_X 100 #define GLUT_WINDOW_X 100
#define GLUT_WINDOW_Y 101 #define GLUT_WINDOW_Y 101
#define GLUT_WINDOW_WIDTH 102 #define GLUT_WINDOW_WIDTH 102
#define GLUT_WINDOW_HEIGHT 103 #define GLUT_WINDOW_HEIGHT 103
#define GLUT_WINDOW_BUFFER_SIZE 104 #define GLUT_WINDOW_BUFFER_SIZE 104
#define GLUT_WINDOW_STENCIL_SIZE 105 #define GLUT_WINDOW_STENCIL_SIZE 105
#define GLUT_WINDOW_DEPTH_SIZE 106 #define GLUT_WINDOW_DEPTH_SIZE 106
#define GLUT_WINDOW_RED_SIZE 107 #define GLUT_WINDOW_RED_SIZE 107
skipping to change at line 301 skipping to change at line 328
#define GLUT_CURSOR_BOTTOM_LEFT_CORNER 19 #define GLUT_CURSOR_BOTTOM_LEFT_CORNER 19
/* Inherit from parent window. */ /* Inherit from parent window. */
#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 APIENTRY glutInit(int *argcp, char **argv);
extern void glutInitDisplayMode(unsigned int mode); extern void APIENTRY glutInitDisplayMode(unsigned int mode);
#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
extern void glutInitDisplayString(const char *string); extern void APIENTRY glutInitDisplayString(const char *string);
#endif #endif
extern void glutInitWindowPosition(int x, int y); extern void APIENTRY glutInitWindowPosition(int x, int y);
extern void glutInitWindowSize(int width, int height); extern void APIENTRY glutInitWindowSize(int width, int height);
extern void glutMainLoop(void); extern void APIENTRY glutMainLoop(void);
/* GLUT window sub-API. */ /* GLUT window sub-API. */
extern int glutCreateWindow(const char *title); extern int APIENTRY glutCreateWindow(const char *title);
extern int glutCreateSubWindow(int win, int x, int y, int width, int height extern int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, i
); nt height);
extern void glutDestroyWindow(int win); extern void APIENTRY glutDestroyWindow(int win);
extern void glutPostRedisplay(void); extern void APIENTRY glutPostRedisplay(void);
extern void glutSwapBuffers(void); extern void APIENTRY glutSwapBuffers(void);
extern int glutGetWindow(void); extern int APIENTRY glutGetWindow(void);
extern void glutSetWindow(int win); extern void APIENTRY glutSetWindow(int win);
extern void glutSetWindowTitle(const char *title); extern void APIENTRY glutSetWindowTitle(const char *title);
extern void glutSetIconTitle(const char *title); extern void APIENTRY glutSetIconTitle(const char *title);
extern void glutPositionWindow(int x, int y); extern void APIENTRY glutPositionWindow(int x, int y);
extern void glutReshapeWindow(int width, int height); extern void APIENTRY glutReshapeWindow(int width, int height);
extern void glutPopWindow(void); extern void APIENTRY glutPopWindow(void);
extern void glutPushWindow(void); extern void APIENTRY glutPushWindow(void);
extern void glutIconifyWindow(void); extern void APIENTRY glutIconifyWindow(void);
extern void glutShowWindow(void); extern void APIENTRY glutShowWindow(void);
extern void glutHideWindow(void); extern void APIENTRY glutHideWindow(void);
#if (GLUT_API_VERSION >= 3) #if (GLUT_API_VERSION >= 3)
extern void glutFullScreen(void); extern void APIENTRY glutFullScreen(void);
extern void 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 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 glutEstablishOverlay(void); extern void APIENTRY glutEstablishOverlay(void);
extern void glutRemoveOverlay(void); extern void APIENTRY glutRemoveOverlay(void);
extern void glutUseLayer(GLenum layer); extern void APIENTRY glutUseLayer(GLenum layer);
extern void glutPostOverlayRedisplay(void); extern void APIENTRY glutPostOverlayRedisplay(void);
extern void glutShowOverlay(void); extern void APIENTRY glutShowOverlay(void);
extern void glutHideOverlay(void); extern void APIENTRY glutHideOverlay(void);
#endif #endif
/* GLUT menu sub-API. */ /* GLUT menu sub-API. */
extern int glutCreateMenu(void (*)(int)); extern int APIENTRY glutCreateMenu(void (*)(int));
extern void glutDestroyMenu(int menu); extern void APIENTRY glutDestroyMenu(int menu);
extern int glutGetMenu(void); extern int APIENTRY glutGetMenu(void);
extern void glutSetMenu(int menu); extern void APIENTRY glutSetMenu(int menu);
extern void glutAddMenuEntry(const char *label, int value); extern void APIENTRY glutAddMenuEntry(const char *label, int value);
extern void glutAddSubMenu(const char *label, int submenu); extern void APIENTRY glutAddSubMenu(const char *label, int submenu);
extern void glutChangeToMenuEntry(int item, const char *label, int value); extern void APIENTRY glutChangeToMenuEntry(int item, const char *label, int
extern void glutChangeToSubMenu(int item, const char *label, int submenu); value);
extern void glutRemoveMenuItem(int item); extern void APIENTRY glutChangeToSubMenu(int item, const char *label, int s
extern void glutAttachMenu(int button); ubmenu);
extern void glutDetachMenu(int button); extern void APIENTRY glutRemoveMenuItem(int item);
extern void APIENTRY glutAttachMenu(int button);
extern void APIENTRY glutDetachMenu(int button);
/* GLUT callback sub-API. */ /* GLUT sub-API. */
extern void glutDisplayFunc(void (*)(void)); extern void APIENTRY glutDisplayFunc(void (*)(void));
extern void glutReshapeFunc(void (*)(int width, int height)); extern void APIENTRY glutReshapeFunc(void (*)(int width, int height));
extern void glutKeyboardFunc(void (*)(unsigned char key, int x, int y)); extern void APIENTRY glutKeyboardFunc(void (*)(unsigned char key, int x, in
extern void glutMouseFunc(void (*)(int button, int state, int x, int y)); t y));
extern void glutMotionFunc(void (*)(int x, int y)); extern void APIENTRY glutMouseFunc(void (*)(int button, int state, int x, i
extern void glutPassiveMotionFunc(void (*)(int x, int y)); nt y));
extern void glutEntryFunc(void (*)(int state)); extern void APIENTRY glutMotionFunc(void (*)(int x, int y));
extern void glutVisibilityFunc(void (*)(int state)); extern void APIENTRY glutPassiveMotionFunc(void (*)(int x, int y));
extern void glutIdleFunc(void (*)(void)); extern void APIENTRY glutEntryFunc(void (*)(int state));
extern void glutTimerFunc(unsigned int millis, void (*)(int value), int val extern void APIENTRY glutVisibilityFunc(void (*)(int state));
ue); extern void APIENTRY glutIdleFunc(void (*)(void));
extern void glutMenuStateFunc(void (*)(int state)); extern void APIENTRY glutTimerFunc(unsigned int millis, void (*)(int value)
, int value);
extern void APIENTRY glutMenuStateFunc(void (*)(int state));
#if (GLUT_API_VERSION >= 2) #if (GLUT_API_VERSION >= 2)
extern void glutSpecialFunc(void (*)(int key, int x, int y)); extern void APIENTRY glutSpecialFunc(void (*)(int key, int x, int y));
extern void glutSpaceballMotionFunc(void (*)(int x, int y, int z)); extern void APIENTRY glutSpaceballMotionFunc(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 APIENTRY glutSpaceballRotateFunc(void (*)(int x, int y, int z))
extern void glutButtonBoxFunc(void (*)(int button, int state)); ;
extern void glutDialsFunc(void (*)(int dial, int value)); extern void APIENTRY glutSpaceballButtonFunc(void (*)(int button, int state
extern void glutTabletMotionFunc(void (*)(int x, int y)); ));
extern void glutTabletButtonFunc(void (*)(int button, int state, int x, int extern void APIENTRY glutButtonBoxFunc(void (*)(int button, int state));
y)); extern void APIENTRY glutDialsFunc(void (*)(int dial, int value));
extern void APIENTRY glutTabletMotionFunc(void (*)(int x, int y));
extern void APIENTRY glutTabletButtonFunc(void (*)(int button, int state, i
nt 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 APIENTRY glutMenuStatusFunc(void (*)(int status, int x, int y))
extern void glutOverlayDisplayFunc(void (*)(void)); ;
extern void APIENTRY glutOverlayDisplayFunc(void (*)(void));
#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
extern void glutWindowStatusFunc(void (*)(int state)); extern void APIENTRY 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 APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat
extern GLfloat glutGetColor(int ndx, int component); blue);
extern void glutCopyColormap(int win); extern GLfloat APIENTRY glutGetColor(int ndx, int component);
extern void APIENTRY glutCopyColormap(int win);
/* GLUT state retrieval sub-API. */ /* GLUT state retrieval sub-API. */
extern int glutGet(GLenum type); extern int APIENTRY glutGet(GLenum type);
extern int glutDeviceGet(GLenum type); extern int APIENTRY 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(const char *name); extern int APIENTRY glutExtensionSupported(const char *name);
#endif #endif
#if (GLUT_API_VERSION >= 3) #if (GLUT_API_VERSION >= 3)
extern int glutGetModifiers(void); extern int APIENTRY glutGetModifiers(void);
extern int glutLayerGet(GLenum type); extern int APIENTRY glutLayerGet(GLenum type);
#endif #endif
/* GLUT font sub-API */ /* GLUT font sub-API */
extern void glutBitmapCharacter(void *font, int character); extern void APIENTRY glutBitmapCharacter(void *font, int character);
extern int glutBitmapWidth(void *font, int character); extern int APIENTRY glutBitmapWidth(void *font, int character);
extern void glutStrokeCharacter(void *font, int character); extern void APIENTRY glutStrokeCharacter(void *font, int character);
extern int glutStrokeWidth(void *font, int character); extern int APIENTRY glutStrokeWidth(void *font, int character);
#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
extern int glutBitmapLength(void *font, const unsigned char *string); extern int APIENTRY glutBitmapLength(void *font, const unsigned char *strin
extern int glutStrokeLength(void *font, const unsigned char *string); g);
extern int APIENTRY glutStrokeLength(void *font, const unsigned char *strin
g);
#endif #endif
/* GLUT pre-built models sub-API */ /* GLUT pre-built models sub-API */
extern void glutWireSphere(GLdouble radius, GLint slices, GLint stacks); extern void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint st
extern void glutSolidSphere(GLdouble radius, GLint slices, GLint stacks); acks);
extern void glutWireCone(GLdouble base, GLdouble height, GLint slices, GLin extern void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint s
t stacks); tacks);
extern void glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLi extern void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint sli
nt stacks); ces, GLint stacks);
extern void glutWireCube(GLdouble size); extern void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint sl
extern void glutSolidCube(GLdouble size); ices, GLint stacks);
extern void glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint extern void APIENTRY glutWireCube(GLdouble size);
sides, GLint rings); extern void APIENTRY glutSolidCube(GLdouble size);
extern void glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLin extern void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadi
t sides, GLint rings); us, GLint sides, GLint rings);
extern void glutWireDodecahedron(void); extern void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRad
extern void glutSolidDodecahedron(void); ius, GLint sides, GLint rings);
extern void glutWireTeapot(GLdouble size); extern void APIENTRY glutWireDodecahedron(void);
extern void glutSolidTeapot(GLdouble size); extern void APIENTRY glutSolidDodecahedron(void);
extern void glutWireOctahedron(void); extern void APIENTRY glutWireTeapot(GLdouble size);
extern void glutSolidOctahedron(void); extern void APIENTRY glutSolidTeapot(GLdouble size);
extern void glutWireTetrahedron(void); extern void APIENTRY glutWireOctahedron(void);
extern void glutSolidTetrahedron(void); extern void APIENTRY glutSolidOctahedron(void);
extern void glutWireIcosahedron(void); extern void APIENTRY glutWireTetrahedron(void);
extern void glutSolidIcosahedron(void); extern void APIENTRY glutSolidTetrahedron(void);
extern void APIENTRY glutWireIcosahedron(void);
extern void APIENTRY glutSolidIcosahedron(void);
#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
/* GLUT video resize sub-API. */ /* GLUT video resize sub-API. */
extern int glutVideoResizeGet(GLenum param); extern int APIENTRY glutVideoResizeGet(GLenum param);
extern void glutSetupVideoResizing(void); extern void APIENTRY glutSetupVideoResizing(void);
extern void glutStopVideoResizing(void); extern void APIENTRY glutStopVideoResizing(void);
extern void glutVideoResize(int x, int y, int width, int height); extern void APIENTRY glutVideoResize(int x, int y, int width, int height);
extern void glutVideoPan(int x, int y, int width, int height); extern void APIENTRY glutVideoPan(int x, int y, int width, int height);
/* GLUT debugging sub-API. */ /* GLUT debugging sub-API. */
extern void glutReportErrors(void); extern void APIENTRY glutReportErrors(void);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* __glut_h__ */ #endif /* __glut_h__ */
 End of changes. 30 change blocks. 
115 lines changed or deleted 156 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/