[Plib-cvs] plib/src/pui pu.h,1.122,1.123 puFont.cxx,1.18,1.19 puLocal.h,1.8,1.9

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv14316

Modified Files:
	pu.h puFont.cxx puLocal.h 
Log Message:
pu.h no longer depends on glut.h

Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- pu.h	1 Sep 2002 02:51:42 -0000	1.122
+++ pu.h	1 Sep 2002 07:45:08 -0000	1.123
@@ -35,24 +35,6 @@
 #define _PU_USE_GLUT_FONTS   1
 #endif
 
-/*
-  Include GLUT
- */
-
-#ifndef PU_NOT_USING_GLUT
-#  ifdef FREEGLUT_IS_PRESENT
-#    include <GL/freeglut.h>
-#  else
[...69 lines suppressed...]
-#define PU_KEY_F6        (GLUT_KEY_F6        + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_F7        (GLUT_KEY_F7        + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_F8        (GLUT_KEY_F8        + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_F9        (GLUT_KEY_F9        + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_F10       (GLUT_KEY_F10       + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_F11       (GLUT_KEY_F11       + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_F12       (GLUT_KEY_F12       + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_LEFT      (GLUT_KEY_LEFT      + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_UP        (GLUT_KEY_UP        + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_RIGHT     (GLUT_KEY_RIGHT     + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_DOWN      (GLUT_KEY_DOWN      + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_PAGE_UP   (GLUT_KEY_PAGE_UP   + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_PAGE_DOWN (GLUT_KEY_PAGE_DOWN + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_HOME      (GLUT_KEY_HOME      + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_END       (GLUT_KEY_END       + PU_KEY_GLUT_SPECIAL_OFFSET)
-#define PU_KEY_INSERT    (GLUT_KEY_INSERT    + PU_KEY_GLUT_SPECIAL_OFFSET)
-#endif
 
 #define PUARROW_UP         0
 #define PUARROW_DOWN       1

Index: puFont.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFont.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- puFont.cxx	21 Aug 2002 18:36:15 -0000	1.18
+++ puFont.cxx	1 Sep 2002 07:45:08 -0000	1.19
@@ -55,6 +55,19 @@
 #endif // #ifdef _PU_USE_GLUT_FONTS
 
 
+puFont::puFont ()
+{
+#ifdef _PU_USE_GLUT_FONTS
+  glut_font_handle = GLUT_BITMAP_8_BY_13 ;
+  fnt_font_handle  = NULL ;
+#else
+  fnt_font_handle  = &PUFONT_TXF_TYPEWRITER ;
+  pointsize = 13 ;
+  slant = 0 ;
+#endif
+}
+
+
 float puFont::getFloatStringWidth ( const char *str ) const
 {
   if ( str == NULL )

Index: puLocal.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puLocal.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- puLocal.h	7 Nov 2001 23:51:09 -0000	1.8
+++ puLocal.h	1 Sep 2002 07:45:08 -0000	1.9
@@ -23,3 +23,20 @@
 
 
 #include "pu.h"
+
+/*
+  Include GLUT
+ */
+
+#ifndef PU_NOT_USING_GLUT
+#  ifdef FREEGLUT_IS_PRESENT
+#    include <GL/freeglut.h>
+#  else
+#    ifdef __APPLE__
+#      include <GLUT/glut.h>
+#    else
+#      include <GL/glut.h>
+#    endif
+#  endif
+#endif
+