projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drawing code for solid and wired now shared for all objects
[freeglut]
/
src
/
fg_ext.c
diff --git
a/src/fg_ext.c
b/src/fg_ext.c
index
a9a8a11
..
82b6304
100644
(file)
--- a/
src/fg_ext.c
+++ b/
src/fg_ext.c
@@
-126,24
+126,36
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutStrokeWidth);
CHECK_NAME(glutBitmapLength);
CHECK_NAME(glutStrokeLength);
CHECK_NAME(glutStrokeWidth);
CHECK_NAME(glutBitmapLength);
CHECK_NAME(glutStrokeLength);
+#ifndef GL_ES_VERSION_2_0
CHECK_NAME(glutWireSphere);
CHECK_NAME(glutSolidSphere);
CHECK_NAME(glutWireSphere);
CHECK_NAME(glutSolidSphere);
+#endif
+#ifndef EGL_VERSION_1_0
CHECK_NAME(glutWireCone);
CHECK_NAME(glutSolidCone);
CHECK_NAME(glutWireCone);
CHECK_NAME(glutSolidCone);
- CHECK_NAME(glutWireCube);
- CHECK_NAME(glutSolidCube);
CHECK_NAME(glutWireTorus);
CHECK_NAME(glutSolidTorus);
CHECK_NAME(glutWireTorus);
CHECK_NAME(glutSolidTorus);
- CHECK_NAME(glutWireDodecahedron);
- CHECK_NAME(glutSolidDodecahedron);
+ CHECK_NAME(glutWireCylinder);
+ CHECK_NAME(glutSolidCylinder);
CHECK_NAME(glutWireTeapot);
CHECK_NAME(glutSolidTeapot);
CHECK_NAME(glutWireTeapot);
CHECK_NAME(glutSolidTeapot);
+#endif
+ CHECK_NAME(glutWireCube);
+ CHECK_NAME(glutSolidCube);
+ CHECK_NAME(glutWireDodecahedron);
+ CHECK_NAME(glutSolidDodecahedron);
CHECK_NAME(glutWireOctahedron);
CHECK_NAME(glutSolidOctahedron);
CHECK_NAME(glutWireTetrahedron);
CHECK_NAME(glutSolidTetrahedron);
CHECK_NAME(glutWireIcosahedron);
CHECK_NAME(glutSolidIcosahedron);
CHECK_NAME(glutWireOctahedron);
CHECK_NAME(glutSolidOctahedron);
CHECK_NAME(glutWireTetrahedron);
CHECK_NAME(glutSolidTetrahedron);
CHECK_NAME(glutWireIcosahedron);
CHECK_NAME(glutSolidIcosahedron);
+#ifndef EGL_VERSION_1_0
+ CHECK_NAME(glutWireRhombicDodecahedron);
+ CHECK_NAME(glutSolidRhombicDodecahedron);
+#endif
+ CHECK_NAME(glutWireSierpinskiSponge);
+ CHECK_NAME(glutSolidSierpinskiSponge);
CHECK_NAME(glutVideoResizeGet);
CHECK_NAME(glutSetupVideoResizing);
CHECK_NAME(glutStopVideoResizing);
CHECK_NAME(glutVideoResizeGet);
CHECK_NAME(glutSetupVideoResizing);
CHECK_NAME(glutStopVideoResizing);
@@
-171,12
+183,6
@@
static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutStrokeHeight);
CHECK_NAME(glutBitmapString);
CHECK_NAME(glutStrokeString);
CHECK_NAME(glutStrokeHeight);
CHECK_NAME(glutBitmapString);
CHECK_NAME(glutStrokeString);
- CHECK_NAME(glutWireRhombicDodecahedron);
- CHECK_NAME(glutSolidRhombicDodecahedron);
- CHECK_NAME(glutWireSierpinskiSponge);
- CHECK_NAME(glutSolidSierpinskiSponge);
- CHECK_NAME(glutWireCylinder);
- CHECK_NAME(glutSolidCylinder);
CHECK_NAME(glutGetProcAddress);
CHECK_NAME(glutMouseWheelFunc);
CHECK_NAME(glutJoystickGetNumAxes);
CHECK_NAME(glutGetProcAddress);
CHECK_NAME(glutMouseWheelFunc);
CHECK_NAME(glutJoystickGetNumAxes);
@@
-213,8
+219,8
@@
glutGetProcAddress( const char *procName )
/* Try GLUT functions first, then core GL functions */
p = fghGetGLUTProcAddress( procName );
/* Try GLUT functions first, then core GL functions */
p = fghGetGLUTProcAddress( procName );
- /* Some GLUT functions are platform-specific: */
- if ( !p )
+ /* Some GLUT functions are platform-specific: */
+ if ( !p )
p = fgPlatformGetGLUTProcAddress( procName );
return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );
p = fgPlatformGetGLUTProcAddress( procName );
return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );