plib-cvs

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

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

Modified Files:
	widget_list.cxx complex.cxx PointPicker.cxx 
Log Message:
Updated for the new font file locations

Index: widget_list.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/widget_list.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- widget_list.cxx	21 Dec 2001 12:48:56 -0000	1.10
+++ widget_list.cxx	15 Aug 2002 00:35:36 -0000	1.11
@@ -192,7 +192,7 @@
 #endif
 
   tim = new fntTexFont ;
-  tim -> load ( "../fnt/data/times_bold.txf" ) ;
+  tim -> load ( "../fnt/data/old/old/times_bold.txf" ) ;
   puFont times_medium ( tim, 12 ) ;
   puSetDefaultFonts        ( times_medium, times_medium ) ;
   puSetDefaultStyle        ( PUSTYLE_SMALL_SHADED ) ;
@@ -213,7 +213,7 @@
   glutPassiveMotionFunc ( motionfn  ) ;
 #endif
[...157 lines suppressed...]
   large_input = new puLargeInput ( 10, 10, 240, 180, 2, 20 ) ;
   large_input->setLabel ( "Label" ) ;
@@ -611,7 +611,7 @@
   glutPassiveMotionFunc ( motionfn  ) ;
 #endif
 
-  tim -> load ( "../fnt/data/times_bold.txf" ) ;
+  tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
 
   char *combo_box_entries [] = { "First Entry", "Second Entry", "Third Entry", "Fourth Entry", "Sixth Entry", "Seventh Entry", NULL } ;
   combo_box = new puComboBox ( 10, 158, 250, 190,
@@ -633,7 +633,7 @@
   glutPassiveMotionFunc ( motionfn  ) ;
 #endif
 
-  tim -> load ( "../fnt/data/times_bold.txf" ) ;
+  tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
 
   glEnable ( GL_BLEND ) ;
   glAlphaFunc ( GL_GEQUAL, 0.1f ) ;

Index: complex.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/complex.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- complex.cxx	20 Dec 2001 15:50:55 -0000	1.18
+++ complex.cxx	15 Aug 2002 00:35:36 -0000	1.19
@@ -461,8 +461,8 @@
 
   hel = new fntTexFont ;
   tim = new fntTexFont ;
-  hel -> load ( "../fnt/data/helvetica_medium.txf" ) ;
-  tim -> load ( "../fnt/data/times_medium.txf" ) ;
+  hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
   puFont helvetica ( hel, 15 ) ;
   puFont times_medium ( tim, 13 ) ;
   puSetDefaultFonts        ( helvetica, times_medium ) ;
@@ -508,8 +508,8 @@
   glutIdleFunc          ( sliderdisplayfn ) ;
 
   //load the texture for the 2nd window
-  hel -> load ( "../fnt/data/helvetica_medium.txf" ) ;
-  tim -> load ( "../fnt/data/times_medium.txf" ) ;
+  hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
 
   puGroup *slider_group = new puGroup ( 0, 0 ) ;  // Necessary so that "sliderdisplayfn" will draw all widgets
 
@@ -542,8 +542,8 @@
   glutHideWindow        () ;
 
   //load the texture for the save window
-  hel -> load ( "../fnt/data/helvetica_medium.txf" ) ;
-  tim -> load ( "../fnt/data/times_medium.txf" ) ;
+  hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
 
   // Coordinate Selection Window
 
@@ -560,8 +560,8 @@
   glutReshapeFunc       ( coordreshapefn ) ;
 
   //load the texture for the 2nd window
-  hel -> load ( "../fnt/data/helvetica_medium.txf" ) ;
-  tim -> load ( "../fnt/data/times_medium.txf" ) ;
+  hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
 
   puGroup *coordinate_group = new puGroup ( 0, 0 ) ;  // Necessary so that "groupdisplayfn" will draw all widgets
 
@@ -591,8 +591,8 @@
 
   coordinate_group -> close () ;
 
-//  hel -> load ( "../fnt/data/helvetica_medium.txf" ) ;
-//  tim -> load ( "../fnt/data/times_medium.txf" ) ;
+//  hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+//  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
 
   glutMainLoop () ;
   return 0 ;

Index: PointPicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/PointPicker.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PointPicker.cxx	4 Jul 2002 00:35:05 -0000	1.11
+++ PointPicker.cxx	15 Aug 2002 00:35:36 -0000	1.12
@@ -337,7 +337,7 @@
   // Set up the font
 
   tim = new fntTexFont ;
-  tim -> load ( "../fnt/data/times_medium.txf" ) ;
+  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
   puFont times_medium ( tim, 15, 0.3f ) ;
   puSetDefaultFonts        ( times_medium, times_medium ) ;
   puSetDefaultStyle        ( PUSTYLE_SMALL_SHADED ) ;