plib-cvs — A read-only list that automatically announces CVS activity

[Plib-cvs] plib/examples INSTALL,1.2,1.3

[Wolfram K. <wol...@us...>]

Update of /cvsroot/plib/plib/examples
In directory usw-pr-cvs1:/tmp/cvs-serv32581

Modified Files:
	INSTALL 
Log Message:
Adding MSVC compilation notes.

Index: INSTALL
===================================================================
RCS file: /cvsroot/plib/plib/examples/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- INSTALL	19 Sep 2000 13:36:25 -0000	1.2
+++ INSTALL	1 Sep 2002 09:36:59 -0000	1.3
@@ -95,6 +95,13 @@
 one architecture, use `make distclean' before reconfiguring for another
 architecture.
 
+Compiling for Windows with MSVC
+===============================
+
+You can easily compile plib with MSVC 6. First compile plib
+itself. Then open the included workspace in MSVC, choose what you 
+want to compile (build/set active configuration) and then compile (F7). 
+
 Installation Names
 ==================
 

[Plib-cvs] plib/src/util ul.dsp,1.15,1.16

[Wolfram K. <wol...@us...>]

Update of /cvsroot/plib/plib/src/util
In directory usw-pr-cvs1:/tmp/cvs-serv32453

Modified Files:
	ul.dsp 
Log Message:
Adding ulRTTI.cxx. It is in makefile.am, so it should also be in the dsp file.

Index: ul.dsp
===================================================================
RCS file: /cvsroot/plib/plib/src/util/ul.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ul.dsp	1 Sep 2002 08:57:34 -0000	1.15
+++ ul.dsp	1 Sep 2002 09:36:29 -0000	1.16
@@ -122,6 +122,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\ulRTTI.cxx
+# End Source File
+# Begin Source File
+
 SOURCE=.\ulRTTI.h
 # End Source File
 # End Target

[Plib-cvs] plib/src/pui pu.h,1.124,1.125 puArrowButton.cxx,1.14,1.15 puBiSlider.cxx,1.20,1.21 puBox.cxx,1.8,1.9 puButton.cxx,1.18,1.19 puButtonBox.cxx,1.13,1.14 puComboBox.cxx,1.11,1.12 puDial.cxx,1.22,1.23 puDialogBox.cxx,1.3,1.4 puFilePicker.cxx,1.27,1.28 puFileSelector.cxx,1.25,1.26 puFont.cxx,1.19,1.20 puFrame.cxx,1.10,1.11 puGroup.cxx,1.21,1.22 puInput.cxx,1.26,1.27 puInterface.cxx,1.15,1.16 puLargeInput.cxx,1.36,1.37 puListBox.cxx,1.21,1.22 puMenuBar.cxx,1.16,1.17 puObject.cxx,1.45,1.46 puOneShot.cxx,1.3,1.4 puPopup.cxx,1.3,1.4 puPopupMenu.cxx,1.14,1.15 puRange.cxx,1.1,1.2 puScrollBar.cxx,1.1,1.2 puSelectBox.cxx,1.6,1.7 puSlider.cxx,1.23,1.24 puSpinBox.cxx,1.3,1.4 puText.cxx,1.5,1.6 puTriSlider.cxx,1.22,1.23 puValue.cxx,1.19,1.20 puVerticalMenu.cxx,1.7,1.8

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

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

Modified Files:
	pu.h puArrowButton.cxx puBiSlider.cxx puBox.cxx puButton.cxx 
	puButtonBox.cxx puComboBox.cxx puDial.cxx puDialogBox.cxx 
	puFilePicker.cxx puFileSelector.cxx puFont.cxx puFrame.cxx 
	puGroup.cxx puInput.cxx puInterface.cxx puLargeInput.cxx 
	puListBox.cxx puMenuBar.cxx puObject.cxx puOneShot.cxx 
	puPopup.cxx puPopupMenu.cxx puRange.cxx puScrollBar.cxx 
	puSelectBox.cxx puSlider.cxx puSpinBox.cxx puText.cxx 
	puTriSlider.cxx puValue.cxx puVerticalMenu.cxx 
Log Message:
Added ulRTTI system

Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- pu.h	1 Sep 2002 09:15:50 -0000	1.124
+++ pu.h	1 Sep 2002 09:36:50 -0000	1.125
@@ -25,6 +25,7 @@
 #define _PU_H_ 1
 
 #include "fnt.h"
+#include "ulRTTI.h"
 
 /*
   Configuration
@@ -378,7 +379,7 @@
 
 class puValue
 {
[...247 lines suppressed...]
 protected:
   int num_lines ;              // Number of lines of text in the box
@@ -1932,7 +1942,7 @@
 
 class puComboBox : public puGroup
 {
-  
+  UL_TYPE_DATA
 
 protected:
   char ** list  ;
@@ -1989,7 +1999,7 @@
 
 class puSelectBox : public puGroup
 {
-  
+  UL_TYPE_DATA
 
 protected:
   char ** list  ;

Index: puArrowButton.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puArrowButton.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- puArrowButton.cxx	12 Jul 2002 02:57:19 -0000	1.14
+++ puArrowButton.cxx	1 Sep 2002 09:36:50 -0000	1.15
@@ -1,27 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
+
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puArrowButton,puButton)
+
 
 void puDrawArrowButtonTriangle ( int pos_x, int pos_y, int size_x, int size_y,
                                  puColour colour, int arrow_type, int active )

Index: puBiSlider.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puBiSlider.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- puBiSlider.cxx	3 Aug 2002 22:44:48 -0000	1.20
+++ puBiSlider.cxx	1 Sep 2002 09:36:51 -0000	1.21
@@ -1,27 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
+
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puBiSlider,puSlider)
+
 
 void puBiSlider::draw ( int dx, int dy )
 {

Index: puBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puBox.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- puBox.cxx	7 Nov 2001 23:51:09 -0000	1.8
+++ puBox.cxx	1 Sep 2002 09:36:51 -0000	1.9
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$

Index: puButton.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puButton.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- puButton.cxx	9 Dec 2001 17:43:13 -0000	1.18
+++ puButton.cxx	1 Sep 2002 09:36:51 -0000	1.19
@@ -1,29 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
 
-
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puButton,puObject)
+
 
 void puButton::draw ( int dx, int dy )
 {

Index: puButtonBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puButtonBox.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- puButtonBox.cxx	10 Nov 2001 13:37:38 -0000	1.13
+++ puButtonBox.cxx	1 Sep 2002 09:36:51 -0000	1.14
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,6 +23,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puButtonBox,puObject)
+
 
 puButtonBox::puButtonBox ( int minx, int miny, int maxx, int maxy,
                 char **labels, int one_button ) :

Index: puComboBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puComboBox.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- puComboBox.cxx	10 Nov 2001 22:09:57 -0000	1.11
+++ puComboBox.cxx	1 Sep 2002 09:36:51 -0000	1.12
@@ -1,27 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
+
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puComboBox,puGroup)
+
 
 void puComboBox::input_down_cb ( puObject *inp )
 {

Index: puDial.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puDial.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- puDial.cxx	12 Jul 2002 02:57:19 -0000	1.22
+++ puDial.cxx	1 Sep 2002 09:36:51 -0000	1.23
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puDial,puRange)
+
+
 void puDial::draw ( int dx, int dy )
 {
   if ( !visible || ( window != puGetWindow () ) ) return ;

Index: puDialogBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puDialogBox.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- puDialogBox.cxx	7 Nov 2001 23:51:09 -0000	1.3
+++ puDialogBox.cxx	1 Sep 2002 09:36:51 -0000	1.4
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -24,4 +24,5 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puDialogBox,puPopup)
 

Index: puFilePicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFilePicker.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- puFilePicker.cxx	20 Jun 2002 20:07:53 -0000	1.27
+++ puFilePicker.cxx	1 Sep 2002 09:36:51 -0000	1.28
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -41,6 +41,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puFilePicker,puDialogBox)
+
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #define DOTDOTSLASH "..\\"

Index: puFileSelector.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFileSelector.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- puFileSelector.cxx	7 Jul 2002 19:05:56 -0000	1.25
+++ puFileSelector.cxx	1 Sep 2002 09:36:51 -0000	1.26
@@ -43,6 +43,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puFileSelector,puDialogBox)
+
+
 #if defined(WIN32) && !defined(__CYGWIN__)
 #define DOTDOTSLASH "..\\"
 #define SLASH       "\\"

Index: puFont.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFont.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- puFont.cxx	1 Sep 2002 07:45:08 -0000	1.19
+++ puFont.cxx	1 Sep 2002 09:36:51 -0000	1.20
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$

Index: puFrame.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFrame.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- puFrame.cxx	7 Nov 2001 23:51:09 -0000	1.10
+++ puFrame.cxx	1 Sep 2002 09:36:51 -0000	1.11
@@ -1,29 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
 
-
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puFrame,puObject)
+
 
 void puFrame::draw ( int dx, int dy )
 {

Index: puGroup.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puGroup.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- puGroup.cxx	3 Aug 2002 22:44:48 -0000	1.21
+++ puGroup.cxx	1 Sep 2002 09:36:51 -0000	1.22
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,6 +23,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puGroup,puObject)
+
 
 #define PUSTACK_MAX 100
 

Index: puInput.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puInput.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- puInput.cxx	3 Aug 2002 22:44:48 -0000	1.26
+++ puInput.cxx	1 Sep 2002 09:36:51 -0000	1.27
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puInput,puObject)
+
+
 void puInput::normalize_cursors ( void )
 {
   int sl = strlen ( getStringValue () ) ;

Index: puInterface.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puInterface.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- puInterface.cxx	3 Aug 2002 22:44:48 -0000	1.15
+++ puInterface.cxx	1 Sep 2002 09:36:51 -0000	1.16
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,6 +23,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puInterface,puGroup)
+
 
 #define PUSTACK_MAX 100
 

Index: puLargeInput.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puLargeInput.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- puLargeInput.cxx	24 Aug 2002 23:18:37 -0000	1.36
+++ puLargeInput.cxx	1 Sep 2002 09:36:51 -0000	1.37
@@ -1,27 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
+
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puLargeInput,puInput)
+
 
 // Callbacks from the internal widgets
 

Index: puListBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puListBox.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- puListBox.cxx	7 Jul 2002 02:01:12 -0000	1.21
+++ puListBox.cxx	1 Sep 2002 09:36:51 -0000	1.22
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -39,6 +39,9 @@
 ****/
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puListBox,puButton)
+
 
 puListBox::puListBox  ( int minx, int miny, int maxx, int maxy, char** _list ) :
                puButton ( minx, miny, maxx, maxy )

Index: puMenuBar.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puMenuBar.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- puMenuBar.cxx	21 Aug 2002 18:36:15 -0000	1.16
+++ puMenuBar.cxx	1 Sep 2002 09:36:51 -0000	1.17
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puMenuBar,puInterface)
+
+
 void puMenuBar_drop_down_the_menu ( puObject *b )
 {
   // Inputs:  b = pointer to the button on the menu which has been pushed

Index: puObject.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puObject.cxx,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- puObject.cxx	3 Aug 2002 22:44:48 -0000	1.45
+++ puObject.cxx	1 Sep 2002 09:36:51 -0000	1.46
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,6 +23,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puObject,puValue)
+
 
 inline float clamp01 ( float x )
 {

Index: puOneShot.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puOneShot.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- puOneShot.cxx	7 Nov 2001 23:51:09 -0000	1.3
+++ puOneShot.cxx	1 Sep 2002 09:36:51 -0000	1.4
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,6 +23,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puOneShot,puButton)
+
 
 void puOneShot::doHit ( int button, int updown, int x, int y )
 {

Index: puPopup.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puPopup.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- puPopup.cxx	7 Nov 2001 23:51:09 -0000	1.3
+++ puPopup.cxx	1 Sep 2002 09:36:51 -0000	1.4
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,4 +23,6 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puPopup,puInterface)
 

Index: puPopupMenu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puPopupMenu.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- puPopupMenu.cxx	11 Aug 2002 17:53:49 -0000	1.14
+++ puPopupMenu.cxx	1 Sep 2002 09:36:51 -0000	1.15
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puPopupMenu,puPopup)
+
+
 puObject *puPopupMenu::add_item ( const char *str, puCallback _cb )
 {
   int w, h ;

Index: puRange.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puRange.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- puRange.cxx	12 Jul 2002 02:57:19 -0000	1.1
+++ puRange.cxx	1 Sep 2002 09:36:51 -0000	1.2
@@ -23,8 +23,5 @@
 
 #include "puLocal.h"
 
-
-
-
-
+UL_RTTI_DEF1(puRange,puObject)
 

Index: puScrollBar.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puScrollBar.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- puScrollBar.cxx	3 Aug 2002 22:44:48 -0000	1.1
+++ puScrollBar.cxx	1 Sep 2002 09:36:51 -0000	1.2
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puScrollBar,puSlider)
+
+
 void puScrollBar::draw ( int dx, int dy )
 {
   extern void puDrawArrowButtonTriangle ( int pos_x, int pos_y, int size_x, int size_y,

Index: puSelectBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puSelectBox.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- puSelectBox.cxx	10 Nov 2001 22:10:11 -0000	1.6
+++ puSelectBox.cxx	1 Sep 2002 09:36:51 -0000	1.7
@@ -1,27 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
+
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puSelectBox,puGroup)
+
 
 void puSelectBox::handle_arrow ( puObject *arrow )
 {

Index: puSlider.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puSlider.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- puSlider.cxx	12 Jul 2002 02:57:19 -0000	1.23
+++ puSlider.cxx	1 Sep 2002 09:36:51 -0000	1.24
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puSlider,puRange)
+
+
 void puSlider::draw_slider_box ( int dx, int dy, const puBox &box, float val, const char *box_label )
 {
   int sd, od ;

Index: puSpinBox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puSpinBox.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- puSpinBox.cxx	3 Aug 2002 22:44:48 -0000	1.3
+++ puSpinBox.cxx	1 Sep 2002 09:36:51 -0000	1.4
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF1(puSpinBox,puRange)
+
+
 void puSpinBox::draw ( int dx, int dy )
 {
   extern void puDrawArrowButtonTriangle ( int pos_x, int pos_y, int size_x, int size_y,

Index: puText.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puText.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- puText.cxx	7 Nov 2001 23:51:09 -0000	1.5
+++ puText.cxx	1 Sep 2002 09:36:51 -0000	1.6
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,6 +23,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puText,puObject)
+
 
 void puText::draw ( int dx, int dy )
 {

Index: puTriSlider.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puTriSlider.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- puTriSlider.cxx	21 Aug 2002 22:05:13 -0000	1.22
+++ puTriSlider.cxx	1 Sep 2002 09:36:51 -0000	1.23
@@ -1,27 +1,31 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
 */
 
+
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puTriSlider,puBiSlider)
+
 
 void puTriSlider::draw ( int dx, int dy )
 {

Index: puValue.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puValue.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- puValue.cxx	11 Jun 2002 19:35:12 -0000	1.19
+++ puValue.cxx	1 Sep 2002 09:36:51 -0000	1.20
@@ -24,6 +24,9 @@
 
 #include "puLocal.h"
 
+UL_RTTI_DEF(puValue)
+
+
 inline void skip_whitespace ( const char **str )
 {
   while ( isspace ( **str ) != 0 )

Index: puVerticalMenu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puVerticalMenu.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- puVerticalMenu.cxx	12 Jul 2002 03:23:33 -0000	1.7
+++ puVerticalMenu.cxx	1 Sep 2002 09:36:51 -0000	1.8
@@ -1,21 +1,21 @@
 /*
      PLIB - A Suite of Portable Game Libraries
      Copyright (C) 2001  Steve Baker
- 
+
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Library General Public
      License as published by the Free Software Foundation; either
      version 2 of the License, or (at your option) any later version.
- 
+
      This library is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Library General Public License for more details.
- 
+
      You should have received a copy of the GNU Library General Public
      License along with this library; if not, write to the Free Software
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- 
+
      For further information visit http://plib.sourceforge.net
 
      $Id$
@@ -23,6 +23,9 @@
 
 
 #include "puLocal.h"
+
+UL_RTTI_DEF1(puVerticalMenu,puGroup)
+
 
 extern void puMenuBar_drop_down_the_menu ( puObject *b );
 

[Plib-cvs] plib/src/pui pu.h,1.123,1.124

[Wolfram K. <wol...@us...>]

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

Modified Files:
	pu.h 
Log Message:
Removing compile warnings due to implicit type conversions

Index: pu.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- pu.h	1 Sep 2002 07:45:08 -0000	1.123
+++ pu.h	1 Sep 2002 09:15:50 -0000	1.124
@@ -1125,7 +1125,7 @@
 
     if ( getStepSize() > 0.0 )
     {
-      step = val_to_check - fmod ( val_to_check, getStepSize() ) ;
+      step = val_to_check - (float) fmod ( val_to_check, getStepSize() ) ;
       if ( ( val_to_check - step ) > ( step + getStepSize() - val_to_check ) ) step += getStepSize() ;
     }
       
@@ -1232,7 +1232,7 @@
   void setMaxValue ( float i )
   {
     maximum_value = i ;
-    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0 ) ;
+    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0f ) ;
     puPostRefresh () ;
   }
 
@@ -1240,15 +1240,15 @@
   void setMinValue ( float i )
   {
     minimum_value = i ;
-    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0 ) ;
+    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0f ) ;
     puPostRefresh () ;
   }
 
-  void setCurrentMax ( int i ) { current_max = i ; puPostRefresh () ; } /* DEPRECATED */
+  void setCurrentMax ( int i ) { current_max = (float) i ; puPostRefresh () ; } /* DEPRECATED */
   void setCurrentMax ( float f ) { current_max = f ; puPostRefresh () ; }
   float getCurrentMax ( void ) const { return current_max ; }
 
-  void setCurrentMin ( int i ) { current_min = i ; puPostRefresh () ; } /* DEPRECATED */
+  void setCurrentMin ( int i ) { current_min = (float) i ; puPostRefresh () ; } /* DEPRECATED */
   void setCurrentMin ( float f ) { current_min = f ; puPostRefresh () ; }
   float getCurrentMin ( void ) const { return current_min ; }
 
@@ -1322,7 +1322,7 @@
   void setMaxValue ( float f )
   {
     maximum_value = f ;
-    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0 ) ;
+    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0f ) ;
     puPostRefresh () ;
   }
 
@@ -1330,7 +1330,7 @@
   void setMinValue ( float i )
   {
     minimum_value = i ;
-    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0 ) ;
+    slider_fraction = 1.0f / ( getMaxValue() - getMinValue() + 1.0f ) ;
     puPostRefresh () ;
   }
 } ;

[Plib-cvs] plib/src/util ul.h,1.52,1.53

[Wolfram K. <wol...@us...>]

Update of /cvsroot/plib/plib/src/util
In directory usw-pr-cvs1:/tmp/cvs-serv27461

Modified Files:
	ul.h 
Log Message:
Removing typo

Index: ul.h
===================================================================
RCS file: /cvsroot/plib/plib/src/util/ul.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ul.h	1 Sep 2002 08:10:06 -0000	1.52
+++ ul.h	1 Sep 2002 09:07:04 -0000	1.53
@@ -50,7 +50,6 @@
 #endif
 
 #if defined (WIN32)
-a
 #  include <windows.h>
 #  ifdef __CYGWIN__
 #    include <unistd.h>

[Plib-cvs] plib/src/util ulRTTI.cxx,1.2,1.3 ulRTTI.h,1.2,1.3 Makefile.am,1.13,1.14 ul.dsp,1.14,1.15

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

Update of /cvsroot/plib/plib/src/util
In directory usw-pr-cvs1:/tmp/cvs-serv25967

Modified Files:
	Makefile.am ul.dsp 
Added Files:
	ulRTTI.cxx ulRTTI.h 
Log Message:
Added ulRTTI system



Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/src/util/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am	31 Aug 2002 22:21:21 -0000	1.13
+++ Makefile.am	1 Sep 2002 08:57:34 -0000	1.14
@@ -2,10 +2,10 @@
 
 lib_LIBRARIES = libplibul.a
 
-include_HEADERS = ul.h
+include_HEADERS = ul.h ulRTTI.h
 
 libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
-        ulList.cxx ulLocal.h
+        ulList.cxx ulLocal.h ulRTTI.cxx
 
 endif
 

Index: ul.dsp
===================================================================
RCS file: /cvsroot/plib/plib/src/util/ul.dsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ul.dsp	24 Mar 2002 21:14:37 -0000	1.14
+++ ul.dsp	1 Sep 2002 08:57:34 -0000	1.15
@@ -54,7 +54,7 @@
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy Library to plib directory
-PostBuild_Cmds=copy release\*.lib ..\..\*.*	copy ul.h ..\..\ul.h
+PostBuild_Cmds=copy release\*.lib ..\..\*.*	copy ul.h ..\..\ul.h	copy ulRTTI.h ..\..\ulRTTI.h
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "ul - Win32 Debug"
@@ -83,7 +83,7 @@
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy Library to plib directory
-PostBuild_Cmds=copy debug\*.lib ..\..\*.*	copy ul.h ..\..\ul.h
+PostBuild_Cmds=copy debug\*.lib ..\..\*.*	copy ul.h ..\..\ul.h	copy ulRTTI.h ..\..\ulRTTI.h
 # End Special Build Tool
 
 !ENDIF 
@@ -119,6 +119,10 @@
 # Begin Source File
 
 SOURCE=.\ulLocal.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ulRTTI.h
 # End Source File
 # End Target
 # End Project

[Plib-cvs] plib/doc/pui index.html,1.46,1.47

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

Update of /cvsroot/plib/plib/doc/pui
In directory usw-pr-cvs1:/tmp/cvs-serv24350

Modified Files:
	index.html 
Log Message:
Added missing &gt

Index: index.html
===================================================================
RCS file: /cvsroot/plib/plib/doc/pui/index.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- index.html	1 Sep 2002 08:43:38 -0000	1.46
+++ index.html	1 Sep 2002 08:45:46 -0000	1.47
@@ -2163,7 +2163,7 @@
 
 <td>
 <address>
-<a href="http://www.sjbaker.org">Steve J. Baker.</a> &lt;<a href="mailto:sjb...@ai...">sjb...@ai...</a></address>
+<a href="http://www.sjbaker.org">Steve J. Baker.</a> &lt;<a href="mailto:sjb...@ai...">sjb...@ai...</a>&gt;</address>
 </td>
 </tr>
 </table>

[Plib-cvs] plib/doc/pui index.html,1.45,1.46

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

Update of /cvsroot/plib/plib/doc/pui
In directory usw-pr-cvs1:/tmp/cvs-serv24106

Modified Files:
	index.html 
Log Message:
PUI now uses Andy's new fonts in GLUT-free mode

Index: index.html
===================================================================
RCS file: /cvsroot/plib/plib/doc/pui/index.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- index.html	1 Sep 2002 08:28:14 -0000	1.45
+++ index.html	1 Sep 2002 08:43:38 -0000	1.46
@@ -7,7 +7,7 @@
    <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
    <title>The Picoscopic User Interface: Programmers Guide.</title>
 </head>
-<body text="#B5A642" bgcolor="#005000" link="#8FFF8F" vlink="#18A515" alink="#20336B" background="marble.png">
+<body text="#B5A642" bgcolor="#005000" link="#8FFF8F" vlink="#18A515" alink="#20336B" background="../marble.png">
 &nbsp;
 <table>
 <tr>
@@ -2134,8 +2134,9 @@
 as well.
 <p>However, this is certainly not the intended way to use PUI - even under
 WIN32 - but it's interesting to know that it <b>is</b> possible.
-<p>All you have to do is to define <b>PU_NOT_USING_GLUT</b> both when compiling
-PUI and previous to including "pu.h" from your application.
+<p>All you have to do is pass the option --without-glut to the PLIB
+configure script and define the PU_NOT_USING_GLUT macro before
+including "pu.h" from your code.
 <p>Since there is no longer any way for PUI to glutGet() the screen dimensions,
 your application must now tell PUI every time it changes the screen dimensions.
 <pre>&nbsp;&nbsp;&nbsp; puSetWindowSize ( int width, int height ) ;
@@ -2148,18 +2149,17 @@
 </pre>
 These return the most recent puSetWindowSize() parameters without GLUT
 - and do a nice portable glutGet() otherwise.
-<p>Without GLUT, PUI can also not create the default fonts from the seven
-GLUT_BITMAP fonts like it normally would. Instead, it tries to load some
-.txf fonts in the <a href="#puInit">puInit</a> routine. Hence, you have
-to ensure that the typewriter.txf, times_bold.txf and helvetica_bold.txf
-files from examples/src/fnt/data/ are in the current directory when using
-the GLUT-less PUI library. Additionally, note that currently spreading
-PUI widgets across multiple windows won't work properly when using the
-non-GLUT hack.
+<p>Without GLUT, PUI can also not create the default PUI fonts from the seven
+GLUT bitmap fonts like it normally would. Instead, it tries to load some
+textured fonts in the <a href="#puInit">puInit</a> routine. Hence, you have
+to ensure that Courier.txf, Times-Roman.txf and Helvetica.txf from
+examples/src/fnt/data/ are in the working directory when using the GLUT-free
+PUI library. Additionally, note that currently spreading PUI widgets across
+multiple windows won't work properly when using the non-GLUT hack.
 <hr>
 <table>
 <tr>
-<td><a href="http://validator.w3.org/check/referer"><img SRC="valid-html40.png" ALT="Valid HTML 4.0!" BORDER=0 height=31 width=88></a></td>
+<td><a href="http://validator.w3.org/check/referer"><img SRC="../valid-html40.png" ALT="Valid HTML 4.0!" BORDER=0 height=31 width=88></a></td>
 
 <td>
 <address>

[Plib-cvs] plib/doc/pui index.html,1.44,1.45

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

Update of /cvsroot/plib/plib/doc/pui
In directory usw-pr-cvs1:/tmp/cvs-serv21691

Modified Files:
	index.html 
Log Message:
John F. Fay: PUI documentation updates

Index: index.html
===================================================================
RCS file: /cvsroot/plib/plib/doc/pui/index.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- index.html	9 May 2002 15:05:45 -0000	1.44
+++ index.html	1 Sep 2002 08:28:14 -0000	1.45
@@ -1,17 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <META name="keywords" content="PUI, PLIB, OpenGL, UI, user, interface, library, portable, picoscopic, MUI, widget, GUI, fast, Baker, Steve, puFont, puObject, puButton, puArrowButton, puOneShot, puDial, puSlider, puBiSlider, puTriSlider, puFrame, puText, puInput, puLargeInput, puGroup, puInterface, puPopup, puDialogBox, puPopupMenu, puMenuBar, puVerticalMenu, puListBox, puButtonBox, puComboBox, puSelectBox, puFileSelector">
-   <META name="description" content="The PLIB The Picoscopic User Interface (PUI) Library is a simple set of C++ classes that allow OpenGL programs to create buttons, sliders, menus etc. By using OpenGL calls, PUI is well suited for games or other interactive programs where the GUI is required to overlay some 3D rendering.">
+   <meta name="keywords" content="PUI, PLIB, OpenGL, UI, user, interface, library, portable, picoscopic, MUI, widget, GUI, fast, Baker, Steve, puFont, puObject, puButton, puArrowButton, puOneShot, puDial, puSlider, puBiSlider, puTriSlider, puFrame, puText, puInput, puLargeInput, puGroup, puInterface, puPopup, puDialogBox, puPopupMenu, puMenuBar, puVerticalMenu, puListBox, puButtonBox, puComboBox, puSelectBox, puFileSelector">
+   <meta name="description" content="The PLIB The Picoscopic User Interface (PUI) Library is a simple set of C++ classes that allow OpenGL programs to create buttons, sliders, menus etc. By using OpenGL calls, PUI is well suited for games or other interactive programs where the GUI is required to overlay some 3D rendering.">
+   <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
    <title>The Picoscopic User Interface: Programmers Guide.</title>
[...3475 lines suppressed...]
+files from examples/src/fnt/data/ are in the current directory when using
 the GLUT-less PUI library. Additionally, note that currently spreading
 PUI widgets across multiple windows won't work properly when using the
 non-GLUT hack.
 <hr>
 <table>
 <tr>
-<td>
-<a href="http://validator.w3.org/check/referer"><img border="0" src="../valid-html40.png" alt="Valid HTML 4.0!" height="31" width="88"></a>
+<td><a href="http://validator.w3.org/check/referer"><img SRC="valid-html40.png" ALT="Valid HTML 4.0!" BORDER=0 height=31 width=88></a></td>
+
 <td>
 <address>
 <a href="http://www.sjbaker.org">Steve J. Baker.</a> &lt;<a href="mailto:sjb...@ai...">sjb...@ai...</a></address>
+</td>
+</tr>
 </table>
+
 </body>
 </html>

[Plib-cvs] plib README.GLUT,1.1,1.2

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

Update of /cvsroot/plib/plib
In directory usw-pr-cvs1:/tmp/cvs-serv21221

Modified Files:
	README.GLUT 
Log Message:
PUI now uses Andy's new fonts in GLUT-free mode

Index: README.GLUT
===================================================================
RCS file: /cvsroot/plib/plib/README.GLUT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.GLUT	31 Aug 2002 20:46:19 -0000	1.1
+++ README.GLUT	1 Sep 2002 08:24:51 -0000	1.2
@@ -18,8 +18,8 @@
 Without GLUT, PUI can also not create the default PUI fonts from the
 seven GLUT bitmap fonts like it normally would. Instead, it tries to load
 some textured fonts in the puInit routine. Hence, you have to ensure that
-the typewriter.txf, times_bold.txf and helvetica_bold.txf files from
-examples/src/fnt/data/old are in the current directory when using the
+the Courier.txf, Times-Roman.txf and Helvetica.txf files from
+examples/src/fnt/data/ are in the current directory when using the
 GLUT-free PUI library.
 
 

[Plib-cvs] plib/src/pui pu.cxx,1.55,1.56

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

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

Modified Files:
	pu.cxx 
Log Message:
When compiled with PU_NOT_USING_GLUT, use Andy's new font textures

Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- pu.cxx	21 Aug 2002 18:36:15 -0000	1.55
+++ pu.cxx	1 Sep 2002 08:23:15 -0000	1.56
@@ -270,9 +270,9 @@
 
     // No GLUT fonts, try some corresponding textured fonts
 
-    if ( ( PUFONT_TXF_TYPEWRITER.load ( "typewriter.txf"     ) == FALSE ) |
-         ( PUFONT_TXF_TIMES.load      ( "times_bold.txf"     ) == FALSE ) |
-         ( PUFONT_TXF_HELVETICA.load  ( "helvetica_bold.txf" ) == FALSE ) )
+    if ( ( PUFONT_TXF_TYPEWRITER.load ( "Courier.txf"     ) == FALSE ) |
+         ( PUFONT_TXF_TIMES.load      ( "Times-Roman.txf" ) == FALSE ) |
+         ( PUFONT_TXF_HELVETICA.load  ( "Helvetica.txf"   ) == FALSE ) )
     {
       // Exit
       ulSetError ( UL_FATAL, "PUI: Could not load default fonts." ) ;

[Plib-cvs] plib/src/util ul.h,1.51,1.52

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

Update of /cvsroot/plib/plib/src/util
In directory usw-pr-cvs1:/tmp/cvs-serv18657

Modified Files:
	ul.h 
Log Message:
If everything went okay, there is no longer a need to explicitly define WIN32

Index: ul.h
===================================================================
RCS file: /cvsroot/plib/plib/src/util/ul.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ul.h	1 Sep 2002 02:43:05 -0000	1.51
+++ ul.h	1 Sep 2002 08:10:06 -0000	1.52
@@ -44,11 +44,13 @@
 #include <ctype.h>
 #include <assert.h>
 
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#if !defined(WIN32) && (defined(_WIN32) || defined(__WIN32__) || \
+    defined(__CYGWIN__) || defined(_MSC_VER))
 #  define WIN32
 #endif
 
 #if defined (WIN32)
+a
 #  include <windows.h>
 #  ifdef __CYGWIN__
 #    include <unistd.h>

[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
+

[Plib-cvs] plib/tools configure.in,1.5,1.6

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

Update of /cvsroot/plib/plib/tools
In directory usw-pr-cvs1:/tmp/cvs-serv11325

Modified Files:
	configure.in 
Log Message:
Adopted a bunch of changes from the top-level configure.in

Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/tools/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.in	1 Jul 2002 01:14:35 -0000	1.5
+++ configure.in	1 Sep 2002 07:24:14 -0000	1.6
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/af2rgb/af2rgb.cxx)
-AM_INIT_AUTOMAKE(plib_tools, 1.5.2)
+AM_INIT_AUTOMAKE(plib_tools, 1.6.0)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -12,10 +12,13 @@
 
 AC_LANG_CPLUSPLUS
[...187 lines suppressed...]
+WFLAG="-Wall"
+case "$host" in
+mips-sgi-irix*)
+    if test "x$CXX" = "xCC"; then
+        WFLAG="-fullwarn";
+    fi
+        ;;
+*)
+    if test "x$CXX" = "xicpc" || test "x$CXX" = "xicc"; then
+        WFLAG="-w1"
+    fi
+        ;;
+esac
+
+CFLAGS="$CFLAGS $WFLAG"
+CXXFLAGS="$CXXFLAGS $WFLAG"
+
 
 AC_OUTPUT( \
 	Makefile \

[Plib-cvs] plib/demos/exposer configure.in,1.14,1.15

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

Update of /cvsroot/plib/plib/demos/exposer
In directory usw-pr-cvs1:/tmp/cvs-serv10416/exposer

Modified Files:
	configure.in 
Log Message:
Minor, optical change

Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- configure.in	1 Sep 2002 06:13:51 -0000	1.14
+++ configure.in	1 Sep 2002 07:18:41 -0000	1.15
@@ -12,7 +12,7 @@
 AC_PROG_INSTALL
 
 plib_suffix="-lplibjs -lplibsl -lplibssgaux -lplibssg -lplibpu -lplibfnt -lplibsg -lplibul"
- 
+
 AC_LANG_CPLUSPLUS
 
 
@@ -40,14 +40,14 @@
 
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
-  dnl CygWin under Windoze.
+    dnl CygWin under Windoze.
 
-  LIBS="$LIBS -lwinmm -lglut32 -lglu32 -lopengl32 -luser32 -lgdi32"
+    LIBS="$LIBS -lwinmm -lglut32 -lglu32 -lopengl32 -luser32 -lgdi32"
 	;;
 *-apple-darwin*)
-  dnl Mac OS X
+    dnl Mac OS X
 
-  LIBS="$LIBS -framework GLUT -lobjc -framework OpenGL -framework Carbon"
+    LIBS="$LIBS -framework GLUT -lobjc -framework OpenGL -framework Carbon"
 	;;
 *)
     dnl Check for X11

[Plib-cvs] plib/demos/ttt3d configure.in,1.11,1.12

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

Update of /cvsroot/plib/plib/demos/ttt3d
In directory usw-pr-cvs1:/tmp/cvs-serv10416/ttt3d

Modified Files:
	configure.in 
Log Message:
Minor, optical change

Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.in	1 Sep 2002 06:07:01 -0000	1.11
+++ configure.in	1 Sep 2002 07:18:41 -0000	1.12
@@ -11,7 +11,7 @@
 AC_PROG_INSTALL
 
 plib_suffix="-lplibjs -lplibsl -lplibssgaux -lplibssg -lplibpu -lplibfnt -lplibsg -lplibul"
- 
+
 AC_LANG_CPLUSPLUS
 
 
@@ -39,14 +39,14 @@
 
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
-  dnl CygWin under Windoze.
+    dnl CygWin under Windoze.
 
-  LIBS="$LIBS -lwinmm -lglut32 -lglu32 -lopengl32 -luser32 -lgdi32"
+    LIBS="$LIBS -lwinmm -lglut32 -lglu32 -lopengl32 -luser32 -lgdi32"
 	;;
 *-apple-darwin*)
-  dnl Mac OS X
+    dnl Mac OS X
 
-  LIBS="$LIBS -framework GLUT -lobjc -framework OpenGL -framework Carbon"
+    LIBS="$LIBS -framework GLUT -lobjc -framework OpenGL -framework Carbon"
 	;;
 *)
     dnl Check for X11

[Plib-cvs] plib/demos/p-guide configure.in,1.5,1.6

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

Update of /cvsroot/plib/plib/demos/p-guide
In directory usw-pr-cvs1:/tmp/cvs-serv10416/p-guide

Modified Files:
	configure.in 
Log Message:
Minor, optical change

Index: configure.in
===================================================================
RCS file: /cvsroot/plib/plib/demos/p-guide/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.in	1 Sep 2002 06:17:56 -0000	1.5
+++ configure.in	1 Sep 2002 07:18:41 -0000	1.6
@@ -39,15 +39,15 @@
 
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
-  dnl CygWin under Windoze.
+    dnl CygWin under Windoze.
 
-  dnl OpenGL libraries
-  LIBS="$LIBS -lwinmm -lglut32 -lglu32 -lopengl32 -luser32 -lgdi32"
+    dnl OpenGL libraries
+    LIBS="$LIBS -lwinmm -lglut32 -lglu32 -lopengl32 -luser32 -lgdi32"
 	;;
 *-apple-darwin*)
-  dnl Mac OS X
+    dnl Mac OS X
 
-  LIBS="$LIBS -framework GLUT -lobjc -framework OpenGL"
+    LIBS="$LIBS -framework GLUT -lobjc -framework OpenGL"
 	;;
 *)
     dnl Check for X11

[Plib-cvs] plib/demos/ttt3d/src p3d.h,1.4,1.5

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

Update of /cvsroot/plib/plib/demos/ttt3d/src
In directory usw-pr-cvs1:/tmp/cvs-serv9277

Modified Files:
	p3d.h 
Log Message:
Mac OS-X compatibility

Index: p3d.h
===================================================================
RCS file: /cvsroot/plib/plib/demos/ttt3d/src/p3d.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- p3d.h	31 Aug 2002 08:05:49 -0000	1.4
+++ p3d.h	1 Sep 2002 07:10:09 -0000	1.5
@@ -35,7 +35,16 @@
 
 #include <plib/ssg.h>
 
-#include <GL/glut.h>
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
 #include <plib/sl.h>
 #include <plib/js.h>
 #include <plib/fnt.h>

[Plib-cvs] plib/demos/exposer/src exposer.h,1.10,1.11

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

Update of /cvsroot/plib/plib/demos/exposer/src
In directory usw-pr-cvs1:/tmp/cvs-serv9103

Modified Files:
	exposer.h 
Log Message:
Mac OS-X compatibility

Index: exposer.h
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/exposer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- exposer.h	31 Aug 2002 08:27:52 -0000	1.10
+++ exposer.h	1 Sep 2002 07:09:22 -0000	1.11
@@ -32,7 +32,17 @@
 #include <unistd.h>
 #endif
 #include <math.h>
-#include <GL/glut.h>
+
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
 #include <plib/pu.h>
 #include <plib/ssgAux.h>
 

[Plib-cvs] plib/examples/src/ssg/dynamics dynamics.cxx,1.6,1.7

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

Update of /cvsroot/plib/plib/examples/src/ssg/dynamics
In directory usw-pr-cvs1:/tmp/cvs-serv8519

Modified Files:
	dynamics.cxx 
Log Message:
Ooops ...

Index: dynamics.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/dynamics/dynamics.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dynamics.cxx	1 Sep 2002 06:57:58 -0000	1.6
+++ dynamics.cxx	1 Sep 2002 07:06:00 -0000	1.7
@@ -191,7 +191,7 @@
 }
 
 
-static const sgCoord campos = { { 0, -20, 8 }, { 0, -20, 0 } } ;
+static sgCoord campos = { { 0, -20, 8 }, { 0, -20, 0 } } ;
 
 static void update_motion ( int frameno )
 {

[Plib-cvs] plib/examples/src/ssg/majik majik_demo.cxx,1.7,1.8

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

Update of /cvsroot/plib/plib/examples/src/ssg/majik
In directory usw-pr-cvs1:/tmp/cvs-serv7916/majik

Modified Files:
	majik_demo.cxx 
Log Message:
Ooops ...

Index: majik_demo.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/majik/majik_demo.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- majik_demo.cxx	1 Sep 2002 06:57:59 -0000	1.7
+++ majik_demo.cxx	1 Sep 2002 07:02:10 -0000	1.8
@@ -42,7 +42,7 @@
 
 static jsJoystick *js ;
 static float      *ax ;
-static const sgCoord tuxpos = { { 0.0f,0.0f,0.0f }, { 0.0f,0.0f,0.0f } } ;
+static sgCoord tuxpos = { { 0.0f,0.0f,0.0f }, { 0.0f,0.0f,0.0f } } ;
 
 #define ROT_SPEED 5.0f
 #define TRANS_SPEED 10.0f

[Plib-cvs] plib/examples/src/ssg/load_save load.cxx,1.2,1.3 save.cxx,1.4,1.5

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

Update of /cvsroot/plib/plib/examples/src/ssg/load_save
In directory usw-pr-cvs1:/tmp/cvs-serv6971/ssg/load_save

Modified Files:
	load.cxx save.cxx 
Log Message:
Mac OS-X compatibility; Minor cleanups

Index: load.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/load_save/load.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- load.cxx	26 May 2001 00:01:30 -0000	1.2
+++ load.cxx	1 Sep 2002 06:57:59 -0000	1.3
@@ -3,24 +3,33 @@
 #include <ctype.h>
 #include <string.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
 #include <plib/ssg.h>
-#include <GL/glut.h>
 
-ssgRoot      *scene    = NULL ;
-ssgTransform *penguin  = NULL ;
-ssgTransform *pedestal = NULL ;
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
+static ssgRoot      *scene    = NULL ;
+static ssgTransform *penguin  = NULL ;
+static ssgTransform *pedestal = NULL ;
 
 /*
   Something to make some interesting motion
   for both Tux and the camera.
 */
 
-void update_motion ()
+static void update_motion ()
 {
   static int frameno = 0 ;
 
@@ -46,7 +55,7 @@
   The GLUT window reshape event
 */
 
-void reshape ( int w, int h )
+static void reshape ( int w, int h )
 {
   glViewport ( 0, 0, w, h ) ;
 }
@@ -57,7 +66,7 @@
   The GLUT keyboard event
 */
 
-void keyboard ( unsigned char, int, int )
+static void keyboard ( unsigned char, int, int )
 {
   exit ( 0 ) ;
 }
@@ -68,7 +77,7 @@
   The GLUT redraw event
 */
 
-void redraw ()
+static void redraw ()
 {
   update_motion () ;
 
@@ -82,7 +91,7 @@
 
 
 
-void init_graphics ()
+static void init_graphics ()
 {
   int   fake_argc = 1 ;
   char *fake_argv[3] ;
@@ -137,7 +146,7 @@
   Load a simple database
 */
 
-void load_database ()
+static void load_database ()
 {
   /*
     Set up the path to the data files

Index: save.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/load_save/save.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- save.cxx	6 Jul 2002 23:13:14 -0000	1.4
+++ save.cxx	1 Sep 2002 06:57:59 -0000	1.5
@@ -3,26 +3,35 @@
 #include <ctype.h>
 #include <string.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
 #include <plib/ssg.h>
-#include <GL/glut.h>
 
-ssgRoot      *scene   = NULL ;
-ssgTransform *object  = NULL ;
-ssgEntity    *obj_obj = NULL ;
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
 
+static ssgRoot      *scene   = NULL ;
+static ssgTransform *object  = NULL ;
+static ssgEntity    *obj_obj = NULL ;
 
-void redraw ()
+
+static void redraw ()
 {
   return ;
 }
 
 
-void init_graphics ()
+static void init_graphics ()
 {
   int   fake_argc = 1 ;
   char *fake_argv[3] ;
@@ -49,7 +58,7 @@
 }
 
 
-void load_database ()
+static void load_database ()
 {
   /*
     Set up the path to the data files
@@ -81,7 +90,7 @@
 }
 
 
-void save_database ()
+static void save_database ()
 {
   ssgSaveSSG ( "data/tuxedo.ssg", object ) ;
 }

[Plib-cvs] plib/examples/src/ssg/majik majik_demo.cxx,1.6,1.7

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

Update of /cvsroot/plib/plib/examples/src/ssg/majik
In directory usw-pr-cvs1:/tmp/cvs-serv6971/ssg/majik

Modified Files:
	majik_demo.cxx 
Log Message:
Mac OS-X compatibility; Minor cleanups

Index: majik_demo.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/majik/majik_demo.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- majik_demo.cxx	1 Sep 2002 01:11:00 -0000	1.6
+++ majik_demo.cxx	1 Sep 2002 06:57:59 -0000	1.7
@@ -3,14 +3,23 @@
 #include <ctype.h>
 #include <string.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
 #include <plib/ssg.h>
[...91 lines suppressed...]
   sgVec4 *scolors = new sgVec4 [ (ntris+1) * (ntris+1) ] ;
   sgVec2 *tcoords = new sgVec2 [ (ntris+1) * (ntris+1) ] ;
@@ -304,7 +313,7 @@
 }
 
 
-void createTile ( ssgTransform *tile, int x, int y, ssgSimpleState *state ) 
+static void createTile ( ssgTransform *tile, int x, int y, ssgSimpleState *state ) 
 {
   float rr[] = { 0.0f, 6000.0f, 7000.0f, 12000.0f } ;
   ssgRangeSelector *lod = new ssgRangeSelector () ;
@@ -322,7 +331,7 @@
   Load a simple database
 */
 
-void load_database ()
+static void load_database ()
 {
   /*
     Set up the path to the data files

[Plib-cvs] plib/examples/src/ssg/tween_test tween_test.cxx,1.1,1.2

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

Update of /cvsroot/plib/plib/examples/src/ssg/tween_test
In directory usw-pr-cvs1:/tmp/cvs-serv6971/ssg/tween_test

Modified Files:
	tween_test.cxx 
Log Message:
Mac OS-X compatibility; Minor cleanups

Index: tween_test.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/tween_test/tween_test.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tween_test.cxx	14 Jul 2001 03:08:33 -0000	1.1
+++ tween_test.cxx	1 Sep 2002 06:57:59 -0000	1.2
@@ -3,24 +3,33 @@
 #include <ctype.h>
 #include <string.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
 #include <plib/ssg.h>
 #include <plib/ssgAux.h>
-#include <GL/glut.h>
 
-ssgRoot            *scene      = NULL ;
-ssgTweenController *tween_ctrl = NULL ;
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
+static ssgRoot            *scene      = NULL ;
+static ssgTweenController *tween_ctrl = NULL ;
 
 
 /*
   Something to make some interesting motion
 */
 
-void update_motion ()
+static void update_motion ()
 {
   static int frameno = 0 ;
 
@@ -45,7 +54,7 @@
   The GLUT window reshape event
 */
 
-void reshape ( int w, int h )
+static void reshape ( int w, int h )
 {
   glViewport ( 0, 0, w, h ) ;
 }
@@ -56,7 +65,7 @@
   The GLUT keyboard event
 */
 
-void keyboard ( unsigned char, int, int )
+static void keyboard ( unsigned char, int, int )
 {
   exit ( 0 ) ;
 }
@@ -67,7 +76,7 @@
   The GLUT redraw event
 */
 
-void redraw ()
+static void redraw ()
 {
   update_motion () ;
 
@@ -81,7 +90,7 @@
 
 
 
-void init_graphics ()
+static void init_graphics ()
 {
   int   fake_argc = 1 ;
   char *fake_argv[3] ;
@@ -138,7 +147,7 @@
   Load a simple database
 */
 
-void load_database ()
+static void load_database ()
 {
   /*
     Create a root node with a Tween controller beneath it.
@@ -261,6 +270,4 @@
   glutMainLoop  () ;
   return 0 ;
 }
-
-
 

[Plib-cvs] plib/examples/src/fnt fnt_test.cxx,1.6,1.7 slideshow.cxx,1.6,1.7

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

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

Modified Files:
	fnt_test.cxx slideshow.cxx 
Log Message:
Mac OS-X compatibility; Minor cleanups

Index: fnt_test.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/fnt/fnt_test.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fnt_test.cxx	15 Aug 2002 00:38:06 -0000	1.6
+++ fnt_test.cxx	1 Sep 2002 06:57:58 -0000	1.7
@@ -3,17 +3,27 @@
 #include <stdlib.h>
 #include <string.h>
 #ifdef WIN32
-#include <windows.h>
+#  include <windows.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 #include <math.h>
-#include <GL/glut.h>
+
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
 #include <plib/fnt.h>
 
-fntRenderer *text ;
+static fntRenderer *text ;
 
-const char *font_names [] =
+static const char *font_names [] =
 {
   "Helvetica.txf",         /* This is the default */
   "Helvetica-Bold.txf",
@@ -74,17 +84,17 @@
   NULL
 } ;
 
-fntTexFont **font_list ;
+static fntTexFont **font_list ;
 
-int cur_font = 0 ;
-int max_font = 0 ;
+static int cur_font = 0 ;
+static int max_font = 0 ;
 
-void motionfn ( int, int )
+static void motionfn ( int, int )
 {
   glutPostRedisplay () ;
 }
 
-void keyfn ( unsigned char key, int, int )
+static void keyfn ( unsigned char key, int, int )
 {
   cur_font++ ;
 
@@ -92,13 +102,13 @@
     cur_font = 0 ;
 }
 
-void mousefn ( int /*button*/, int /*updown*/, int /*x*/, int /*y*/ )
+static void mousefn ( int /*button*/, int /*updown*/, int /*x*/, int /*y*/ )
 {
   exit ( 0 ) ;
 }
 
-int getWindowHeight () { return glutGet ( (GLenum) GLUT_WINDOW_HEIGHT ) ; }
-int getWindowWidth  () { return glutGet ( (GLenum) GLUT_WINDOW_WIDTH  ) ; }
+static int getWindowHeight () { return glutGet ( (GLenum) GLUT_WINDOW_HEIGHT ) ; }
+static int getWindowWidth  () { return glutGet ( (GLenum) GLUT_WINDOW_WIDTH  ) ; }
 
 static void setOpenGLState ( void )
 {
@@ -137,7 +147,7 @@
 
 
 
-void displayfn (void)
+static void displayfn (void)
 {
   setOpenGLState () ;
   glClearColor ( 0.1f, 0.4f, 0.1f, 1.0f ) ;

Index: slideshow.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/fnt/slideshow.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- slideshow.cxx	15 Aug 2002 00:37:47 -0000	1.6
+++ slideshow.cxx	1 Sep 2002 06:57:58 -0000	1.7
@@ -15,25 +15,35 @@
 #  include <unistd.h>
 #endif
 #include <math.h>
-#include <GL/glut.h>
+
+#ifdef FREEGLUT_IS_PRESENT
+#  include <GL/freeglut.h>
+#else
+#  ifdef __APPLE__
+#    include <GLUT/glut.h>
+#  else
+#    include <GL/glut.h>
+#  endif
+#endif
+
 #include <plib/fnt.h>
 
-fntRenderer *text ;
-fntTexFont *font ;
+static fntRenderer *text ;
+static fntTexFont *font ;
 
-char  *file ;
-char **line ;
-int   *page ;
-int  num_lines = 0 ;
-int  num_pages = 0 ;
-int  curr_page = 0 ;
+static char  *file ;
+static char **line ;
+static int   *page ;
+static int  num_lines = 0 ;
+static int  num_pages = 0 ;
+static int  curr_page = 0 ;
 
-void motionfn ( int, int )
+static void motionfn ( int, int )
 {
   glutPostRedisplay () ;
 }
 
-void keyfn ( unsigned char key, int, int )
+static void keyfn ( unsigned char key, int, int )
 {
   switch ( key )
   {
@@ -59,13 +69,13 @@
   if ( curr_page >= num_pages ) curr_page = num_pages-1 ;
 }
 
-void mousefn ( int /*button*/, int /*updown*/, int /*x*/, int /*y*/ )
+static void mousefn ( int /*button*/, int /*updown*/, int /*x*/, int /*y*/ )
 {
   exit ( 0 ) ;
 }
 
-int getWindowHeight () { return glutGet ( (GLenum) GLUT_WINDOW_HEIGHT ) ; }
-int getWindowWidth  () { return glutGet ( (GLenum) GLUT_WINDOW_WIDTH  ) ; }
+static int getWindowHeight () { return glutGet ( (GLenum) GLUT_WINDOW_HEIGHT ) ; }
+static int getWindowWidth  () { return glutGet ( (GLenum) GLUT_WINDOW_WIDTH  ) ; }
 
 static void setOpenGLState ( void )
 {
@@ -106,7 +116,7 @@
 
 
 
-void displayfn (void)
+static void displayfn (void)
 {
   setOpenGLState () ;
   glClearColor ( 0.1f, 0.4f, 0.1f, 1.0f ) ;