[Freeglut-cvs] SF.net SVN: freeglut:[1188] trunk/freeglut/freeglut/include/GL

[<be...@us...>]

Revision: 1188
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1188&view=rev
Author:   beuc
Date:     2012-03-17 22:13:58 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Identify more precisly where GLdouble->GLfloat is needed in freeglut header

Modified Paths:
--------------
    trunk/freeglut/freeglut/include/GL/freeglut_ext.h
    trunk/freeglut/freeglut/include/GL/freeglut_std.h

Modified: trunk/freeglut/freeglut/include/GL/freeglut_ext.h
===================================================================
--- trunk/freeglut/freeglut/include/GL/freeglut_ext.h	2012-03-17 19:29:49 UTC (rev 1187)
+++ trunk/freeglut/freeglut/include/GL/freeglut_ext.h	2012-03-17 22:13:58 UTC (rev 1188)
@@ -163,10 +163,18 @@
  */
 FGAPI void    FGAPIENTRY glutWireRhombicDodecahedron( void );
 FGAPI void    FGAPIENTRY glutSolidRhombicDodecahedron( void );
+
+#ifdef EGL_VERSION_1_0
+/* TODO: temporary work-around for missing GLdouble in GLES */
+#   define GLdouble     GLfloat
+#endif
 FGAPI void    FGAPIENTRY glutWireSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale );
 FGAPI void    FGAPIENTRY glutSolidSierpinskiSponge ( int num_levels, GLdouble offset[3], GLdouble scale );
 FGAPI void    FGAPIENTRY glutWireCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks);
 FGAPI void    FGAPIENTRY glutSolidCylinder( GLdouble radius, GLdouble height, GLint slices, GLint stacks);
+#ifdef EGL_VERSION_1_0
+#   undef GLdouble
+#endif
 
 /*
  * Extension functions, see freeglut_ext.c

Modified: trunk/freeglut/freeglut/include/GL/freeglut_std.h
===================================================================
--- trunk/freeglut/freeglut/include/GL/freeglut_std.h	2012-03-17 19:29:49 UTC (rev 1187)
+++ trunk/freeglut/freeglut/include/GL/freeglut_std.h	2012-03-17 22:13:58 UTC (rev 1188)
@@ -526,7 +526,7 @@
  */
 #ifdef EGL_VERSION_1_0
 /* TODO: temporary work-around for missing GLdouble in GLES */
-#   define GLdouble     GLfloat  
+#   define GLdouble     GLfloat
 #endif
 
 FGAPI void    FGAPIENTRY glutWireCube( GLdouble size );
@@ -553,6 +553,11 @@
 FGAPI void    FGAPIENTRY glutWireTeapot( GLdouble size );
 FGAPI void    FGAPIENTRY glutSolidTeapot( GLdouble size );
 
+#ifdef EGL_VERSION_1_0
+/* TODO: temporary work-around for missing GLdouble in GLES */
+#   undef GLdouble
+#endif
+
 /*
  * Game mode functions, see freeglut_gamemode.c
  */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.