#define GLUT_ACTION_ON_WINDOW_CLOSE 0x01F9
#define GLUT_WINDOW_BORDER_WIDTH 0x01FA
-#define GLUT_WINDOW_HEADER_HEIGHT 0x01FB
+#define GLUT_WINDOW_BORDER_HEIGHT 0x01FB
+#define GLUT_WINDOW_HEADER_HEIGHT 0x01FB /* Docs say it should always have been GLUT_WINDOW_BORDER_HEIGHT, keep this for backward compatibility */
#define GLUT_VERSION 0x01FC
#define GLUT_SKIP_STALE_MOTION_EVENTS 0x0204
+#define GLUT_GEOMETRY_VISUALIZE_NORMALS 0x0205
+
+#define GLUT_MENU_FONT 0x0206 /* TOOD: now glutSetOption only */
+
/*
* New tokens for glutInitDisplayMode.
* Only one GLUT_AUXn bit may be used at a time.
FGAPI void FGAPIENTRY glutLeaveFullScreen( void );
/*
+ * Menu functions
+ */
+FGAPI void FGAPIENTRY glutSetMenuFont( void* font );
+
+/*
* Window-specific callback functions, see freeglut_callbacks.c
*/
FGAPI void FGAPIENTRY glutMouseWheelFunc( void (* callback)( int, int, int, int ) );
+FGAPI void FGAPIENTRY glutPositionFunc( void (* callback)( int, int ) );
FGAPI void FGAPIENTRY glutCloseFunc( void (* callback)( void ) );
FGAPI void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) );
-/* A. Donev: Also a destruction callback for menus */
+/* And also a destruction callback for menus */
FGAPI void FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) );
/*
FGAPI void FGAPIENTRY glutSolidCylinder( double radius, double height, GLint slices, GLint stacks);
/*
+ * Rest of functions for rendering Newell's teaset, found in freeglut_teapot.c
+ * NB: front facing polygons have clockwise winding, not counter clockwise
+ */
+FGAPI void FGAPIENTRY glutWireTeacup( double size );
+FGAPI void FGAPIENTRY glutSolidTeacup( double size );
+FGAPI void FGAPIENTRY glutWireTeaspoon( double size );
+FGAPI void FGAPIENTRY glutSolidTeaspoon( double size );
+
+/*
* Extension functions, see freeglut_ext.c
*/
typedef void (*GLUTproc)();
/*
* Initialization functions, see freeglut_init.c
*/
+/* to get the typedef for va_list */
+#include <stdarg.h>
FGAPI void FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion );
FGAPI void FGAPIENTRY glutInitContextFlags( int flags );
FGAPI void FGAPIENTRY glutInitContextProfile( int profile );
-
-/* to get the typedef for va_list */
-#include <stdarg.h>
-
-FGAPI void FGAPIENTRY glutInitErrorFunc( void (* vError)( const char *fmt, va_list ap ) );
-FGAPI void FGAPIENTRY glutInitWarningFunc( void (* vWarning)( const char *fmt, va_list ap ) );
+FGAPI void FGAPIENTRY glutInitErrorFunc( void (* callback)( const char *fmt, va_list ap ) );
+FGAPI void FGAPIENTRY glutInitWarningFunc( void (* callback)( const char *fmt, va_list ap ) );
/* OpenGL >= 2.0 support */
FGAPI void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib);
FGAPI void FGAPIENTRY glutSetVertexAttribNormal(GLint attrib);
+FGAPI void FGAPIENTRY glutSetVertexAttribTexCoord2(GLint attrib);
/* Mobile platforms lifecycle */
-FGAPI void FGAPIENTRY glutFixMyNameInitContextFunc(void (* callback)());
-FGAPI void FGAPIENTRY glutFixMyNamePauseFunc(void (* callback)());
-FGAPI void FGAPIENTRY glutFixMyNameResumeFunc(void (* callback)());
+FGAPI void FGAPIENTRY glutInitContextFunc(void (* callback)());
+FGAPI void FGAPIENTRY glutAppStatusFunc(void (* callback)(int));
+/* state flags that can be passed to callback set by glutAppStatusFunc */
+#define GLUT_APPSTATUS_PAUSE 0x0001
+#define GLUT_APPSTATUS_RESUME 0x0002
/*
* GLUT API macro definitions -- the display mode definitions