Somewhat normalized the style of this file.

Also moved the "glutMouseWheelFunc" extension down into the "extensions"
part of the table.  (Purely internal organization.  It will still be
found.)


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@313 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-07 08:06:10 +00:00
parent d8b2c1d571
commit 85b7b49ead

View File

@ -33,12 +33,14 @@
#include "freeglut_internal.h"
struct name_address_pair {
const char *name;
void *address;
struct name_address_pair
{
const char *name;
void *address;
};
static struct name_address_pair glut_functions[] = {
static struct name_address_pair glut_functions[] =
{
{ "glutInit", (void *) glutInit },
{ "glutInitDisplayMode", (void *) glutInitDisplayMode },
{ "glutInitDisplayString", (void *) glutInitDisplayString },
@ -87,7 +89,6 @@ static struct name_address_pair glut_functions[] = {
{ "glutReshapeFunc", (void *) glutReshapeFunc },
{ "glutKeyboardFunc", (void *) glutKeyboardFunc },
{ "glutMouseFunc", (void *) glutMouseFunc },
{ "glutMouseWheelFunc", (void *) glutMouseWheelFunc },
{ "glutMotionFunc", (void *) glutMotionFunc },
{ "glutPassiveMotionFunc", (void *) glutPassiveMotionFunc },
{ "glutEntryFunc", (void *) glutEntryFunc },
@ -174,25 +175,25 @@ static struct name_address_pair glut_functions[] = {
{ "glutWireSierpinskiSponge ", (void *) glutWireSierpinskiSponge },
{ "glutSolidSierpinskiSponge ", (void *) glutSolidSierpinskiSponge },
{ "glutGetProcAddress", (void *) glutGetProcAddress },
{ "glutMouseWheelFunc", (void *) glutMouseWheelFunc },
{ NULL, NULL }
};
void * FGAPIENTRY glutGetProcAddress(const char *procName)
void *FGAPIENTRY glutGetProcAddress( const char *procName )
{
/* Try GLUT functions first */
int i;
for (i = 0; glut_functions[i].name; i++) {
if (strcmp(glut_functions[i].name, procName) == 0)
return glut_functions[i].address;
}
/* Try GLUT functions first */
int i;
for( i = 0; glut_functions[ i ].name; i++ )
if( strcmp( glut_functions[ i ].name, procName ) == 0)
return glut_functions[ i ].address;
/* Try core GL functions */
/* Try core GL functions */
#if TARGET_HOST_WIN32
return (void *) wglGetProcAddress((LPCSTR) procName);
#elif TARGET_HOST_UNIX_X11 && defined(GLX_ARB_get_proc_address)
return (void *) glXGetProcAddressARB((const GLubyte *) procName);
return( void * )wglGetProcAddress( ( LPCSTR )procName );
#elif TARGET_HOST_UNIX_X11 && defined( GLX_ARB_get_proc_address )
return(void * )glXGetProcAddressARB( ( const GLubyte * )procName );
#else
return NULL;
return NULL;
#endif
}