FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fg_geometry: Enable supported geometry functions for GLES2

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1224 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-03-31 21:50:55 +00:00
parent 3da140426f
commit 40c07d20e5
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/include/GL/freeglut_ext.h
View File

@ -166,9 +166,11 @@ FGAPI void FGAPIENTRY glutStrokeString( void* font, const unsigned char *stri
#ifndef GL_ES_VERSION_2_0 #ifndef GL_ES_VERSION_2_0
FGAPI void FGAPIENTRY glutWireRhombicDodecahedron( void ); FGAPI void FGAPIENTRY glutWireRhombicDodecahedron( void );
FGAPI void FGAPIENTRY glutSolidRhombicDodecahedron( void ); FGAPI void FGAPIENTRY glutSolidRhombicDodecahedron( void );
#endif
FGAPI void FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, double offset[3], double scale ); FGAPI void FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, double offset[3], double scale );
FGAPI void FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, double offset[3], double scale ); FGAPI void FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, double offset[3], double scale );
#ifndef GL_ES_VERSION_2_0
FGAPI void FGAPIENTRY glutWireCylinder( double radius, double height, GLint slices, GLint stacks); FGAPI void FGAPIENTRY glutWireCylinder( double radius, double height, GLint slices, GLint stacks);
FGAPI void FGAPIENTRY glutSolidCylinder( double radius, double height, GLint slices, GLint stacks); FGAPI void FGAPIENTRY glutSolidCylinder( double radius, double height, GLint slices, GLint stacks);
#endif #endif

4
freeglut/freeglut/include/GL/freeglut_std.h
View File

@ -525,9 +525,9 @@ FGAPI int FGAPIENTRY glutStrokeLength( void* font, const unsigned char* stri
* Geometry functions, see freeglut_geometry.c * Geometry functions, see freeglut_geometry.c
*/ */
#ifndef GL_ES_VERSION_2_0
FGAPI void FGAPIENTRY glutWireCube( double size ); FGAPI void FGAPIENTRY glutWireCube( double size );
FGAPI void FGAPIENTRY glutSolidCube( double size ); FGAPI void FGAPIENTRY glutSolidCube( double size );
#ifndef GL_ES_VERSION_2_0
FGAPI void FGAPIENTRY glutWireSphere( double radius, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutWireSphere( double radius, GLint slices, GLint stacks );
FGAPI void FGAPIENTRY glutSolidSphere( double radius, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutSolidSphere( double radius, GLint slices, GLint stacks );
#endif #endif
@ -536,7 +536,6 @@ FGAPI void FGAPIENTRY glutWireCone( double base, double height, GLint slices,
FGAPI void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks ); FGAPI void FGAPIENTRY glutSolidCone( double base, double height, GLint slices, GLint stacks );
#endif #endif
#ifndef GL_ES_VERSION_2_0
FGAPI void FGAPIENTRY glutWireTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); FGAPI void FGAPIENTRY glutWireTorus( double innerRadius, double outerRadius, GLint sides, GLint rings );
FGAPI void FGAPIENTRY glutSolidTorus( double innerRadius, double outerRadius, GLint sides, GLint rings ); FGAPI void FGAPIENTRY glutSolidTorus( double innerRadius, double outerRadius, GLint sides, GLint rings );
FGAPI void FGAPIENTRY glutWireDodecahedron( void ); FGAPI void FGAPIENTRY glutWireDodecahedron( void );
@ -547,7 +546,6 @@ FGAPI void FGAPIENTRY glutWireTetrahedron( void );
FGAPI void FGAPIENTRY glutSolidTetrahedron( void ); FGAPI void FGAPIENTRY glutSolidTetrahedron( void );
FGAPI void FGAPIENTRY glutWireIcosahedron( void ); FGAPI void FGAPIENTRY glutWireIcosahedron( void );
FGAPI void FGAPIENTRY glutSolidIcosahedron( void ); FGAPI void FGAPIENTRY glutSolidIcosahedron( void );
#endif
/* /*
* Teapot rendering functions, found in freeglut_teapot.c * Teapot rendering functions, found in freeglut_teapot.c

8
freeglut/freeglut/src/fg_ext.c
View File

@ -126,9 +126,11 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutStrokeWidth); CHECK_NAME(glutStrokeWidth);
CHECK_NAME(glutBitmapLength); CHECK_NAME(glutBitmapLength);
CHECK_NAME(glutStrokeLength); CHECK_NAME(glutStrokeLength);
#ifndef EGL_VERSION_1_0 #ifndef GL_ES_VERSION_2_0
CHECK_NAME(glutWireSphere); CHECK_NAME(glutWireSphere);
CHECK_NAME(glutSolidSphere); CHECK_NAME(glutSolidSphere);
#endif
#ifndef EGL_VERSION_1_0
CHECK_NAME(glutWireCone); CHECK_NAME(glutWireCone);
CHECK_NAME(glutSolidCone); CHECK_NAME(glutSolidCone);
CHECK_NAME(glutWireTorus); CHECK_NAME(glutWireTorus);
@ -138,7 +140,6 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutWireTeapot); CHECK_NAME(glutWireTeapot);
CHECK_NAME(glutSolidTeapot); CHECK_NAME(glutSolidTeapot);
#endif #endif
#ifndef GL_ES_VERSION_2_0
CHECK_NAME(glutWireCube); CHECK_NAME(glutWireCube);
CHECK_NAME(glutSolidCube); CHECK_NAME(glutSolidCube);
CHECK_NAME(glutWireDodecahedron); CHECK_NAME(glutWireDodecahedron);
@ -149,11 +150,12 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
CHECK_NAME(glutSolidTetrahedron); CHECK_NAME(glutSolidTetrahedron);
CHECK_NAME(glutWireIcosahedron); CHECK_NAME(glutWireIcosahedron);
CHECK_NAME(glutSolidIcosahedron); CHECK_NAME(glutSolidIcosahedron);
#ifndef EGL_VERSION_1_0
CHECK_NAME(glutWireRhombicDodecahedron); CHECK_NAME(glutWireRhombicDodecahedron);
CHECK_NAME(glutSolidRhombicDodecahedron); CHECK_NAME(glutSolidRhombicDodecahedron);
#endif
CHECK_NAME(glutWireSierpinskiSponge); CHECK_NAME(glutWireSierpinskiSponge);
CHECK_NAME(glutSolidSierpinskiSponge); CHECK_NAME(glutSolidSierpinskiSponge);
#endif
CHECK_NAME(glutVideoResizeGet); CHECK_NAME(glutVideoResizeGet);
CHECK_NAME(glutSetupVideoResizing); CHECK_NAME(glutSetupVideoResizing);
CHECK_NAME(glutStopVideoResizing); CHECK_NAME(glutStopVideoResizing);