- Timestamp:
- Feb 29, 2000, 2:56:52 PM (25 years ago)
- Location:
- trunk/src/opengl
- Files:
-
- 1 deleted
- 13 edited
-
glu/glu.h (deleted)
-
glu/include/gluos.h (modified) (2 diffs)
-
glu/makefile (modified) (3 diffs)
-
glu/nurbs/interface/glinterface.cpp (modified) (4 diffs)
-
glu/nurbs/interface/makefile (modified) (3 diffs)
-
glu/nurbs/internals/makefile (modified) (3 diffs)
-
glu/nurbs/nurbtess/makefile (modified) (2 diffs)
-
glu/tess/makefile (modified) (2 diffs)
-
glu/util/makefile (modified) (2 diffs)
-
glu/util/project.c (modified) (3 diffs)
-
glut/Makefile (modified) (3 diffs)
-
glut/glut.h (modified) (5 diffs)
-
mesa/GL/gl.h (modified) (2 diffs)
-
mesa/GL/glu.h (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/opengl/glu/include/gluos.h
r2689 r2945 1 /* $Id: gluos.h,v 1. 1 2000-02-09 08:50:55 jeroenExp $ */1 /* $Id: gluos.h,v 1.2 2000-02-29 13:56:48 sandervl Exp $ */ 2 2 /* 3 3 ** gluos.h - operating system dependencies for GLU 4 4 ** 5 ** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/include/gluos.h,v 1. 1 2000-02-09 08:50:55 jeroenExp $*/5 ** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/include/gluos.h,v 1.2 2000-02-29 13:56:48 sandervl Exp $*/ 6 6 7 7 #if defined(_WIN32) … … 19 19 #else 20 20 #if defined(__WIN32OS2__) 21 #include <os2win.h> 22 #define GLAPI WIN32API 21 #include <windows.h> 23 22 #else 24 23 /* Disable Microsoft-specific keywords */ -
trunk/src/opengl/glu/makefile
r2730 r2945 1 # $Id: makefile,v 1. 9 2000-02-10 01:19:17 birdExp $1 # $Id: makefile,v 1.10 2000-02-29 13:56:48 sandervl Exp $ 2 2 3 3 # … … 26 26 !endif 27 27 28 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) 29 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) 28 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL 29 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL 30 30 31 31 TARGET = GLU32 … … 354 354 355 355 dep: 356 $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \356 $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \ 357 357 *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h 358 358 cd util -
trunk/src/opengl/glu/nurbs/interface/glinterface.cpp
r2689 r2945 1 /* $Id: glinterface.cpp,v 1. 1 2000-02-09 08:49:01 jeroenExp $ */1 /* $Id: glinterface.cpp,v 1.2 2000-02-29 13:56:48 sandervl Exp $ */ 2 2 /* 3 3 ** License Applicability. Except to the extent portions of this file are … … 33 33 ** compliant with the OpenGL(R) version 1.2.1 Specification. 34 34 ** 35 ** $Date: 2000-02- 09 08:49:01 $ $Revision: 1.1$35 ** $Date: 2000-02-29 13:56:48 $ $Revision: 1.2 $ 36 36 */ 37 37 /* 38 ** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/nurbs/interface/glinterface.cpp,v 1. 1 2000-02-09 08:49:01 jeroenExp $38 ** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/nurbs/interface/glinterface.cpp,v 1.2 2000-02-29 13:56:48 sandervl Exp $ 39 39 */ 40 40 … … 430 430 } 431 431 432 extern "C" void GLAPI 433 gluNurbsCallback(GLUnurbs *r, GLenum which, GLvoid (*fn)())432 GLUAPI void GLAPIENTRY gluNurbsCallback( GLUnurbsObj *nobj, GLenum which, 433 void (GLCALLBACK *fn)() ) 434 434 { 435 435 switch (which) { … … 446 446 case GLU_NURBS_TEXTURE_COORD_DATA: 447 447 case GLU_NURBS_COLOR_DATA: 448 #ifdef __WIN32OS2__ 449 r->putSurfCallBack(which, (GLvoid (* WIN32API)(...))fn); 450 #else 451 r->putSurfCallBack(which, (GLvoid (*)(...))fn); 452 #endif 448 nobj->putSurfCallBack(which, (GLvoid (*)(...))fn); 453 449 break; 454 450 455 451 case GLU_NURBS_ERROR: 456 #ifdef __WIN32OS2__ 457 r->errorCallback = (void (* WIN32API)( GLenum )) fn; 458 #else 459 r->errorCallback = (void (*)( GLenum )) fn; 460 #endif 452 nobj->errorCallback = (void (*)( GLenum )) fn; 461 453 break; 462 454 default: 463 r->postError(GLU_INVALID_ENUM);455 nobj->postError(GLU_INVALID_ENUM); 464 456 return; 465 457 } -
trunk/src/opengl/glu/nurbs/interface/makefile
r2709 r2945 1 # $Id: makefile,v 1. 2 2000-02-09 23:40:51 birdExp $1 # $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $ 2 2 # 3 3 # PD-Win32 API … … 14 14 !include $(PDWIN32_INCLUDE)/pdwin32.mk 15 15 16 CINCLUDE=-I..\.. -I..\internals -I..\nurbtess -I..\..\..\mesa -I$(PDWIN32_INCLUDE) -I..\..\include16 CINCLUDE=-I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess -I$(PDWIN32_INCLUDE) -I..\..\include -I..\..\..\mesa 17 17 18 18 CFLAGS = $(CFLAGS) $(CINCLUDE) -DNDEBUG … … 28 28 dep: 29 29 $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \ 30 ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\ *.h30 ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\GL\*.h 31 31 32 32 !ifndef NODEP -
trunk/src/opengl/glu/nurbs/internals/makefile
r2709 r2945 1 # $Id: makefile,v 1. 2 2000-02-09 23:40:51 birdExp $1 # $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $ 2 2 3 3 # … … 15 15 !include $(PDWIN32_INCLUDE)/pdwin32.mk 16 16 17 CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa -I..\..\include -I$(PDWIN32_INCLUDE)17 CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include -I$(PDWIN32_INCLUDE) 18 18 CDEFS=-DSTANDALONE -DLIBRARYBUILD -DNDEBUG 19 19 … … 37 37 dep: 38 38 $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \ 39 ..\nurbtess\*.h ..\..\..\mesa\ *.h ..\..\include\*.h39 ..\nurbtess\*.h ..\..\..\mesa\GL\*.h ..\..\include\*.h 40 40 41 41 !ifndef NODEP -
trunk/src/opengl/glu/nurbs/nurbtess/makefile
r2709 r2945 1 # $Id: makefile,v 1. 2 2000-02-09 23:40:51 birdExp $1 # $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $ 2 2 3 3 # … … 16 16 17 17 18 CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa -I$(PDWIN32_INCLUDE) -I..\..\include18 CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I$(PDWIN32_INCLUDE) -I..\..\include 19 19 20 20 CFLAGS = $(CFLAGS) $(CINCLUDE) -DNDEBUG -
trunk/src/opengl/glu/tess/makefile
r2709 r2945 1 # $Id: makefile,v 1. 2 2000-02-09 23:40:51 birdExp $1 # $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $ 2 2 # 3 3 # PD-Win32 API … … 14 14 !include $(PDWIN32_INCLUDE)/pdwin32.mk 15 15 16 CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include 16 CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL 17 17 CDEFS=-DNDEBUG -Tdp 18 18 -
trunk/src/opengl/glu/util/makefile
r2709 r2945 1 # $Id: makefile,v 1. 2 2000-02-09 23:40:51 birdExp $1 # $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $ 2 2 # 3 3 # PD-Win32 API … … 14 14 !include $(PDWIN32_INCLUDE)/pdwin32.mk 15 15 16 CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include 16 CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL 17 17 18 18 CFLAGS = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG -
trunk/src/opengl/glu/util/project.c
r2689 r2945 1 /* $Id: project.c,v 1. 1 2000-02-09 08:47:14 jeroenExp $ */1 /* $Id: project.c,v 1.2 2000-02-29 13:56:50 sandervl Exp $ */ 2 2 /* 3 3 ** License Applicability. Except to the extent portions of this file are … … 33 33 ** compliant with the OpenGL(R) version 1.2.1 Specification. 34 34 ** 35 ** $Date: 2000-02- 09 08:47:14 $ $Revision: 1.1$36 ** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/util/project.c,v 1. 1 2000-02-09 08:47:14 jeroenExp $35 ** $Date: 2000-02-29 13:56:50 $ $Revision: 1.2 $ 36 ** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glu/util/project.c,v 1.2 2000-02-29 13:56:50 sandervl Exp $ 37 37 */ 38 38 … … 367 367 } 368 368 369 void GLAPI 370 gluPickMatrix(GLdouble x, GLdouble y, GLdouble deltax, GLdouble deltay, 371 GLint viewport[4]) 369 GLUAPI void GLAPIENTRY gluPickMatrix(GLdouble x, GLdouble y, GLdouble deltax, GLdouble deltay, 370 const GLint viewport[4]) 372 371 { 373 372 if (deltax <= 0 || deltay <= 0) { -
trunk/src/opengl/glut/Makefile
r2709 r2945 1 # $Id: Makefile,v 1. 6 2000-02-09 23:40:52 birdExp $1 # $Id: Makefile,v 1.7 2000-02-29 13:56:51 sandervl Exp $ 2 2 3 3 # … … 24 24 !endif 25 25 26 CFLAGS = -Tdp -I..\mesa -I..\glu $(CFLAGS) -I$(PDWIN32_INCLUDE)27 CXXFLAGS = -Tdp -I..\mesa -I..\glu $(CXXFLAGS) -I$(PDWIN32_INCLUDE)26 CFLAGS = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa 27 CXXFLAGS = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa 28 28 29 29 TARGET=GLUT32 … … 79 79 80 80 dep: 81 $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \81 $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \ 82 82 *.c *.cpp *.asm *.inc $(PDWIN32_INCLUDE)\*.h 83 83 -
trunk/src/opengl/glut/glut.h
r2689 r2945 1 /* $Id: glut.h,v 1. 2 2000-02-09 08:46:07 jeroenExp $ */1 /* $Id: glut.h,v 1.3 2000-02-29 13:56:51 sandervl Exp $ */ 2 2 #ifndef __glut_h__ 3 3 #define __glut_h__ … … 404 404 405 405 /* GLUT initialization sub-API. */ 406 extern void APIENTRY glutInit(int *argcp, char **argv);407 extern void APIENTRY glutInitDisplayMode(unsigned int mode);406 extern void GLAPIENTRY glutInit(int *argcp, char **argv); 407 extern void GLAPIENTRY glutInitDisplayMode(unsigned int mode); 408 408 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) 409 extern void APIENTRY glutInitDisplayString(const char *string);410 #endif 411 extern void APIENTRY glutInitWindowPosition(int x, int y);412 extern void APIENTRY glutInitWindowSize(int width, int height);413 extern void APIENTRY glutMainLoop(void);409 extern void GLAPIENTRY glutInitDisplayString(const char *string); 410 #endif 411 extern void GLAPIENTRY glutInitWindowPosition(int x, int y); 412 extern void GLAPIENTRY glutInitWindowSize(int width, int height); 413 extern void GLAPIENTRY glutMainLoop(void); 414 414 415 415 /* GLUT window sub-API. */ 416 extern int APIENTRY glutCreateWindow(const char *title);417 extern int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height);418 extern void APIENTRY glutDestroyWindow(int win);419 extern void APIENTRY glutPostRedisplay(void);416 extern int GLAPIENTRY glutCreateWindow(const char *title); 417 extern int GLAPIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height); 418 extern void GLAPIENTRY glutDestroyWindow(int win); 419 extern void GLAPIENTRY glutPostRedisplay(void); 420 420 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) 421 extern void APIENTRY glutPostWindowRedisplay(int win);422 #endif 423 extern void APIENTRY glutSwapBuffers(void);424 extern int APIENTRY glutGetWindow(void);425 extern void APIENTRY glutSetWindow(int win);426 extern void APIENTRY glutSetWindowTitle(const char *title);427 extern void APIENTRY glutSetIconTitle(const char *title);428 extern void APIENTRY glutPositionWindow(int x, int y);429 extern void APIENTRY glutReshapeWindow(int width, int height);430 extern void APIENTRY glutPopWindow(void);431 extern void APIENTRY glutPushWindow(void);432 extern void APIENTRY glutIconifyWindow(void);433 extern void APIENTRY glutShowWindow(void);434 extern void APIENTRY glutHideWindow(void);435 #if (GLUT_API_VERSION >= 3) 436 extern void APIENTRY glutFullScreen(void);437 extern void APIENTRY glutSetCursor(int cursor);421 extern void GLAPIENTRY glutPostWindowRedisplay(int win); 422 #endif 423 extern void GLAPIENTRY glutSwapBuffers(void); 424 extern int GLAPIENTRY glutGetWindow(void); 425 extern void GLAPIENTRY glutSetWindow(int win); 426 extern void GLAPIENTRY glutSetWindowTitle(const char *title); 427 extern void GLAPIENTRY glutSetIconTitle(const char *title); 428 extern void GLAPIENTRY glutPositionWindow(int x, int y); 429 extern void GLAPIENTRY glutReshapeWindow(int width, int height); 430 extern void GLAPIENTRY glutPopWindow(void); 431 extern void GLAPIENTRY glutPushWindow(void); 432 extern void GLAPIENTRY glutIconifyWindow(void); 433 extern void GLAPIENTRY glutShowWindow(void); 434 extern void GLAPIENTRY glutHideWindow(void); 435 #if (GLUT_API_VERSION >= 3) 436 extern void GLAPIENTRY glutFullScreen(void); 437 extern void GLAPIENTRY glutSetCursor(int cursor); 438 438 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) 439 extern void APIENTRY glutWarpPointer(int x, int y);439 extern void GLAPIENTRY glutWarpPointer(int x, int y); 440 440 #endif 441 441 442 442 /* GLUT overlay sub-API. */ 443 extern void APIENTRY glutEstablishOverlay(void);444 extern void APIENTRY glutRemoveOverlay(void);445 extern void APIENTRY glutUseLayer(GLenum layer);446 extern void APIENTRY glutPostOverlayRedisplay(void);443 extern void GLAPIENTRY glutEstablishOverlay(void); 444 extern void GLAPIENTRY glutRemoveOverlay(void); 445 extern void GLAPIENTRY glutUseLayer(GLenum layer); 446 extern void GLAPIENTRY glutPostOverlayRedisplay(void); 447 447 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) 448 extern void APIENTRY glutPostWindowOverlayRedisplay(int win);449 #endif 450 extern void APIENTRY glutShowOverlay(void);451 extern void APIENTRY glutHideOverlay(void);448 extern void GLAPIENTRY glutPostWindowOverlayRedisplay(int win); 449 #endif 450 extern void GLAPIENTRY glutShowOverlay(void); 451 extern void GLAPIENTRY glutHideOverlay(void); 452 452 #endif 453 453 454 454 /* GLUT menu sub-API. */ 455 extern int APIENTRY glutCreateMenu(void (*)(int));456 extern void APIENTRY glutDestroyMenu(int menu);457 extern int APIENTRY glutGetMenu(void);458 extern void APIENTRY glutSetMenu(int menu);459 extern void APIENTRY glutAddMenuEntry(const char *label, int value);460 extern void APIENTRY glutAddSubMenu(const char *label, int submenu);461 extern void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value);462 extern void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu);463 extern void APIENTRY glutRemoveMenuItem(int item);464 extern void APIENTRY glutAttachMenu(int button);465 extern void APIENTRY glutDetachMenu(int button);455 extern int GLAPIENTRY glutCreateMenu(void (*)(int)); 456 extern void GLAPIENTRY glutDestroyMenu(int menu); 457 extern int GLAPIENTRY glutGetMenu(void); 458 extern void GLAPIENTRY glutSetMenu(int menu); 459 extern void GLAPIENTRY glutAddMenuEntry(const char *label, int value); 460 extern void GLAPIENTRY glutAddSubMenu(const char *label, int submenu); 461 extern void GLAPIENTRY glutChangeToMenuEntry(int item, const char *label, int value); 462 extern void GLAPIENTRY glutChangeToSubMenu(int item, const char *label, int submenu); 463 extern void GLAPIENTRY glutRemoveMenuItem(int item); 464 extern void GLAPIENTRY glutAttachMenu(int button); 465 extern void GLAPIENTRY glutDetachMenu(int button); 466 466 467 467 /* GLUT window callback sub-API. */ 468 extern void APIENTRY glutDisplayFunc(void (*func)(void));469 extern void APIENTRY glutReshapeFunc(void (*func)(int width, int height));470 extern void APIENTRY glutKeyboardFunc(void (*func)(unsigned char key, int x, int y));471 extern void APIENTRY glutMouseFunc(void (*func)(int button, int state, int x, int y));472 extern void APIENTRY glutMotionFunc(void (*func)(int x, int y));473 extern void APIENTRY glutPassiveMotionFunc(void (*func)(int x, int y));474 extern void APIENTRY glutEntryFunc(void (*func)(int state));475 extern void APIENTRY glutVisibilityFunc(void (*func)(int state));476 extern void APIENTRY glutIdleFunc(void (*func)(void));477 extern void APIENTRY glutTimerFunc(unsigned int millis, void (*func)(int value), int value);478 extern void APIENTRY glutMenuStateFunc(void (*func)(int state));468 extern void GLAPIENTRY glutDisplayFunc(void (*func)(void)); 469 extern void GLAPIENTRY glutReshapeFunc(void (*func)(int width, int height)); 470 extern void GLAPIENTRY glutKeyboardFunc(void (*func)(unsigned char key, int x, int y)); 471 extern void GLAPIENTRY glutMouseFunc(void (*func)(int button, int state, int x, int y)); 472 extern void GLAPIENTRY glutMotionFunc(void (*func)(int x, int y)); 473 extern void GLAPIENTRY glutPassiveMotionFunc(void (*func)(int x, int y)); 474 extern void GLAPIENTRY glutEntryFunc(void (*func)(int state)); 475 extern void GLAPIENTRY glutVisibilityFunc(void (*func)(int state)); 476 extern void GLAPIENTRY glutIdleFunc(void (*func)(void)); 477 extern void GLAPIENTRY glutTimerFunc(unsigned int millis, void (*func)(int value), int value); 478 extern void GLAPIENTRY glutMenuStateFunc(void (*func)(int state)); 479 479 #if (GLUT_API_VERSION >= 2) 480 extern void APIENTRY glutSpecialFunc(void (*func)(int key, int x, int y));481 extern void APIENTRY glutSpaceballMotionFunc(void (*func)(int x, int y, int z));482 extern void APIENTRY glutSpaceballRotateFunc(void (*func)(int x, int y, int z));483 extern void APIENTRY glutSpaceballButtonFunc(void (*func)(int button, int state));484 extern void APIENTRY glutButtonBoxFunc(void (*func)(int button, int state));485 extern void APIENTRY glutDialsFunc(void (*func)(int dial, int value));486 extern void APIENTRY glutTabletMotionFunc(void (*func)(int x, int y));487 extern void APIENTRY glutTabletButtonFunc(void (*func)(int button, int state, int x, int y));488 #if (GLUT_API_VERSION >= 3) 489 extern void APIENTRY glutMenuStatusFunc(void (*func)(int status, int x, int y));490 extern void APIENTRY glutOverlayDisplayFunc(void (*func)(void));480 extern void GLAPIENTRY glutSpecialFunc(void (*func)(int key, int x, int y)); 481 extern void GLAPIENTRY glutSpaceballMotionFunc(void (*func)(int x, int y, int z)); 482 extern void GLAPIENTRY glutSpaceballRotateFunc(void (*func)(int x, int y, int z)); 483 extern void GLAPIENTRY glutSpaceballButtonFunc(void (*func)(int button, int state)); 484 extern void GLAPIENTRY glutButtonBoxFunc(void (*func)(int button, int state)); 485 extern void GLAPIENTRY glutDialsFunc(void (*func)(int dial, int value)); 486 extern void GLAPIENTRY glutTabletMotionFunc(void (*func)(int x, int y)); 487 extern void GLAPIENTRY glutTabletButtonFunc(void (*func)(int button, int state, int x, int y)); 488 #if (GLUT_API_VERSION >= 3) 489 extern void GLAPIENTRY glutMenuStatusFunc(void (*func)(int status, int x, int y)); 490 extern void GLAPIENTRY glutOverlayDisplayFunc(void (*func)(void)); 491 491 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) 492 extern void APIENTRY glutWindowStatusFunc(void (*func)(int state));492 extern void GLAPIENTRY glutWindowStatusFunc(void (*func)(int state)); 493 493 #endif 494 494 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) 495 extern void APIENTRY glutKeyboardUpFunc(void (*func)(unsigned char key, int x, int y));496 extern void APIENTRY glutSpecialUpFunc(void (*func)(int key, int x, int y));497 extern void APIENTRY glutJoystickFunc(void (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);495 extern void GLAPIENTRY glutKeyboardUpFunc(void (*func)(unsigned char key, int x, int y)); 496 extern void GLAPIENTRY glutSpecialUpFunc(void (*func)(int key, int x, int y)); 497 extern void GLAPIENTRY glutJoystickFunc(void (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval); 498 498 #endif 499 499 #endif … … 501 501 502 502 /* GLUT color index sub-API. */ 503 extern void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue);504 extern GLfloat APIENTRY glutGetColor(int ndx, int component);505 extern void APIENTRY glutCopyColormap(int win);503 extern void GLAPIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue); 504 extern GLfloat GLAPIENTRY glutGetColor(int ndx, int component); 505 extern void GLAPIENTRY glutCopyColormap(int win); 506 506 507 507 /* GLUT state retrieval sub-API. */ 508 extern int APIENTRY glutGet(GLenum type);509 extern int APIENTRY glutDeviceGet(GLenum type);508 extern int GLAPIENTRY glutGet(GLenum type); 509 extern int GLAPIENTRY glutDeviceGet(GLenum type); 510 510 #if (GLUT_API_VERSION >= 2) 511 511 /* GLUT extension support sub-API */ 512 extern int APIENTRY glutExtensionSupported(const char *name);513 #endif 514 #if (GLUT_API_VERSION >= 3) 515 extern int APIENTRY glutGetModifiers(void);516 extern int APIENTRY glutLayerGet(GLenum type);512 extern int GLAPIENTRY glutExtensionSupported(const char *name); 513 #endif 514 #if (GLUT_API_VERSION >= 3) 515 extern int GLAPIENTRY glutGetModifiers(void); 516 extern int GLAPIENTRY glutLayerGet(GLenum type); 517 517 #endif 518 518 519 519 /* GLUT font sub-API */ 520 extern void APIENTRY glutBitmapCharacter(void *font, int character);521 extern int APIENTRY glutBitmapWidth(void *font, int character);522 extern void APIENTRY glutStrokeCharacter(void *font, int character);523 extern int APIENTRY glutStrokeWidth(void *font, int character);520 extern void GLAPIENTRY glutBitmapCharacter(void *font, int character); 521 extern int GLAPIENTRY glutBitmapWidth(void *font, int character); 522 extern void GLAPIENTRY glutStrokeCharacter(void *font, int character); 523 extern int GLAPIENTRY glutStrokeWidth(void *font, int character); 524 524 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) 525 extern int APIENTRY glutBitmapLength(void *font, const unsigned char *string);526 extern int APIENTRY glutStrokeLength(void *font, const unsigned char *string);525 extern int GLAPIENTRY glutBitmapLength(void *font, const unsigned char *string); 526 extern int GLAPIENTRY glutStrokeLength(void *font, const unsigned char *string); 527 527 #endif 528 528 529 529 /* GLUT pre-built models sub-API */ 530 extern void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);531 extern void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);532 extern void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);533 extern void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);534 extern void APIENTRY glutWireCube(GLdouble size);535 extern void APIENTRY glutSolidCube(GLdouble size);536 extern void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);537 extern void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);538 extern void APIENTRY glutWireDodecahedron(void);539 extern void APIENTRY glutSolidDodecahedron(void);540 extern void APIENTRY glutWireTeapot(GLdouble size);541 extern void APIENTRY glutSolidTeapot(GLdouble size);542 extern void APIENTRY glutWireOctahedron(void);543 extern void APIENTRY glutSolidOctahedron(void);544 extern void APIENTRY glutWireTetrahedron(void);545 extern void APIENTRY glutSolidTetrahedron(void);546 extern void APIENTRY glutWireIcosahedron(void);547 extern void APIENTRY glutSolidIcosahedron(void);530 extern void GLAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks); 531 extern void GLAPIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks); 532 extern void GLAPIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); 533 extern void GLAPIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); 534 extern void GLAPIENTRY glutWireCube(GLdouble size); 535 extern void GLAPIENTRY glutSolidCube(GLdouble size); 536 extern void GLAPIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); 537 extern void GLAPIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); 538 extern void GLAPIENTRY glutWireDodecahedron(void); 539 extern void GLAPIENTRY glutSolidDodecahedron(void); 540 extern void GLAPIENTRY glutWireTeapot(GLdouble size); 541 extern void GLAPIENTRY glutSolidTeapot(GLdouble size); 542 extern void GLAPIENTRY glutWireOctahedron(void); 543 extern void GLAPIENTRY glutSolidOctahedron(void); 544 extern void GLAPIENTRY glutWireTetrahedron(void); 545 extern void GLAPIENTRY glutSolidTetrahedron(void); 546 extern void GLAPIENTRY glutWireIcosahedron(void); 547 extern void GLAPIENTRY glutSolidIcosahedron(void); 548 548 549 549 #if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) 550 550 /* GLUT video resize sub-API. */ 551 extern int APIENTRY glutVideoResizeGet(GLenum param);552 extern void APIENTRY glutSetupVideoResizing(void);553 extern void APIENTRY glutStopVideoResizing(void);554 extern void APIENTRY glutVideoResize(int x, int y, int width, int height);555 extern void APIENTRY glutVideoPan(int x, int y, int width, int height);551 extern int GLAPIENTRY glutVideoResizeGet(GLenum param); 552 extern void GLAPIENTRY glutSetupVideoResizing(void); 553 extern void GLAPIENTRY glutStopVideoResizing(void); 554 extern void GLAPIENTRY glutVideoResize(int x, int y, int width, int height); 555 extern void GLAPIENTRY glutVideoPan(int x, int y, int width, int height); 556 556 557 557 /* GLUT debugging sub-API. */ 558 extern void APIENTRY glutReportErrors(void);558 extern void GLAPIENTRY glutReportErrors(void); 559 559 #endif 560 560 … … 572 572 #define GLUT_JOYSTICK_BUTTON_D 8 573 573 574 extern void APIENTRY glutIgnoreKeyRepeat(int ignore);575 extern void APIENTRY glutSetKeyRepeat(int repeatMode);576 extern void APIENTRY glutForceJoystickFunc(void);574 extern void GLAPIENTRY glutIgnoreKeyRepeat(int ignore); 575 extern void GLAPIENTRY glutSetKeyRepeat(int repeatMode); 576 extern void GLAPIENTRY glutForceJoystickFunc(void); 577 577 578 578 /* GLUT game mode sub-API. */ … … 586 586 #define GLUT_GAME_MODE_DISPLAY_CHANGED 6 587 587 588 extern void APIENTRY glutGameModeString(const char *string);589 extern int APIENTRY glutEnterGameMode(void);590 extern void APIENTRY glutLeaveGameMode(void);591 extern int APIENTRY glutGameModeGet(GLenum mode);588 extern void GLAPIENTRY glutGameModeString(const char *string); 589 extern int GLAPIENTRY glutEnterGameMode(void); 590 extern void GLAPIENTRY glutLeaveGameMode(void); 591 extern int GLAPIENTRY glutGameModeGet(GLenum mode); 592 592 #endif 593 593 -
trunk/src/opengl/mesa/GL/gl.h
r2938 r2945 1 /* $Id: gl.h,v 1. 1 2000-02-29 00:43:31sandervl Exp $ */1 /* $Id: gl.h,v 1.2 2000-02-29 13:56:52 sandervl Exp $ */ 2 2 3 3 /* … … 1043 1043 1044 1044 } 1045 #if def CENTERLINE_CLPP1045 #if defined(CENTERLINE_CLPP) || defined(__cplusplus) 1046 1046 /* CenterLine C++ workaround: */ 1047 1047 gl_enum; -
trunk/src/opengl/mesa/GL/glu.h
r2938 r2945 1 /* $Id: glu.h,v 1. 1 2000-02-29 00:43:31sandervl Exp $ */1 /* $Id: glu.h,v 1.2 2000-02-29 13:56:52 sandervl Exp $ */ 2 2 3 3 /* … … 78 78 #define GLU_FALSE GL_FALSE 79 79 80 #define GLU_TESS_MAX_COORD 1.0e150 81 80 82 81 83 enum { … … 132 134 GLU_TESS_ERROR8 = 100158, /* */ 133 135 136 GLU_TESS_MISSING_BEGIN_POLYGON = GLU_TESS_ERROR1, 137 GLU_TESS_MISSING_BEGIN_CONTOUR = GLU_TESS_ERROR2, 138 GLU_TESS_MISSING_END_POLYGON = GLU_TESS_ERROR3, 139 GLU_TESS_MISSING_END_CONTOUR = GLU_TESS_ERROR4, 140 GLU_TESS_COORD_TOO_LARGE = GLU_TESS_ERROR5, 141 GLU_TESS_NEED_COMBINE_CALLBACK = GLU_TESS_ERROR6, 142 134 143 /* NURBS */ 144 GLU_NURBS_MODE = 100160, 145 GLU_NURBS_TESSELLATOR = 100161, 146 GLU_NURBS_RENDERER = 100162, 147 GLU_NURBS_BEGIN = 100164, 148 GLU_NURBS_VERTEX = 100165, 149 GLU_NURBS_NORMAL = 100166, 150 GLU_NURBS_COLOR = 100167, 151 GLU_NURBS_TEXTURE_COORD = 100168, 152 GLU_NURBS_END = 100169, 153 GLU_NURBS_BEGIN_DATA = 100170, 154 GLU_NURBS_VERTEX_DATA = 100171, 155 GLU_NURBS_NORMAL_DATA = 100172, 156 GLU_NURBS_COLOR_DATA = 100173, 157 GLU_NURBS_TEXTURE_COORD_DATA = 100174, 158 GLU_NURBS_END_DATA = 100175, 159 135 160 GLU_AUTO_LOAD_MATRIX = 100200, 136 161 GLU_CULLING = 100201, … … 141 166 GLU_U_STEP = 100206, 142 167 GLU_V_STEP = 100207, 168 GLU_OBJECT_PARAMETRIC_ERROR = 100208, 169 GLU_OBJECT_PATH_LENGTH = 100209, 170 171 GLU_MAP1_TRIM_2 = 100210, 172 GLU_MAP1_TRIM_3 = 100211, 143 173 144 174 GLU_PATH_LENGTH = 100215, … … 146 176 GLU_DOMAIN_DISTANCE = 100217, 147 177 148 GLU_MAP1_TRIM_2 = 100210,149 GLU_MAP1_TRIM_3 = 100211,150 151 178 GLU_OUTLINE_POLYGON = 100240, 152 179 GLU_OUTLINE_PATCH = 100241, 180 181 GLU_ERROR = GLU_TESS_ERROR, 182 GLU_NURBS_ERROR = GLU_ERROR, /* FIXME: is this correct?? */ 153 183 154 184 GLU_NURBS_ERROR1 = 100251, /* spline order un-supported */ … … 195 225 GLU_OUT_OF_MEMORY = 100902, 196 226 GLU_INCOMPATIBLE_GL_VERSION = 100903, 227 GLU_INVALID_OPERATION = 100904, 197 228 198 229 /* New in GLU 1.1 */ … … 213 244 GLU_VERTEX = GLU_TESS_VERTEX, 214 245 GLU_END = GLU_TESS_END, 215 GLU_ERROR = GLU_TESS_ERROR,216 246 GLU_EDGE_FLAG = GLU_TESS_EDGE_FLAG 217 247 }; … … 404 434 void (GLCALLBACK *fn)() ); 405 435 436 GLUAPI GLboolean GLAPIENTRY gluCheckExtension(const GLubyte *extName, 437 const GLubyte *extString); 406 438 407 439
Note:
See TracChangeset
for help on using the changeset viewer.
