easyxml.cxx: add missing endXML visitor call

testEasyXML.cxx: beef it up
Vivian MEAZZA: add support for aircraft radar signatures
2007-06-29 10:46:52 +00:00 · 2007-06-24 08:09:07 +00:00 · 2007-06-23 16:48:01 +00:00 · 2007-06-21 21:46:21 +00:00 · 2007-06-19 18:22:32 +00:00 · 2007-06-19 18:11:06 +00:00
477 changed files with 43703 additions and 49520 deletions
@@ -7,3 +7,13 @@ config.cache
 config.log
 config.status
 configure
 do-config.sh
 .cdtproject
 .project
 config.guess
 config.sub
 depcomp
 INSTALL
 install-sh
 missing
 mkinstalldirs
@@ -22,7 +22,7 @@ PROJECT_NAME           = SimGear
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
-PROJECT_NUMBER         = 0.3.4
+PROJECT_NUMBER         = 0.3.10
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -303,16 +303,19 @@ INPUT                  = \
 	simgear/compiler.h \
 	simgear/constants.h \
 	simgear/debug \
 	simgear/environment \
 	simgear/ephemeris \
 	simgear/io \
 	simgear/magvar \
 	simgear/math \
 	simgear/misc \
 	simgear/nasal \
        simgear/props \
 	simgear/route \
 	simgear/scene \
 	simgear/screen \
 	simgear/serial \
 	simgear/structure \
 	simgear/sg_inlines.h \
 	simgear/sg_traits.hxx \
        simgear/sound \
@@ -1,17 +1,18 @@
 EXTRA_DIST = \
 	acinclude.m4 \
 	autogen.sh \
-	DoxygenMain.cxx
+	DoxygenMain.cxx \
 	README.MSVC \
 	README.metakit \
 	README.zlib \
 	projects \
 	SimGear.dsp \
 	SimGear.dsw
-SUBDIRS	= src-libs simgear
+SUBDIRS	= simgear
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.9/admin/am2dsp.pl)
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
 	rm -rf `find $(distdir)/projects -name CVS`
 #
 # Rule to build RPM distribution package
@@ -1,3 +1,126 @@
 New in 0.3.10
 * April 5, 2006
 * Add a small accessor function to expose local timezone offset.
 * Improved exception handling and made output more helpful in various places.
 * Better pbuffer runtime detection.
 * Add directory creation capability to file/path library.
 * Added a basic reference counting class to improve robustness of
  memory management in places.  Use this for all scenegraph
  references, sgmaterial references, sgmatmodel references, and
  sgsoundsample references.
 * Add support for point sprites.
 * Updates to rain cone rendering.
 * Add a new vector library and integrate that with improved coordinate
  system conversion code.
 * Mutex locking and cleanup improvements in the threading abstraction
  library.
 * Add MacOS RenderTexture support.
 * Add a Nasal based io libarary that is not activated by default.
 * Added a set of MS-VC8 project files.
 * Various platform related bug fixes.
 * Various compiler related bug/warning fixes.
 * Clean up some things that triggered valgrind warnings.
 * Fix a Nasal cmp() bug.
 * Removed ancient version of zlib from distribution.
 New in 0.3.9
 * November 17, 2005
 * Add support for OpenAL 1.1 (with a separate alut library.)
 * Add support for volumetric shadows.  Aircraft can cast shadows on themselves
  as well as onto the ground (by Harald Johnsen.)
 * New 3d volumetric clouds by Harald Johnsen (along with several rounds of
  followup fixes and improvements.)
 * Remove Mark Harris's old 3d clouds because they were never properly
  integrated.  And we now have new 3d clouds.
 * Add support for seasonal textures (with a set of winter textures added
  to FlightGear.)
 * Updated Nasal scripting system.  Adds several new syntax convenience
  features, fixes parser bugs, fixes several internal bugs.
 * Our 3d cockpit jitter problem is fixed (woohoo!)
 * Add code to support rendering to a texture.
 * Allow "tip" popups to pop themselves down after the appropriate
  timeout, even if the sim time is paused.
 * Various low model level animation fixes and additions ... color,
  transparency, 'chrome' effects, randomized spin, etc.
 * Create our own portable stdint.h implementation.
 * Fixed several memory leaks.
 * removeChildren() added to the property system.
 * Fix many cases of 'const'.
 * Fixes for cygwin, solaris/sun, Mac OS X, MSVC, gcc-3.4.x.
 New in 0.3.8
 * January 18, 2005
 * Configure script does a sanity check for the existence of openal.
 * Better pthreads detection for FreeBSD.
 * Abstract out the location of gl.h, glu.h, and glut.h so we can more
  easily support MacOS which puts these in an oddball location.
 * Added two new debug output types for instrumentation and systems.
 * Add a name parameter to the waypoint class for supporting a route
  manager in the flightgear gps module.
 * Make display list usage optional.
 * Event manager: specifying a zero delay will force event execution in
  the next frame rather than entering an infinite loop.
 * gcc-4.0 fix.
 * Fixes to property tree loading and saving.
 * Make volume inaudible at startup.
 * Solaris fixes.
 * For low density cloud coverage, blend the layer to nothing as we pass
  through instead of fully engulfing the aircraft in the cloud.
 * Add several new capabilities to the texture management code for building
  normal maps and doing some simple on-the-fly effects on textures.
 * Better error message for sound problems.
 * Add support for binding a thread to a specific CPU.
 New in 0.3.7
 * October 12, 2004
 * Add support for parsing xml from an in memory buffer, not just a file.
 * Don't reduce visibility for a "clear" cloud layer.
 * Add support for audio orientation (direction and cone) for internal
  view and tower view.
 * Add support for drawing from display lists rather than in immediate mode.
  This provides a big performance improvement on many systems.
 New in 0.3.6
 * July 29, 2004
 * Better MinGW support
 * A bit better handling of OpenAL under Cygwin
 * Switched audio system from plib's "sl/sm" to OpenAL.
 * Add support for scaling an object based on distance.  The scaling
  factor is determined by a lookup table based on distance.
 * Add a "flash" animation type.
 * Fix cloud positioning/animation bugs.
 * Fix an off-by-one error in props_io.cxx
 * Clip audio gain (volume) to 1.0
 New in 0.3.5
 * March 26, 2004
 * Added Andy's nasal interpreter for small built in scripting tasks.
  Nasal integrates nicely with FlightGear's property system.
 * Added new (much simpler) metar parsing code (removed older more
  complex code.)
 * Support VASI/PAPI lights correctly.
 * Fixes to cloud animation.
 * Updates to sky dome coloring as well as sun/moon coloring.
 * Vary environment lighting with visibility (subtlety.)
 * Support control of alpha test in model animation.
 * Complete rewrite of the event manager.
 * Updates to low level socket code to make it more flexible.
 * Win32 serial port communication fixes.
 * sg_geodesy rewritten to be more accurate and robust and symmetric.
 New in 0.3.4
 * October 22, 2003
@@ -41,7 +164,7 @@ New in 0.3.2
  management, basic model and model animation management, sky
  rendering, and low level loaders for the "TerraGear" tile object format.
 * Removed support of the flat shaded and non-textured material
-  property varients.  You can still do these things, but extra states
+  property variants.  You can still do these things, but extra states
  are no longer set up automatically.
 * Removed 3d clouds from the default build ... these need a maintainer
  or better yet, a complete plib-based rewrite.
@@ -86,7 +209,7 @@ New in 0.2.0
 * Removed efence support (in favor of valgrind.)
 * Added a javascript interpreter.
-* SGSocket reimplimented on top of plib/net libs.
+* SGSocket reimplemented on top of plib/net libs.
 * Added a new random number generation algorithm.
 * Total rewrite of the strutils package.
@@ -96,7 +219,7 @@ New in 0.2.0
 * Mac OS X fixes.
 * Irix fixes.
 * Code clean ups to remove warning messages.
-* Optimizations in sg_binobj to reduce the amout of memory copying
+* Optimizations in sg_binobj to reduce the amount of memory copying
  needed when loading a binobj format file.
 * Fixed a couple places where variables could be used before they were
  initialized.
@@ -116,7 +239,7 @@ New in 0.0.18
 * Upgrade to metakit-2.4.2-32.tar.gz (latest upstream release)
 * Added support for point objects in the scenery file format.
 * Additions to the binary file format to make it *much* more flexible.
-  For each major primative type: points, triangles, fans, and strips, you
+  For each major primitive type: points, triangles, fans, and strips, you
  can specify an index list of vertices, normals, colors, and texture
  coordinates.  You can skip any of these you like to save on space.
 * Added support for new file features in the binary -> ascii scenery file
@@ -167,7 +290,7 @@ New in 0.0.17pre1
 New in 0.0.16
 * July 12, 2001
-* Various changes to the property manager implimentation to better support
+* Various changes to the property manager implementation to better support
  dumping out the desired portions of the property tree to file.
 * Don't compile the metakit demos by default (causes problems for Irix)'
 * Other various tweaks for Irix.
@@ -210,7 +333,7 @@ New in 0.0.15
  read/write routines.
 * Added doxygen comments for all public interface code.  Documentation
  can be accessed via the SimGear web page.
-* Many FG -> SG name space changes for better consistancy throughout
+* Many FG -> SG name space changes for better consistency throughout
  this package.
 * Added property aliases, repeated name tags, and a general xml
  inclusion facilities.  Many other property manager clean ups
@@ -301,4 +424,4 @@ New in 0.0.4
 New in 0.0.3
-* Release that conincides with FlightGear-0.7.2
+* Release that coincides with FlightGear-0.7.2
@@ -0,0 +1,12 @@
 [This file is mirrored in both the FlightGear and SimGear packages.]
 You *must* have the development components of OpenAL installed on your system
 to build FlightGear!"  You can get a copy here:
    http://www.openal.org
 Build notes:
 The OpenAL developers do not make "versioned" releases so we recommend that
 you pull the latest version via anonymous CVS (follow the instructions at
 the OpenAL web site) and build/install that.
@@ -1,173 +1,8 @@
-For your convenience and allowed by zlib's license terms:
+zlib is prerequisite for compiling SimGear and FlightGear.  You can fetch
-http://www.gzip.org/zlib/zlib_license.html a copy of the zlib source
+the latest version of zlib from:
 is bundled with SimGear in $(top_srcdir)/src-libs/.  You must have
 zlib installed before you can build SimGear.
- Most linux distributions have a zlib package.  For linux
+    http://www.zlib.net
  developers, we recommend ysou install your distributions package
  rather than building from source.
- Cygwin installs zlib automatically.
+Most modern unix distributions (and cygwin) come with a version of zlib
 already installed or available to install as a package.
 - For developers on most other platforms, you will have to build
  zlib from source and install it yourself.  For your convenience a
  tar ball of the zlib source is included with the simgear source
  distribution.  Untar the zlib source, and follow the included
  build and installation instructions.
 Once zlib is installed you can return to configuring and building
 Simgear.
 We now send you to the official zlib README ... 
 =============================================================================
 zlib 1.1.4 is a general purpose data compression library.  All the code
 is thread safe.  The data format used by the zlib library
 is described by RFCs (Request for Comments) 1950 to 1952 in the files 
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate
 format) and rfc1952.txt (gzip format). These documents are also available in
 other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
 All functions of the compression library are documented in the file zlib.h
 (volunteer to write man pages welcome, contact jloup@gzip.org). A usage
 example of the library is given in the file example.c which also tests that
 the library is working correctly. Another example is given in the file
 minigzip.c. The compression library itself is composed of all source files
 except example.c and minigzip.c.
 To compile all files and run the test program, follow the instructions
 given at the top of Makefile. In short "make test; make install"
 should work for most machines. For Unix: "./configure; make test; make install"
 For MSDOS, use one of the special makefiles such as Makefile.msc.
 For VMS, use Make_vms.com or descrip.mms.
 Questions about zlib should be sent to <zlib@gzip.org>, or to
 Gilles Vollant <info@winimage.com> for the Windows DLL version.
 The zlib home page is http://www.zlib.org or http://www.gzip.org/zlib/
 Before reporting a problem, please check this site to verify that
 you have the latest version of zlib; otherwise get the latest version and
 check whether the problem still exists or not.
 PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html
 before asking for help.
 Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
 issue of  Dr. Dobb's Journal; a copy of the article is available in
 http://dogma.net/markn/articles/zlibtool/zlibtool.htm
 The changes made in version 1.1.4 are documented in the file ChangeLog.
 The only changes made since 1.1.3 are bug corrections:
 - ZFREE was repeated on same allocation on some error conditions.
  This creates a security problem described in
  http://www.zlib.org/advisory-2002-03-11.txt
 - Returned incorrect error (Z_MEM_ERROR) on some invalid data
 - Avoid accesses before window for invalid distances with inflate window
  less than 32K.
 - force windowBits > 8 to avoid a bug in the encoder for a window size
  of 256 bytes. (A complete fix will be available in 1.1.5).
 The beta version 1.1.5beta includes many more changes. A new official
 version 1.1.5 will be released as soon as extensive testing has been
 completed on it.
 Unsupported third party contributions are provided in directory "contrib".
 A Java implementation of zlib is available in the Java Development Kit
 http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
 See the zlib home page http://www.zlib.org for details.
 A Perl interface to zlib written by Paul Marquess <pmarquess@bfsec.bt.co.uk>
 is in the CPAN (Comprehensive Perl Archive Network) sites
 http://www.cpan.org/modules/by-module/Compress/
 A Python interface to zlib written by A.M. Kuchling <amk@magnet.com>
 is available in Python 1.5 and later versions, see
 http://www.python.org/doc/lib/module-zlib.html
 A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com>
 is availlable at http://www.westend.com/~kupries/doc/trf/man/man.html
 An experimental package to read and write files in .zip format,
 written on top of zlib by Gilles Vollant <info@winimage.com>, is
 available at http://www.winimage.com/zLibDll/unzip.html
 and also in the contrib/minizip directory of zlib.
 Notes for some targets:
 - To build a Windows DLL version, include in a DLL project zlib.def, zlib.rc
  and all .c files except example.c and minigzip.c; compile with -DZLIB_DLL
  The zlib DLL support was initially done by Alessandro Iacopetti and is
  now maintained by Gilles Vollant <info@winimage.com>. Check the zlib DLL
  home page at http://www.winimage.com/zLibDll
  From Visual Basic, you can call the DLL functions which do not take
  a structure as argument: compress, uncompress and all gz* functions.
  See contrib/visual-basic.txt for more information, or get
  http://www.tcfb.com/dowseware/cmp-z-it.zip
 - For 64-bit Irix, deflate.c must be compiled without any optimization.
  With -O, one libpng test fails. The test works in 32 bit mode (with
  the -n32 compiler flag). The compiler bug has been reported to SGI.
 - zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1   
  it works when compiled with cc.
 - on Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1
  is necessary to get gzprintf working correctly. This is done by configure.
 - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works
  with other compilers. Use "make test" to check your compiler.
 - gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
 - For Turbo C the small model is supported only with reduced performance to
  avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
 - For PalmOs, see http://www.cs.uit.no/~perm/PASTA/pilot/software.html
  Per Harald Myrvang <perm@stud.cs.uit.no>
 Acknowledgments:
  The deflate format used by zlib was defined by Phil Katz. The deflate
  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
  people who reported problems and suggested various improvements in zlib;
  they are too numerous to cite here.
 Copyright notice:
 (C) 1995-2002 Jean-loup Gailly and Mark Adler
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the following restrictions:
  1. The origin of this software must not be misrepresented; you must not
     claim that you wrote the original software. If you use this software
     in a product, an acknowledgment in the product documentation would be
     appreciated but is not required.
  2. Altered source versions must be plainly marked as such, and must not be
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
  Jean-loup Gailly        Mark Adler
  jloup@gzip.org          madler@alumni.caltech.edu
 If you use the zlib library in a product, we would appreciate *not*
 receiving lengthy legal documents to sign. The sources are provided
 for free but without warranty of any kind.  The library has been
 entirely written by Jean-loup Gailly and Mark Adler; it does not
 include third-party code.
 If you redistribute modified sources, we would appreciate that you include
 in the file ChangeLog history information documenting your changes.
@@ -15,30 +15,6 @@ Package=<4>
 ###############################################################################
 Project: "mklib"=".\SimGear\metakit-2.4.3\win\msvc60\mklib.dsp" - Package Owner=<4>
 Package=<5>
 {{{
 }}}
 Package=<4>
 {{{
 }}}
 ###############################################################################
 Project: "zlib"=".\SimGear\zlib.dsp" - Package Owner=<4>
 Package=<5>
 {{{
 }}}
 Package=<4>
 {{{
 }}}
 ###############################################################################
 Global:
 Package=<5>
@@ -47,6 +47,18 @@ Jean-Francois Doue
  http://www.animats.com/simpleppp/ftp/public_html/topics/developers.html
 Melchior Franz
  METAR parser and fetcher. "material" animation (based on Jim Wilsons's
  "emission" animation). Debugging and extension of property listener
  features. Addition of removeChildren.
 Mathias Froehlich
  Reworked and cleaned up large parts of the infrastructure, of math
  files, animations and rendering in preparation of a transition to
  the OSG library. Added new handlers for shared and referenced objects.
 Bruce Finney <bfinney@gte.net>
  MSVC5 compatibility.
@@ -71,6 +83,10 @@ Bruce Jackson of NASA <e.b.jackson@larc.nasa.gov>
  http://dcb.larc.nasa.gov/www/DCBStaff/ebj/ebj.html
 Maik Justus
  Fixed an old bug in the SGPropertyNode class.
 Richard Kaszeta <bofh@me.umn.edu>
  Contributed screen buffer to ppm screen shot routine.
  Rich has also helped in the early development of the Flight Gear "altitude 
@@ -90,7 +106,12 @@ David Megginson <david@megginson.com>
  SimGear property manager/registry
-Curt Olson <curt@flightgear.org>
+Tim Moore
  Ported the (chrome) "shader" animation to OSG, and helped with porting
  the "material" animation.
 Curt Olson http://www.flightgear.org/~curt/
  Curt is responsible for overall project and source code management.
  He has his hands in many of the areas.
@@ -175,7 +196,7 @@ NOTE:
 ----
 THIS DOCUMENT WAS INITIALLY WRITTEN BY 
-Curt L. Olson  <curt@flightgear.org>
+Curt L. Olson  <http://www.flightgear.org/~curt>
 05 Jul 2000 Removed non-SimGear entries (CLO)
@@ -3,7 +3,7 @@ dnl originally from ncftp 2.3.0
 dnl added wi_EXTRA_PDIR and wi_ANSI_C
 dnl $Id$
 dnl
-AC_DEFUN(wi_EXTRA_IDIR, [
+AC_DEFUN([wi_EXTRA_IDIR], [
 incdir="$1"
 if test -r $incdir ; then
 	case "$CPPFLAGS" in
@@ -25,7 +25,7 @@ dnl
 dnl
 dnl
 dnl
-AC_DEFUN(wi_EXTRA_LDIR, [
+AC_DEFUN([wi_EXTRA_LDIR], [
 mylibdir="$1"
 if test -r $mylibdir ; then
 	case "$LDFLAGS" in
@@ -47,7 +47,7 @@ dnl
 dnl __FP__
 dnl
 dnl
-AC_DEFUN(wi_EXTRA_PDIR, [
+AC_DEFUN([wi_EXTRA_PDIR], [
 progdir="$1"
 if test -r $progdir ; then
 	case "$PATH" in
@@ -76,7 +76,7 @@ dnl
 dnl If you want to look for subdirectories in include/lib directories,
 dnl you pass the names in argument 3, otherwise pass a dash.
 dnl
-AC_DEFUN(wi_EXTRA_DIRS, [echo "checking for extra include and lib directories..." 1>&6
+AC_DEFUN([wi_EXTRA_DIRS], [echo "checking for extra include and lib directories..." 1>&6
 ifelse([$1], yes, [dnl
 b1=`cd .. ; pwd`
 b2=`cd ../.. ; pwd`
@@ -111,7 +111,7 @@ done
 dnl
 dnl
 dnl
-AC_DEFUN(wi_HPUX_CFLAGS,
+AC_DEFUN([wi_HPUX_CFLAGS],
 [AC_MSG_CHECKING(if HP-UX ansi C compiler flags are needed)
 AC_REQUIRE([AC_PROG_CC])
 os=`uname -s | tr '[A-Z]' '[a-z]'`
@@ -144,7 +144,7 @@ AC_MSG_RESULT($ac_cv_hpux_flags)
 dnl
 dnl
 dnl
-AC_DEFUN(wi_CFLAGS, [AC_REQUIRE([AC_PROG_CC])
+AC_DEFUN([wi_CFLAGS], [AC_REQUIRE([AC_PROG_CC])
 wi_HPUX_CFLAGS
 	if test "$CFLAGS" = "" ; then
 		CFLAGS="-O"
@@ -165,7 +165,7 @@ wi_HPUX_CFLAGS
 dnl
 dnl
 dnl
-AC_DEFUN(wi_PROTOTYPES, [
+AC_DEFUN([wi_PROTOTYPES], [
 AC_MSG_CHECKING(if the compiler supports function prototypes)
 AC_TRY_COMPILE(,[extern void exit(int status);],[wi_cv_prototypes=yes
 AC_DEFINE(PROTOTYPES)],wi_cv_prototypes=no)
@@ -174,7 +174,7 @@ AC_MSG_RESULT($wi_cv_prototypes)
 dnl
 dnl
 dnl
-AC_DEFUN(wi_ANSI_C, [
+AC_DEFUN([wi_ANSI_C], [
 AC_MSG_CHECKING(ANSI-style function definitions)
 AC_TRY_COMPILE(,[int blubb(int x) { return 0; }],[wi_cv_ansi_funcs=yes
 AC_DEFINE(ANSI_FUNCS)],wi_cv_ansi_funcs=no)
@@ -183,7 +183,7 @@ AC_MSG_RESULT($wi_cv_ansi_funcs)
 dnl
 dnl
 dnl
-AC_DEFUN(wi_HEADER_SYS_SELECT_H, [
+AC_DEFUN([wi_HEADER_SYS_SELECT_H], [
 # See if <sys/select.h> is includable after <sys/time.h>
 if test "$ac_cv_header_sys_time_h" = no ; then
 AC_CHECK_HEADERS(sys/time.h sys/select.h)
@@ -211,7 +211,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_LIB_RESOLV, [
+AC_DEFUN([wi_LIB_RESOLV], [
 # See if we could access two well-known sites without help of any special
 # libraries, like resolv.
@@ -244,7 +244,7 @@ dnl
 dnl
 dnl
-AC_DEFUN(wi_LIB_NSL, [
+AC_DEFUN([wi_LIB_NSL], [
 AC_MSG_CHECKING(if we can use -lnsl)
 ac_save_LIBS="$LIBS";
 LIBS="$LIBS -lnsl";
@@ -261,7 +261,7 @@ dnl
 dnl
 dnl
-AC_DEFUN(nc_PATH_PROG_ZCAT, [
+AC_DEFUN([nc_PATH_PROG_ZCAT], [
 AC_PATH_PROG(GZCAT,gzcat)
 AC_PATH_PROG(ZCAT,zcat)
 if test "x$GZCAT" = x ; then
@@ -287,7 +287,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_SYSV_EXTRA_DIRS, [
+AC_DEFUN([wi_SYSV_EXTRA_DIRS], [
 # Use System V because their curses extensions are required.  This must
 # be done early so we use the -I and -L in the library checks also.
 # This is mostly a Solaris/SunOS hack.  Note that doing this will also
@@ -305,7 +305,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_DEFINE_UNAME, [
+AC_DEFUN([wi_DEFINE_UNAME], [
 # Get first 127 chars of all uname information.  Some folks have
 # way too much stuff there, so grab only the first 127.
 unam=`uname -a 2>/dev/null | cut -c1-127`
@@ -316,7 +316,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_READLINE_WITH_NCURSES, [
+AC_DEFUN([wi_READLINE_WITH_NCURSES], [
 # Readline and Ncurses could both define "backspace".
 # Warn about this if we have both things in our definitions list.
@@ -352,7 +352,7 @@ dnl
 dnl AC_EXT_DAYLIGHT
 dnl Check for an external variable daylight. Stolen from w3c-libwww.
-AC_DEFUN(AC_EXT_DAYLIGHT,
+AC_DEFUN([AC_EXT_DAYLIGHT],
 [ AC_MSG_CHECKING(int daylight variable)
 AC_TRY_COMPILE([#include <time.h>], [return daylight;],
  have_daylight=yes,
@@ -362,7 +362,7 @@ AC_MSG_RESULT($have_daylight)
 dnl AC_EXT_TIMEZONE
 dnl Check for an external variable timezone. Stolen from tcl-8.0.
-AC_DEFUN(AC_EXT_TIMEZONE,
+AC_DEFUN([AC_EXT_TIMEZONE],
 [
 #
 # Its important to include time.h in this check, as some systems (like convex)
@@ -395,7 +395,7 @@ fi
 ## AC_BZ_SET_COMPILER: Addition by Theodore Papadopoulo
 ## Patch by Jim McKelvey: change sed -e 's/ /@/g' to sed -e 's/ /@/'
-AC_DEFUN(AC_SG_SET_COMPILER,
+AC_DEFUN([AC_SG_SET_COMPILER],
  [cxxwith=`echo $1 | sed -e 's/ /@/'`
   case "$cxxwith" in
     *:*@*)                 # Full initialization syntax
@@ -4,14 +4,13 @@ exclude_dir = threads
 include_path = .
 include_path = ..
 include_path = .\SimGear
-include_path = .\SimGear\metakit-2.4.3\include
+include_path = ..\zlib-1.2.3
-include_path = ..\SimGear\zlib-1.1.4
+include_path = "..\OpenAL 1.0 Software Development Kit\include"
 define = _USE_MATH_DEFINES
 define = _CRT_SECURE_NO_DEPRECATE
 define = HAVE_CONFIG_H
 add_project = .\SimGear\metakit-2.4.3\win\msvc60\mklib.dsp,mklib
 add_project = .\SimGear\zlib.dsp,zlib
 # Rule to create simgear_config.h
 add_source_file = SOURCE=.\simgear\simgear_config.h.vc5\
 \
@@ -1,7 +1,5 @@
 dnl Process this file with autoget.sh to produce a working configure
 dnl script.
 dnl
 dnl $Id$
 AC_INIT
 AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx])
@@ -10,7 +8,7 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.3.4)
+AM_INIT_AUTOMAKE(SimGear, 0.3.10)
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.
@@ -47,8 +45,25 @@ case "${host}" in
    if test "x$CXX" = "xCC" -o "x$CXX" = "xccache CC"; then
        AR="$CXX -ar"
        ARFLAGS="-o"
-        CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility"
+        CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility/MIPSpro740"
        compatibility_DIR="compatibility"
        MIPSpro_DIRS="MIPSpro740"
        AC_MSG_CHECKING([for MIPSpro compiler version 7.4 or newer])
        AC_TRY_RUN([
           int main() {
              if ( _COMPILER_VERSION < 740 ) {
                 return -1;
              }
              return 0;
           }
        ], AC_MSG_RESULT(yes),
        [  AC_MSG_RESULT(no)
           CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility/MIPSpro721"
           MIPSpro_DIRS="$(MIPSpro_DIRS) MIPSpro721"
           AC_MSG_WARN([Using our own subset of the STL headers])
        ], AC_MSG_RESULT(yes))
        AC_SUBST(MIPSpro_DIRS)
    fi
    ;;
 *)
@@ -96,10 +111,25 @@ else
 fi
 AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$with_jpeg_factory" = "xyes")
 # specify the plib location
 AC_ARG_WITH(plib, [  --with-plib=PREFIX      Specify the prefix path to plib])
 if test "x$with_plib" != "x" ; then
    echo "plib prefix is $with_plib"
    EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
 fi
 # specify the osg location
 AC_ARG_WITH(osg, [  --with-osg=PREFIX       Specify the prefix path to osg])
 if test "x$with_osg" != "x" ; then
    echo "osg prefix is $with_osg"
    EXTRA_DIRS="${EXTRA_DIRS} $with_osg"
 fi
 dnl Determine an extra directories to add to include/lib search paths
 case "${host}" in
-*-apple-darwin* | *-*-mingw32*)
+*-apple-darwin* | *-*-cygwin* | *-*-mingw32*)
    echo no EXTRA_DIRS for $host
    ;;
@@ -110,7 +140,7 @@ case "${host}" in
    if test -d /opt/X11R6 ; then
        EXTRA_DIR2="/opt/X11R6"
    fi
-    EXTRA_DIRS="$EXTRA_DIR1 $EXTRA_DIR2"
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
    ;;
 esac
@@ -141,33 +171,18 @@ dnl Checks for libraries.
 dnl Thread related checks
 AC_CHECK_HEADER(pthread.h)
-AC_CHECK_LIB(pthread, pthread_exit)
+AC_SEARCH_LIBS(pthread_exit, [pthread c_r])
-if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
+if test "x$ac_cv_header_pthread_h" = "xyes"; then
    CXXFLAGS="$CXXFLAGS -D_REENTRANT"
    CFLAGS="$CFLAGS -D_REENTRANT"
-fi
+
-if test "x$ac_cv_lib_pthread_pthread_exit" != "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
+  if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
    dnl FreeBSD: System has pthread.h, but -lpthread library check
    dnl fails.  See if we need -pthread instead of -lpthread and look
    dnl for the functions in libc_r.
    save_CXXFLAGS="$CXXFLAGS"
    save_CFLAGS="$CFLAGS"
    CXXFLAGS="-pthread $CXXFLAGS"
-    CFLAGS="-pthread $FLAGS"
+    CFLAGS="-pthread $CFLAGS"
-    save_LIBS=$LIBS
+  fi
    AC_CHECK_LIB(c_r, pthread_exit)
    if test "x$ac_cv_lib_c_r_pthread_exit" != "xyes"; then
        CXXFLAGS=$save_CXXFLAGS
        CFLAGS=$save_CFLAGS
    else
        dnl This is cheating a bit. pthread_exit comes with using -pthread, not
 -lpthread
        ac_cv_lib_pthread_pthread_exit="yes"
    fi
    LIBS=$save_LIBS
 fi
-AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes")
+AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_header_pthread_h" = "xyes")
 thread_LIBS="$LIBS"
 LIBS=""
@@ -243,10 +258,64 @@ case "${host}" in
 esac
 AC_SEARCH_LIBS(glutGetModifiers, [ glut glut32 freeglut ], have_glut=yes, have_glut=no)
 AM_CONDITIONAL(HAVE_GLUT, test "x$have_glut" = "xyes")
 opengl_LIBS="$LIBS"
 LIBS="$base_LIBS"
 dnl check for OpenAL libraries
 OPENAL_OK="no"
 case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
    dnl CygWin under Windoze.
    INCLUDES="$INCLUDES -I/usr/local/include/"
    LIBS="$LIBS -L/usr/local/lib"
    AC_SEARCH_LIBS(alGenBuffers, [ openal32 openal ] )
    AC_SEARCH_LIBS(alutInit, [ openal32 ALut alut ] )
    LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
    openal_LIBS="$LIBS"
    OPENAL_OK="$ac_cv_search_alGenBuffers"
    ;;
 *-apple-darwin*)
    dnl Mac OS X
    LIBS="$LIBS -framework IOKit -framework OpenAL"
    openal_LIBS="$LIBS"
    # not sure how to test if OpenAL exists on MacOS (does it come by default?)
    OPENAL_OK="yes"
    ;;
 *)
    dnl default unix style machines
    save_LIBS=$LIBS
    LIBS="$LIBS $thread_LIBS"
    AC_SEARCH_LIBS(alGenBuffers, openal)
    AC_SEARCH_LIBS(alutInit, [ alut openal ] )
    OPENAL_OK="$ac_cv_search_alGenBuffers"
    openal_LIBS="$LIBS"
    LIBS=$save_LIBS
    ;;
 esac
 if test "$OPENAL_OK" == "no"; then
    echo
    echo "You *must* have the openal library installed on your system to build"
    echo "SimGear!"
    echo
    echo "Please see README.OpenAL for more details."
    echo
    echo "configure aborted."
    exit
 fi
 LIBS="$base_LIBS"
 AC_SUBST(base_LIBS)
 AC_SUBST(openal_LIBS)
 AC_SUBST(opengl_LIBS)
 AC_SUBST(thread_LIBS)
 AC_SUBST(network_LIBS)
@@ -273,11 +342,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
    exit
 fi
-AC_MSG_CHECKING([for plib 1.6.0 or newer])
+AC_MSG_CHECKING([for plib 1.8.4 or newer])
 AC_TRY_RUN([
 #include <plib/ul.h>
-#define MIN_PLIB_VERSION 160
+#define MIN_PLIB_VERSION 184
 int main() {
    int major, minor, micro;
@@ -292,7 +361,7 @@ int main() {
 ],
  AC_MSG_RESULT(yes),
  [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install plib 1.6.0 or later first...])],
+   AC_MSG_ERROR([Install plib 1.8.4 or later first...])],
  AC_MSG_RESULT(yes)
 )
@@ -329,48 +398,53 @@ fi
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_TYPE_MODE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 dnl Checks for library functions.
 old_LIBS=$LIBS
 LIBS="$base_LIBS $network_LIBS $opengl_LIBS"
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS( \
+AC_CHECK_FUNCS( [ \
        ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
-	random drand48 setitimer getitimer signal GetLocalTime rint getrusage )
+	random drand48 setitimer getitimer signal GetLocalTime rint getrusage ] )
 LIBS=$old_LIBS
 AM_CONFIG_HEADER(simgear/simgear_config.h)
 AC_CONFIG_FILES([ \
 	Makefile \
 	SimGear.spec \
 	src-libs/Makefile \
 	simgear/Makefile \
 	simgear/version.h \
 	simgear/compatibility/Makefile \
 	simgear/compatibility/MIPSpro721/Makefile \
 	simgear/compatibility/MIPSpro740/Makefile \
 	simgear/bucket/Makefile \
 	simgear/debug/Makefile \
 	simgear/ephemeris/Makefile \
 	simgear/io/Makefile \
 	simgear/magvar/Makefile \
 	simgear/math/Makefile \
-	simgear/metar/Makefile \
+	simgear/environment/Makefile \
 	simgear/misc/Makefile \
 	simgear/nasal/Makefile \
 	simgear/props/Makefile \
 	simgear/route/Makefile \
 	simgear/scene/Makefile \
 	simgear/scene/material/Makefile \
 	simgear/scene/model/Makefile \
 	simgear/scene/sky/Makefile \
 	simgear/scene/sky/clouds3d/Makefile \
 	simgear/scene/tgdb/Makefile \
 	simgear/scene/util/Makefile \
 	simgear/screen/Makefile \
 	simgear/serial/Makefile \
 	simgear/sound/Makefile \
 	simgear/structure/Makefile \
 	simgear/threads/Makefile \
 	simgear/timing/Makefile \
 	simgear/xgl/Makefile \
 	simgear/xml/Makefile \
 ])
 AC_OUTPUT
@@ -397,7 +471,7 @@ else
   echo "Without JPEG Factory support"
 fi
-if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
+if test "x$ac_cv_header_pthread_h" = "xyes"; then
   echo "Threads: pthread lib found."
 else
   echo "Threads: no threads (pthread lib not found.)"
@@ -0,0 +1,4 @@
 Debug
 Release
 SimGear.ncb
 SimGear.suo
@@ -0,0 +1,21 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimGear", "SimGear.vcproj", "{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug.ActiveCfg = Debug|Win32
 		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Debug.Build.0 = Debug|Win32
 		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release.ActiveCfg = Release|Win32
 		{22540CD3-D3CA-4C86-A773-80AEEE3ACDED}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
 	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
 EndGlobal
@@ -0,0 +1,20 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimGear", "SimGear.vcproj", "{952B5B5B-7FC8-4AE9-A664-333322BEEEB0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Debug|Win32.Build.0 = Debug|Win32
 		{952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Release|Win32.ActiveCfg = Release|Win32
 		{952B5B5B-7FC8-4AE9-A664-333322BEEEB0}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
@@ -5,9 +5,9 @@ SGTHREAD_DIR =
 endif
 # METAR_DIRS =
-METAR_DIRS = metar
+METAR_DIRS = environment
-EXTRA_DIST = simgear_config.h.vc5 version.h.in
+EXTRA_DIST = simgear_config.h.vc5 simgear_config.h-msvc71 version.h.in
 include_HEADERS = \
 	compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
@@ -24,6 +24,7 @@ SUBDIRS = \
 	magvar \
 	math \
 	$(METAR_DIRS) \
 	nasal \
 	props \
 	route \
 	scene \
@@ -31,7 +32,6 @@ SUBDIRS = \
 	serial \
 	sound \
 	$(SGTHREAD_DIR) \
-	timing \
+	timing
 	xgl
-DIST_SUBDIRS = $(SUBDIRS) compatibility metar threads
+DIST_SUBDIRS = $(SUBDIRS) compatibility
@@ -3,7 +3,7 @@
 *
 * Written by Curtis L. Olson, started February 1999.
 *
- * Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+ * Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt/
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -45,6 +44,9 @@ SGBucket::SGBucket(const double dlon, const double dlat) {
    set_bucket(dlon, dlat);
 }
 SGBucket::SGBucket(const SGGeod& geod) {
    set_bucket(geod);
 }
 // create an impossible bucket if false
 SGBucket::SGBucket(const bool is_good) {
@@ -74,11 +76,6 @@ SGBucket::SGBucket(const long int bindex) {
 }
 // default destructor
 SGBucket::~SGBucket() {
 }
 // Set the bucket params for the specified lat and lon
 void SGBucket::set_bucket( double *lonlat ) {
    set_bucket( lonlat[0], lonlat[1] );
@@ -136,6 +133,11 @@ void SGBucket::set_bucket( double dlon, double dlat ) {
 }
 void SGBucket::set_bucket(const SGGeod& geod)
 {
    set_bucket(geod.getLongitudeDeg(), geod.getLatitudeDeg());
 }
 // Build the path name for this bucket
 string SGBucket::gen_base_path() const {
    // long int index;
@@ -208,7 +210,7 @@ double SGBucket::get_width_m() const {
    double clat_rad = clat * SGD_DEGREES_TO_RADIANS;
    double cos_lat = cos( clat_rad );
    double local_radius = cos_lat * SG_EQUATORIAL_RADIUS_M;
-    double local_perimeter = 2.0 * local_radius * SGD_PI;
+    double local_perimeter = local_radius * SGD_2PI;
    double degree_width = local_perimeter / 360.0;
    return sg_bucket_span( get_center_lat() ) * degree_width;
@@ -217,7 +219,7 @@ double SGBucket::get_width_m() const {
 // return height of the tile in meters
 double SGBucket::get_height_m() const {
-    double perimeter = 2.0 * SG_EQUATORIAL_RADIUS_M * SGD_PI;
+    double perimeter = SG_EQUATORIAL_RADIUS_M * SGD_2PI;
    double degree_height = perimeter / 360.0;
    return SG_BUCKET_SPAN * degree_height;
@@ -271,16 +273,32 @@ void sgBucketDiff( const SGBucket& b1, const SGBucket& b2, int *dx, int *dy ) {
 #endif
    // longitude difference
-    double c1_lon = b1.get_center_lon();
+    double diff_lon=0.0;
-    double c2_lon = b2.get_center_lon();
+    double span=0.0;
-    double diff_lon = c2_lon - c1_lon;
+
-    double span;
+    SGBucket tmp_bucket;
-    if ( sg_bucket_span(c1_lat) <= sg_bucket_span(c2_lat) ) {
+    // To handle crossing the bucket size boundary
    //  we need to account for different size buckets.
    if ( sg_bucket_span(c1_lat) <= sg_bucket_span(c2_lat) )
    {
 	span = sg_bucket_span(c1_lat);
    } else {
 	span = sg_bucket_span(c2_lat);
    }
    diff_lon = b2.get_center_lon() - b1.get_center_lon();
    if (diff_lon <0.0)
    {
       diff_lon -= b1.get_width()*0.5 + b2.get_width()*0.5 - span;
    } 
    else
    {
       diff_lon += b1.get_width()*0.5 + b2.get_width()*0.5 - span;
    }
 #ifdef HAVE_RINT
    *dx = (int)rint( diff_lon / span );
 #else
@@ -3,7 +3,7 @@
 *
 * Written by Curtis L. Olson, started February 1999.
 *
- * Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+ * Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Library General Public
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -32,6 +31,7 @@
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/math/SGMath.hxx>
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -115,10 +115,10 @@ class SGBucket {
 private:
    double cx, cy;  // centerpoint (lon, lat) in degrees of bucket
-    int lon;        // longitude index (-180 to 179)
+    short lon;        // longitude index (-180 to 179)
-    int lat;        // latitude index (-90 to 89)
+    short lat;        // latitude index (-90 to 89)
-    int x;          // x subdivision (0 to 7)
+    char x;          // x subdivision (0 to 7)
-    int y;          // y subdivision (0 to 7)
+    char y;          // y subdivision (0 to 7)
 public:
@@ -134,6 +134,13 @@ public:
     */
    SGBucket(const double dlon, const double dlat);
    /**
     * Construct a bucket given a specific location.
     * @param dlon longitude specified in degrees
     * @param dlat latitude specified in degrees
     */
    SGBucket(const SGGeod& geod);
    /** Construct a bucket.
     *  @param is_good if false, create an invalid bucket.  This is
     *  useful * if you are comparing cur_bucket to last_bucket and
@@ -147,11 +154,6 @@ public:
     */
    SGBucket(const long int bindex);
    /**
     * Default destructor.
     */
    ~SGBucket();
    /**
     * Reset a bucket to represent a new lat and lon
     * @param dlon longitude specified in degrees
@@ -166,6 +168,13 @@ public:
     */
    void set_bucket( double *lonlat );
    /**
     * Reset a bucket to represent a new lat and lon
     * @param dlon longitude specified in degrees
     * @param dlat latitude specified in degrees
     */
    void set_bucket(const SGGeod& geod);
    /**
     * Create an impossible bucket.
     * This is useful if you are comparing cur_bucket to last_bucket
@@ -253,18 +262,37 @@ public:
     * @return the height of the tile in meters.
     */
    double get_height_m() const;
- 
+
    /**
     * @return the center of the bucket in geodetic coordinates.
     */
    SGGeod get_center() const
    { return SGGeod::fromDeg(get_center_lon(), get_center_lat()); }
    /**
     * @return the center of the bucket in geodetic coordinates.
     */
    SGGeod get_corner(unsigned num) const
    {
        double lonFac = ((num + 1) & 2) ? 0.5 : -0.5;
        double latFac = ((num    ) & 2) ? 0.5 : -0.5;
        return SGGeod::fromDeg(get_center_lon() + lonFac*get_width(),
                               get_center_lat() + latFac*get_height());
    }
    // Informational methods.
    /**
-     * @return the lon of the lower left corner of this tile.
+     * @return the lon of the lower left corner of 
     * the 1x1 chunk containing this tile.
     */
-    inline int get_lon() const { return lon; }
+    inline int get_chunk_lon() const { return lon; }
    /**
-     * @return the lat of the lower left corner of this tile.
+     * @return the lat of the lower left corner of 
     * the 1x1 chunk containing this tile.
     */
-    inline int get_lat() const { return lat; }
+    inline int get_chunk_lat() const { return lat; }
    /**
     * @return the x coord within the 1x1 degree chunk this tile.
@@ -0,0 +1,14 @@
 includedir = @includedir@/compatibility/
 include_HEADERS	= \
 	iostream \
 	strstream \
 	sstream \
 	istream \
 	fstream \
 	iterator \
 	iomanip \
 	new \
 	streambuf \
 	\
 	irix_string
@@ -8,8 +8,8 @@
  namespace std {
    using ::fstream;
    using ::ifstream;
    using ::ofstream;
    using ::ifstream;
  };
@@ -5,7 +5,9 @@
 # include <iomanip.h>
 namespace std {
   using ::setw;
   using ::setprecision;
   inline int  setfill(int f) { ::setfill(f); }
 };
@@ -2,10 +2,9 @@
 #ifndef __SG_IOSTREAM
 #define __SG_IOSTREAM 1
 # include <fstream>
 # if defined(sgi) && !defined(__GNUC__)
 # include <fstream>
 # include <iostream.h>
  class ios_base : public ios {
@@ -1,6 +1,8 @@
 #ifndef __SGI_HXX
-#define __SGI_HXX
+#define __SGI_HXX 1
 #ifdef __cplusplus
 #include <string>
@@ -40,4 +42,6 @@ operator+(const char* lhs, const std::string& rhs)
    return std::string(lhs) + rhs;
 }
-#endif // !__SGI_HXX
+#endif /* __cplusplus */
 #endif /* !__SGI_HXX */
@@ -14,8 +14,7 @@ namespace std {
   };
-   class istringstream : public istrstream {
+   typedef istrstream istringstream;
   };
 };
@@ -0,0 +1,2 @@
 Makefile
 Makefile.in
@@ -0,0 +1,22 @@
 includedir = @includedir@/compatibility
 EXTRA_DIST = README
 include_HEADERS	= \
 	cfloat \
 	csetjmp \
 	cstdio \
 	cwchar \
 	cassert \
 	climits \
 	csignal \
 	cstdlib \
 	cwctype \
 	cctype \
 	clocale \
 	cstdarg \
 	cstring \
 	cerrno \
 	cmath \
 	cstddef \
 	ctime
@@ -1,33 +1,3 @@
-includedir = @includedir@/compatibility
+SUBDIRS = $(MIPSpro_DIRS)
-EXTRA_DIST = README
+DIST_SUBDIRS = MIPSpro721 MIPSpro740
 include_HEADERS	= \
 	cfloat \
 	csetjmp \
 	cstdio \
 	cwchar \
 	iostream \
 	strstream \
 	sstream \
 	cassert \
 	climits \
 	csignal \
 	cstdlib \
 	cwctype \
 	istream \
 	cctype \
 	clocale \
 	cstdarg \
 	cstring \
 	fstream \
 	iterator \
 	cerrno \
 	cmath \
 	cstddef \
 	ctime \
 	iomanip \
 	new \
 	streambuf \
 	\
 	IRIX
@@ -11,10 +11,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 *
@@ -121,7 +120,7 @@
 #      define STL_STRSTREAM  <strstream>
 #    endif
-#  elif __GNUC__ == 3
+#  elif __GNUC__ >= 3
       // g++-3.0.x
 #      define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #      define SG_NEED_AUTO_PTR
@@ -149,12 +148,6 @@
 #endif // __GNUC__
 #if defined( __MINGW32__ )
 #  define bcopy(from, to, n) memcpy(to, from, n)
 #  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
 #  define snprintf _snprintf
 #endif
 /* KAI C++ */
 #if defined(__KCC)
@@ -219,7 +212,7 @@
 #  define bcopy(from, to, n) memcpy(to, from, n)
 #  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
-#  if _MSC_VER == 1200  // msvc++ 6.0
+#  if _MSC_VER >= 1200  // msvc++ 6.0 or greater
 #    define SG_NAMESPACES
 #    define SG_HAVE_STD
 #    define SG_HAVE_STD_INCLUDES
@@ -235,7 +228,9 @@
 #    define STL_STRING     <string>
 #    define STL_STRSTREAM  <strstream>
 #    define isnan _isnan
 #    define snprintf _snprintf
 #    define copysign _copysign
 #    pragma warning(disable: 4786) // identifier was truncated to '255' characters
 #    pragma warning(disable: 4244) // conversion from double to float
@@ -290,8 +285,6 @@
 #if defined ( sgi ) && !defined( __GNUC__ )
 #  define SG_HAVE_NATIVE_SGI_COMPILERS
 #include <simgear/compatibility/IRIX>
 #  define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #  define SG_CLASS_PARTIAL_SPECIALIZATION
 #  define SG_NEED_AUTO_PTR
@@ -309,7 +302,11 @@
 #  define STL_ITERATOR   <iterator>
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
 #if (_COMPILER_VERSION < 740)
 #  define STL_STRING     <irix_string>
 #else
 #  define STL_STRING     <string>
 #endif
 #  define STL_STRSTREAM  <strstream>
 #pragma set woff 1001,1012,1014,1116,1155,1172,1174
@@ -317,6 +314,9 @@
 #ifdef __cplusplus
 #pragma set woff 1682,3303
 #if (_COMPILER_VERSION >= 740)
 #  pragma set woff 3624
 #endif
 #endif
 #  define SG_COMPILER_STR "SGI MipsPro compiler version " SG_STRINGIZE(_COMPILER_VERSION)
@@ -324,7 +324,7 @@
 #endif // Native SGI compilers
-#if defined ( sun )
+#if defined (__sun)
 #  include <strings.h>
 #  include <memory.h>
 #  if defined ( __cplusplus )
@@ -336,7 +336,9 @@
     extern void *memmove(void *, const void *, size_t);
 #  endif // __cplusplus
-#  define SG_COMPILER_STR "Sun compiler version " SG_STRINGIZE(__SUNPRO_CC)
+#  if  !defined( __GNUC__ )
 #   define SG_COMPILER_STR "Sun compiler version " SG_STRINGIZE(__SUNPRO_CC)
 #  endif
 #endif // sun
@@ -364,6 +366,27 @@
 #endif // __ICC
 //
 // Platform dependent gl.h and glut.h definitions
 //
 #ifdef __APPLE__
 #  define SG_GL_H <OpenGL/gl.h>
 #  define SG_GLX_H <AGL/agl.h>
 #  define SG_GLU_H <OpenGL/glu.h>
 #  define SG_GLEXT_H <OpenGL/glext.h>
 #  define SG_GLUT_H <GLUT/glut.h>
 inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
 #else
 #  define SG_GL_H <GL/gl.h>
 #  define SG_GLX_H <GL/glx.h>
 #  define SG_GLU_H <GL/glu.h>
 #  define SG_GLEXT_H <GL/glext.h>
 #  define SG_GLUT_H <GL/glut.h>
 #endif
 //
 // No user modifiable definitions beyond here.
 //
@@ -445,3 +468,4 @@ inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const)
 #endif // SG_INCOMPLETE_FUNCTIONAL
 #endif // _SG_COMPILER_H
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started February 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt/
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -14,10 +14,9 @@
 // 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
+// You should have received a copy of the GNU General Public License
-// License along with this library; if not, write to the
+// along with this program; if not, write to the Free Software
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Boston, MA  02111-1307, USA.
 //
 // $Id$
@@ -106,21 +105,57 @@
 #define SG_METER_TO_FEET    3.28083989501312335958  
 /** Meters to Nautical Miles.  1 nm = 6076.11549 feet */
-#define SG_METER_TO_NM      0.00053995680
+#define SG_METER_TO_NM      0.0005399568034557235
 /** Nautical Miles to Meters */
 #define SG_NM_TO_METER      1852.0000
 /** Meters to Statute Miles. */
 #define SG_METER_TO_SM      0.0006213699494949496
 /** Statute Miles to Meters. */
 #define SG_SM_TO_METER      1609.3412196
 /** Radians to Nautical Miles.  1 nm = 1/60 of a degree */
 #define SG_NM_TO_RAD        0.00029088820866572159
 /** Nautical Miles to Radians */
 #define SG_RAD_TO_NM        3437.7467707849392526
 /** Miles per second to Knots */
 #define SG_MPS_TO_KT        1.9438444924406046432
 /** Knots to Miles per second */
 #define SG_KT_TO_MPS        0.5144444444444444444
 /** Feet per second to Knots */
 #define SG_FPS_TO_KT        0.5924838012958962841
 /** Knots to Feet per second */
 #define SG_KT_TO_FPS        1.6878098571011956874
 /** Miles per second to Miles per hour */
 #define SG_MPS_TO_MPH       2.2369362920544020312
 /** Miles per hour to Miles per second */
 #define SG_MPH_TO_MPS       0.44704
 /** Meters per second to Kilometers per hour */
 #define SG_MPS_TO_KMH       3.6
 /** Kilometers per hour to Miles per second */
 #define SG_KMH_TO_MPS       0.2777777777777777778
 /** Pascal to Inch Mercury */
 #define SG_PA_TO_INHG       0.0002952998330101010
 /** Inch Mercury to Pascal */
 #define SG_INHG_TO_PA       3386.388640341
 /** For divide by zero avoidance, this will be close enough to zero */
 #define SG_EPSILON 0.0000001
 /** Highest binobj format version we know how to read/write.  This starts at
 *  0 and can go up to 65535 */
 #define SG_BINOBJ_VERSION 6
@@ -24,7 +24,10 @@ typedef enum {
    SG_CLIPPER   = 0x00002000,
    SG_NETWORK   = 0x00004000,
    SG_ATC       = 0x00008000,
-    SG_UNDEFD    = 0x00010000, // For range checking
+    SG_NASAL     = 0x00010000,
    SG_INSTR     = 0x00020000,
    SG_SYSTEMS   = 0x00040000,
    SG_UNDEFD    = 0x00080000, // For range checking
    SG_ALL     = 0xFFFFFFFF
 } sgDebugClass;
@@ -14,10 +14,9 @@
 // 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
+// You should have received a copy of the GNU General Public License
-// License along with this library; if not, write to the
+// along with this program; if not, write to the Free Software
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Boston, MA  02111-1307, USA.
 //
 // $Id$
@@ -26,6 +25,9 @@
 logstream *global_logstream = NULL;
 bool            logbuf::logging_enabled = true;
 #ifdef _MSC_VER
   bool         logbuf::has_console = true;
 #endif
 sgDebugClass    logbuf::logClass        = SG_NONE;
 sgDebugPriority logbuf::logPriority     = SG_INFO;
 streambuf*      logbuf::sbuf            = NULL;
@@ -16,10 +16,9 @@
 // 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
+// You should have received a copy of the GNU General Public License
-// License along with this library; if not, write to the
+// along with this program; if not, write to the Free Software
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Boston, MA  02111-1307, USA.
 //
 // $Id$
@@ -28,6 +27,10 @@
 #include <simgear/compiler.h>
 #ifdef _MSC_VER
 #  include <windows.h>
 #endif
 #ifdef SG_HAVE_STD_INCLUDES
 # include <streambuf>
 # include <iostream>
@@ -136,6 +139,10 @@ public:
     */
    void set_sb( streambuf* sb );
 #ifdef _MSC_VER
    static void has_no_console() { has_console = false; }
 #endif
 protected:
    /** sync/flush */
@@ -151,6 +158,9 @@ private:
    static streambuf* sbuf;
    static bool logging_enabled;
 #ifdef _MSC_VER
    static bool has_console;
 #endif
    static sgDebugClass logClass;
    static sgDebugPriority logPriority;
@@ -180,7 +190,22 @@ logbuf::set_log_state( sgDebugClass c, sgDebugPriority p )
 inline logbuf::int_type
 logbuf::overflow( int c )
 {
 #ifdef _MSC_VER
    if ( logging_enabled ) {
        if ( !has_console ) {
            AllocConsole();
            freopen("conin$", "r", stdin);
            freopen("conout$", "w", stdout);
            freopen("conout$", "w", stderr);
            has_console = true;
        }
        return sbuf->sputc(c);
    }
    else
        return EOF == 0 ? 1: 0;
 #else
    return logging_enabled ? sbuf->sputc(c) : (EOF == 0 ? 1: 0);
 #endif
 }
 /**
@@ -1,3 +1,4 @@
 .deps
 Makefile
 Makefile.in
 metar
@@ -0,0 +1,9 @@
 includedir = @includedir@/environment
 lib_LIBRARIES = libsgenvironment.a
 include_HEADERS = metar.hxx visual_enviro.hxx
 libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx
 INCLUDES = -I$(top_srcdir)
@@ -0,0 +1,282 @@
 // metar interface class
 //
 // Written by Melchior FRANZ, started December 2003.
 //
 // Copyright (C) 2003  Melchior FRANZ - mfranz@aon.at
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
 // published by the Free Software Foundation; either version 2 of the
 // License, or (at your option) any later version.
 //
 // This program 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
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 #ifndef _METAR_HXX
 #define _METAR_HXX
 #include <vector>
 #include <map>
 #include <string>
 #include <simgear/constants.h>
 SG_USING_STD(vector);
 SG_USING_STD(map);
 SG_USING_STD(string);
 const double SGMetarNaN = -1E20;
 #define NaN SGMetarNaN
 struct Token {
 	char	*id;
 	char	*text;
 };
 class SGMetar;
 class SGMetarVisibility {
 	friend class SGMetar;
 public:
 	SGMetarVisibility() :
 		_distance(NaN),
 		_direction(-1),
 		_modifier(EQUALS),
 		_tendency(NONE) {}
 	enum Modifier {
 		NOGO,
 		EQUALS,
 		LESS_THAN,
 		GREATER_THAN
 	};
 	enum Tendency {
 		NONE,
 		STABLE,
 		INCREASING,
 		DECREASING
 	};
 	void set(double dist, int dir = -1, int mod = -1, int tend = -1);
 	inline double	getVisibility_m()	const { return _distance; }
 	inline double	getVisibility_ft()	const { return _distance == NaN ? NaN : _distance * SG_METER_TO_FEET; }
 	inline double	getVisibility_sm()	const { return _distance == NaN ? NaN : _distance * SG_METER_TO_SM; }
 	inline int	getDirection()		const { return _direction; }
 	inline int	getModifier()		const { return _modifier; }
 	inline int	getTendency()		const { return _tendency; }
 protected:
 	double	_distance;
 	int	_direction;
 	int	_modifier;
 	int	_tendency;
 };
 // runway condition (surface and visibility)
 class SGMetarRunway {
 	friend class SGMetar;
 public:
 	SGMetarRunway() :
 		_deposit(-1),
 		_deposit_string(0),
 		_extent(-1),
 		_extent_string(0),
 		_depth(NaN),
 		_friction(NaN),
 		_friction_string(0),
 		_comment(0),
 		_wind_shear(false) {}
 	inline int			getDeposit()		const { return _deposit; }
 	inline const char		*getDepositString()	const { return _deposit_string; }
 	inline double			getExtent()		const { return _extent; }
 	inline const char		*getExtentString()	const { return _extent_string; }
 	inline double			getDepth()		const { return _depth; }
 	inline double			getFriction()		const { return _friction; }
 	inline const char		*getFrictionString()	const { return _friction_string; }
 	inline const char		*getComment()		const { return _comment; }
 	inline const bool		getWindShear()		const { return _wind_shear; }
 	inline const SGMetarVisibility&	getMinVisibility()	const { return _min_visibility; }
 	inline const SGMetarVisibility&	getMaxVisibility()	const { return _max_visibility; }
 protected:
 	SGMetarVisibility _min_visibility;
 	SGMetarVisibility _max_visibility;
 	int		_deposit;
 	const char	*_deposit_string;
 	int		_extent;
 	const char	*_extent_string;
 	double		_depth;
 	double		_friction;
 	const char	*_friction_string;
 	const char	*_comment;
 	bool		_wind_shear;
 };
 // cloud layer
 class SGMetarCloud {
 	friend class SGMetar;
 public:
 	SGMetarCloud() :
 		_coverage(-1),
 		_altitude(NaN),
 		_type(0),
 		_type_long(0) {}
 	void set(double alt, int cov = -1);
 	inline int	getCoverage()		const { return _coverage; }
 	inline double	getAltitude_m()		const { return _altitude; }
 	inline double	getAltitude_ft()	const { return _altitude == NaN ? NaN : _altitude * SG_METER_TO_FEET; }
 	inline char	*getTypeString()	const { return _type; }
 	inline char	*getTypeLongString()	const { return _type_long; }
 protected:
 	int	_coverage;		// quarters: 0 -> clear ... 4 -> overcast
 	double	_altitude;		// 1000 m
 	char	*_type;			// CU
 	char	*_type_long;		// cumulus
 };
 class SGMetar {
 public:
 	SGMetar(const string& m, const string& proxy = "", const string& port = "",
 			const string &auth = "", const time_t time = 0);
 	~SGMetar();
 	enum ReportType {
 		NONE,
 		AUTO,
 		COR,
 		RTD
 	};
 	inline const char *getData()		const { return _data; }
 	inline const char *getUnusedData()	const { return _m; }
 	inline const bool getProxy()		const { return _x_proxy; }
 	inline const char *getId()		const { return _icao; }
 	inline int	getYear()		const { return _year; }
 	inline int	getMonth()		const { return _month; }
 	inline int	getDay()		const { return _day; }
 	inline int	getHour()		const { return _hour; }
 	inline int	getMinute()		const { return _minute; }
 	inline int	getReportType()		const { return _report_type; }
 	inline int	getWindDir()		const { return _wind_dir; }
 	inline double	getWindSpeed_mps()	const { return _wind_speed; }
 	inline double	getWindSpeed_kmh()	const { return _wind_speed == NaN ? NaN : _wind_speed * SG_MPS_TO_KMH; }
 	inline double	getWindSpeed_kt()	const { return _wind_speed == NaN ? NaN : _wind_speed * SG_MPS_TO_KT; }
 	inline double	getWindSpeed_mph()	const { return _wind_speed == NaN ? NaN : _wind_speed * SG_MPS_TO_MPH; }
 	inline double	getGustSpeed_mps()	const { return _gust_speed; }
 	inline double	getGustSpeed_kmh()	const { return _gust_speed == NaN ? NaN : _gust_speed * SG_MPS_TO_KMH; }
 	inline double	getGustSpeed_kt()	const { return _gust_speed == NaN ? NaN : _gust_speed * SG_MPS_TO_KT; }
 	inline double	getGustSpeed_mph()	const { return _gust_speed == NaN ? NaN : _gust_speed * SG_MPS_TO_MPH; }
 	inline int	getWindRangeFrom()	const { return _wind_range_from; }
 	inline int	getWindRangeTo()	const { return _wind_range_to; }
 	inline const SGMetarVisibility& getMinVisibility()	const { return _min_visibility; }
 	inline const SGMetarVisibility& getMaxVisibility()	const { return _max_visibility; }
 	inline const SGMetarVisibility& getVertVisibility()	const { return _vert_visibility; }
 	inline const SGMetarVisibility *getDirVisibility()	const { return _dir_visibility; }
 	inline double	getTemperature_C()	const { return _temp; }
 	inline double	getTemperature_F()	const { return _temp == NaN ? NaN : 1.8 * _temp + 32; }
 	inline double	getDewpoint_C()		const { return _dewp; }
 	inline double	getDewpoint_F()		const { return _dewp == NaN ? NaN : 1.8 * _dewp + 32; }
 	inline double	getPressure_hPa()	const { return _pressure == NaN ? NaN : _pressure / 100; }
 	inline double	getPressure_inHg()	const { return _pressure == NaN ? NaN : _pressure * SG_PA_TO_INHG; }
 	inline int	getRain()		const { return _rain; }
 	inline int	getHail()		const { return _hail; }
 	inline int	getSnow()		const { return _snow; }
 	inline bool	getCAVOK()		const { return _cavok; }
 	double		getRelHumidity()	const;
 	inline const vector<SGMetarCloud>& getClouds()	const	{ return _clouds; }
 	inline const map<string, SGMetarRunway>& getRunways()	const	{ return _runways; }
 	inline const vector<string>& getWeather()		const	{ return _weather; }
 protected:
 	string	_url;
 	int	_grpcount;
 	bool	_x_proxy;
 	char	*_data;
 	char	*_m;
 	char	_icao[5];
 	int	_year;
 	int	_month;
 	int	_day;
 	int	_hour;
 	int	_minute;
 	int	_report_type;
 	int	_wind_dir;
 	double	_wind_speed;
 	double	_gust_speed;
 	int	_wind_range_from;
 	int	_wind_range_to;
 	double	_temp;
 	double	_dewp;
 	double	_pressure;
 	int	_rain;
 	int	_hail;
 	int	_snow;
 	bool	_cavok;
 	SGMetarVisibility		_min_visibility;
 	SGMetarVisibility		_max_visibility;
 	SGMetarVisibility		_vert_visibility;
 	SGMetarVisibility		_dir_visibility[8];
 	vector<SGMetarCloud>		_clouds;
 	map<string, SGMetarRunway>	_runways;
 	vector<string>			_weather;
 	bool	scanPreambleDate();
 	bool	scanPreambleTime();
 	void	useCurrentDate();
 	bool	scanType();
 	bool	scanId();
 	bool	scanDate();
 	bool	scanModifier();
 	bool	scanWind();
 	bool	scanVariability();
 	bool	scanVisibility();
 	bool	scanRwyVisRange();
 	bool	scanSkyCondition();
 	bool	scanWeather();
 	bool	scanTemperature();
 	bool	scanPressure();
 	bool	scanRunwayReport();
 	bool	scanWindShear();
 	bool	scanTrendForecast();
 	bool	scanColorState();
 	bool	scanRemark();
 	bool	scanRemainder();
 	int	scanNumber(char **str, int *num, int min, int max = 0);
 	bool	scanBoundary(char **str);
 	const struct Token *scanToken(char **str, const struct Token *list);
 	char	*loadData(const char *id, const string& proxy, const string& port,
 			const string &auth, time_t time);
 	void	normalizeData();
 };
 #undef NaN
 #endif // _METAR_HXX
@@ -0,0 +1,831 @@
 // Visual environment helper class
 //
 // Written by Harald JOHNSEN, started April 2005.
 // Minor changes/additions by Vivian Meazza Apr- May 2007
 //
 // Ported to OSG by Tim Moore Jun 2007
 //
 // Copyright (C) 2005  Harald JOHNSEN - hjohnsen@evc.net
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
 // published by the Free Software Foundation; either version 2 of the
 // License, or (at your option) any later version.
 //
 // This program 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
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //
 #ifdef HAVE_CONFIG_H
 #  include <simgear_config.h>
 #endif
 #include <simgear/constants.h>
 #include <simgear/structure/SGReferenced.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/math/sg_random.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/scene/sky/cloudfield.hxx>
 #include <simgear/scene/sky/newcloud.hxx>
 #include <simgear/props/props.hxx>
 #include "visual_enviro.hxx"
 #include <vector>
 SG_USING_STD(vector);
 typedef struct {
 	Point3D		pt;
 	int			depth;
 	int			prev;
 } lt_tree_seg;
 #define MAX_RAIN_SLICE	200
 static float rainpos[MAX_RAIN_SLICE];
 #define MAX_LT_TREE_SEG	400
 #define DFL_MIN_LIGHT 0.35
 sgVec3 SGEnviro::min_light = {DFL_MIN_LIGHT, DFL_MIN_LIGHT, DFL_MIN_LIGHT};
 #define DFL_STREAK_BRIGHT_NEARMOST_LAYER 0.9
 SGfloat SGEnviro::streak_bright_nearmost_layer = DFL_STREAK_BRIGHT_NEARMOST_LAYER;
 #define DFL_STREAK_BRIGHT_FARMOST_LAYER 0.5
 SGfloat SGEnviro::streak_bright_farmost_layer = DFL_STREAK_BRIGHT_FARMOST_LAYER;
 #define DFL_STREAK_PERIOD_MAX 2.5
 SGfloat SGEnviro::streak_period_max = DFL_STREAK_PERIOD_MAX;
 #define DFL_STREAK_PERIOD_CHANGE_PER_KT 0.005
 SGfloat SGEnviro::streak_period_change_per_kt = DFL_STREAK_PERIOD_CHANGE_PER_KT;
 #define DFL_STREAK_PERIOD_MIN 1.0
 SGfloat SGEnviro::streak_period_min = DFL_STREAK_PERIOD_MIN;
 #define DFL_STREAK_LENGTH_MIN 0.03
 SGfloat SGEnviro::streak_length_min = DFL_STREAK_LENGTH_MIN;
 #define DFL_STREAK_LENGTH_CHANGE_PER_KT 0.0005
 SGfloat SGEnviro::streak_length_change_per_kt = DFL_STREAK_LENGTH_CHANGE_PER_KT;
 #define DFL_STREAK_LENGTH_MAX 0.1
 SGfloat SGEnviro::streak_length_max = DFL_STREAK_LENGTH_MAX;
 #define DFL_STREAK_COUNT_MIN 40
 int SGEnviro::streak_count_min = DFL_STREAK_COUNT_MIN;
 #define DFL_STREAK_COUNT_MAX 190
 #if (DFL_STREAK_COUNT_MAX > MAX_RAIN_SLICE)
 #error "Bad default!"
 #endif
 int SGEnviro::streak_count_max = DFL_STREAK_COUNT_MAX;
 #define DFL_CONE_BASE_RADIUS 15.0
 SGfloat SGEnviro::cone_base_radius = DFL_CONE_BASE_RADIUS;
 #define DFL_CONE_HEIGHT 30.0
 SGfloat SGEnviro::cone_height = DFL_CONE_HEIGHT;
 void SGEnviro::config(const SGPropertyNode* n)
 {
 	if (!n)
 		return;
 	const float ml = n->getFloatValue("min-light", DFL_MIN_LIGHT);
 	sgSetVec3(min_light, ml, ml, ml);
 	streak_bright_nearmost_layer = n->getFloatValue(
 			"streak-brightness-nearmost-layer",
 			DFL_STREAK_BRIGHT_NEARMOST_LAYER);
 	streak_bright_farmost_layer = n->getFloatValue(
 			"streak-brightness-farmost-layer",
 			DFL_STREAK_BRIGHT_FARMOST_LAYER);
 	streak_period_max = n->getFloatValue(
 			"streak-period-max",
 			DFL_STREAK_PERIOD_MAX);
 	streak_period_min = n->getFloatValue(
 			"streak-period-min",
 			DFL_STREAK_PERIOD_MIN);
 	streak_period_change_per_kt = n->getFloatValue(
 			"streak-period-change-per-kt",
 			DFL_STREAK_PERIOD_CHANGE_PER_KT);
 	streak_length_max = n->getFloatValue(
 			"streak-length-max",
 			DFL_STREAK_LENGTH_MAX);
 	streak_length_min = n->getFloatValue(
 			"streak-length-min",
 			DFL_STREAK_LENGTH_MIN);
 	streak_length_change_per_kt = n->getFloatValue(
 			"streak-length-change-per-kt",
 			DFL_STREAK_LENGTH_CHANGE_PER_KT);
 	streak_count_min = n->getIntValue(
 			"streak-count-min", DFL_STREAK_COUNT_MIN);
 	streak_count_max = n->getIntValue(
 			"streak-count-max", DFL_STREAK_COUNT_MAX);
 	if (streak_count_max > MAX_RAIN_SLICE)
 		streak_count_max = MAX_RAIN_SLICE;
 	cone_base_radius = n->getFloatValue(
 			"cone-base-radius", DFL_CONE_BASE_RADIUS);
 	cone_height = n->getFloatValue("cone_height", DFL_CONE_HEIGHT);
 }
 /**
 * A class to render lightnings.
 */
 class SGLightning {
 public:
    /**
     * Build a new lightning.
     * The lightning has a limited life time. It will also play a thunder sounder once.
     * @param lon lon longitude in degree
     * @param lat lat latitude in degree
     * @param alt asl of top of lightning
     */
 	SGLightning(double lon, double lat, double alt);
 	~SGLightning();
 	void lt_Render(void);
 	void lt_build(void);
 	void lt_build_tree_branch(int tree_nr, Point3D &start, float energy, int nbseg, float segsize);
 	// contains all the segments of the lightning
 	lt_tree_seg lt_tree[MAX_LT_TREE_SEG];
 	// segment count
 	int		nb_tree;
 	// position of lightning
 	double	lon, lat, alt;
 	int		sequence_count;
 	// time to live
 	double	age;
 };
 typedef vector<SGLightning *> list_of_lightning;
 static list_of_lightning lightnings;
 SGEnviro sgEnviro;
 SGEnviro::SGEnviro() :
 	view_in_cloud(false),
 	precipitation_enable_state(true),
 	precipitation_density(100.0),
 	precipitation_max_alt(0.0),
 	turbulence_enable_state(false),
 	last_cloud_turbulence(0.0),
 	cloud_turbulence(0.0),
 	lightning_enable_state(false),
 	elapsed_time(0.0),
 	dt(0.0),
 	soundMgr(NULL),
 	snd_active(false),
 	snd_dist(0.0),
 	min_time_before_lt(0.0),
 	fov_width(55.0),
 	fov_height(55.0)
 {
 	for(int i = 0; i < MAX_RAIN_SLICE ; i++)
 		rainpos[i] = sg_random();
 	radarEcho.reserve(100);
 }
 SGEnviro::~SGEnviro(void) {
  // OSGFIXME
  return;
 	list_of_lightning::iterator iLightning;
 	for( iLightning = lightnings.begin() ; iLightning != lightnings.end() ; iLightning++ ) {
 		delete (*iLightning);
 	}
 	lightnings.clear();
 }
 void SGEnviro::startOfFrame( sgVec3 p, sgVec3 up, double lon, double lat, double alt, double delta_time) {
  // OSGFIXME
  return;
 	view_in_cloud = false;
 	// ask the impostor cache to do some cleanup
 	if(SGNewCloud::cldCache)
 		SGNewCloud::cldCache->startNewFrame();
 	last_cloud_turbulence = cloud_turbulence;
 	cloud_turbulence = 0.0;
 	elapsed_time += delta_time;
 	min_time_before_lt -= delta_time;
 	dt = delta_time;
 	sgMat4 T1, LON, LAT;
    sgVec3 axis;
    sgMakeTransMat4( T1, p );
    sgSetVec3( axis, 0.0, 0.0, 1.0 );
    sgMakeRotMat4( LON, lon, axis );
    sgSetVec3( axis, 0.0, 1.0, 0.0 );
    sgMakeRotMat4( LAT, 90.0 - lat, axis );
    sgMat4 TRANSFORM;
    sgCopyMat4( TRANSFORM, T1 );
    sgPreMultMat4( TRANSFORM, LON );
    sgPreMultMat4( TRANSFORM, LAT );
    sgCoord pos;
    sgSetCoord( &pos, TRANSFORM );
 	sgMakeCoordMat4( transform, &pos );
    last_lon = lon;
    last_lat = lat;
 	last_alt = alt;
 	radarEcho.clear();
 	precipitation_max_alt = 400.0;
 }
 void SGEnviro::endOfFrame(void) {
 }
 double SGEnviro::get_cloud_turbulence(void) const {
 	return last_cloud_turbulence;
 }
 // this can be queried to add some turbulence for example
 bool SGEnviro::is_view_in_cloud(void) const {
 	return view_in_cloud;
 }
 void SGEnviro::set_view_in_cloud(bool incloud) {
 	view_in_cloud = incloud;
 }
 int SGEnviro::get_CacheResolution(void) const {
 	return SGCloudField::get_CacheResolution();
 }
 int SGEnviro::get_clouds_CacheSize(void) const {
 	return SGCloudField::get_CacheSize();
 }
 float SGEnviro::get_clouds_visibility(void) const {
 	return SGCloudField::get_CloudVis();
 }
 float SGEnviro::get_clouds_density(void) const {
 	return SGCloudField::get_density();
 }
 bool SGEnviro::get_clouds_enable_state(void) const {
 	return SGCloudField::get_enable3dClouds();
 }
 bool SGEnviro::get_turbulence_enable_state(void) const {
 	return turbulence_enable_state;
 }
 void SGEnviro::set_CacheResolution(int resolutionPixels) {
 	SGCloudField::set_CacheResolution(resolutionPixels);
 }
 void SGEnviro::set_clouds_CacheSize(int sizeKb) {
 	SGCloudField::set_CacheSize(sizeKb);
 }
 void SGEnviro::set_clouds_visibility(float distance) {
 	SGCloudField::set_CloudVis(distance);
 }
 void SGEnviro::set_clouds_density(float density) {
 	SGCloudField::set_density(density);
 }
 void SGEnviro::set_clouds_enable_state(bool enable) {
 	SGCloudField::set_enable3dClouds(enable);
 }
 void SGEnviro::set_turbulence_enable_state(bool enable) {
 	turbulence_enable_state = enable;
 }
 // rain/snow
 float SGEnviro::get_precipitation_density(void) const {
 	return precipitation_density;
 }
 bool SGEnviro::get_precipitation_enable_state(void) const {
 	return precipitation_enable_state;
 }
 void SGEnviro::set_precipitation_density(float density) {
 	precipitation_density = density;
 }
 void SGEnviro::set_precipitation_enable_state(bool enable) {
 	precipitation_enable_state = enable;
 }
 // others
 bool SGEnviro::get_lightning_enable_state(void) const {
 	return lightning_enable_state;
 }
 void SGEnviro::set_lightning_enable_state(bool enable) {
 	lightning_enable_state = enable;
 	if( ! enable ) {
 		// TODO:cleanup
 	}
 }
 void SGEnviro::setLight(sgVec4 adj_fog_color) {
  // OSGFIXME
  return;
 	sgCopyVec4( fog_color, adj_fog_color );
 	if( false ) {
 	//    ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, l->scene_diffuse() );
 	}
 }
 void SGEnviro::callback_cloud(float bearing, float alt, float radius, int family, float dist, int cloudId) {
 	// send data to wx radar
 	// compute turbulence
 	// draw precipitation
 	// draw lightning
 	// compute illumination
 	// http://www.pilotfriend.com/flight_training/weather/THUNDERSTORM%20HAZARDS1.htm
 	double turbulence = 0.0;
 	if( dist < radius * radius * 2.25f ) {
 		switch(family) {
 			case SGNewCloud::CLFamilly_st:
 				turbulence = 0.2;
 				break;
 			case SGNewCloud::CLFamilly_ci:
 			case SGNewCloud::CLFamilly_cs:
 			case SGNewCloud::CLFamilly_cc:
 			case SGNewCloud::CLFamilly_ac:
 			case SGNewCloud::CLFamilly_as:
 				turbulence = 0.1;
 				break;
 			case SGNewCloud::CLFamilly_sc:
 				turbulence = 0.3;
 				break;
 			case SGNewCloud::CLFamilly_ns:
 				turbulence = 0.4;
 				break;
 			case SGNewCloud::CLFamilly_cu:
 				turbulence = 0.5;
 				break;
 			case SGNewCloud::CLFamilly_cb:
 				turbulence = 0.6;
 				break;
 		}
 		// full turbulence inside cloud, half in the vicinity
 		if( dist > radius * radius )
 			turbulence *= 0.5;
 		if( turbulence > cloud_turbulence )
 			cloud_turbulence = turbulence;
 		// we can do 'local' precipitations too
 	}
 	// convert to LWC for radar (experimental)
 	// http://www-das.uwyo.edu/~geerts/cwx/notes/chap08/moist_cloud.html
 	double LWC = 0.0;
 	switch(family) {
 		case SGNewCloud::CLFamilly_st:
 			LWC = 0.29;
 			break;
 		case SGNewCloud::CLFamilly_cu:
 			LWC = 0.27;
 			break;
 		case SGNewCloud::CLFamilly_cb:
 			LWC = 2.0;
 			break;
 		case SGNewCloud::CLFamilly_sc:
 			LWC = 0.44;
 			break;
 		case SGNewCloud::CLFamilly_ci:
 			LWC = 0.03;
 			break;
 		// no data
 		case SGNewCloud::CLFamilly_cs:
 		case SGNewCloud::CLFamilly_cc:
 		case SGNewCloud::CLFamilly_ac:
 		case SGNewCloud::CLFamilly_as:
 			LWC = 0.03;
 			break;
 		case SGNewCloud::CLFamilly_ns:
 			LWC = 0.29*2.0;
 			break;
 	}
 	// add to the list for the wxRadar instrument
 	if( LWC > 0.0 )
 		radarEcho.push_back( SGWxRadarEcho ( bearing, alt, radius, dist, 0.0 , LWC, false, cloudId, false ) );
 	// NB:data valid only from cockpit view
 	// spawn a new lightning
 	if(lightning_enable_state && min_time_before_lt <= 0.0 && (family == SGNewCloud::CLFamilly_cb) &&
 		dist < 15000.0 * 15000.0 && sg_random() > 0.9f) {
 		double lat, lon;
 		Point3D orig, dest;
 		orig.setlat(last_lat * SG_DEGREES_TO_RADIANS );
 		orig.setlon(last_lon * SG_DEGREES_TO_RADIANS );
 		orig.setelev(0.0);
 		dist = sgSqrt(dist);
 		dest = calc_gc_lon_lat(orig, bearing, dist);
 		lon = dest.lon() * SG_RADIANS_TO_DEGREES;
 		lat = dest.lat() * SG_RADIANS_TO_DEGREES;
 		addLightning( lon, lat, alt );
 		// reset timer
 		min_time_before_lt = 5.0 + sg_random() * 30;
 		// DEBUG only
 //		min_time_before_lt = 5.0;
 	}
 	if( (alt - radius * 0.1) > precipitation_max_alt )
 		switch(family) {
 			case SGNewCloud::CLFamilly_st:
 			case SGNewCloud::CLFamilly_cu:
 			case SGNewCloud::CLFamilly_cb:
 			case SGNewCloud::CLFamilly_ns:
 			case SGNewCloud::CLFamilly_sc:
 				precipitation_max_alt = alt - radius * 0.1;
 				break;
 		}
 }
 list_of_SGWxRadarEcho *SGEnviro::get_radar_echo(void) {
 	return &radarEcho;
 }
 // precipitation rendering code
 void SGEnviro::DrawCone2(float baseRadius, float height, int slices, bool down, double rain_norm, double speed) {
  // OSGFIXME
  return;
 	sgVec3 light;
 	sgAddVec3( light, fog_color, min_light );
 	float da = SG_PI * 2.0f / (float) slices;
 	// low number = faster
 	float speedf = streak_period_max - speed * streak_period_change_per_kt;
 	if( speedf < streak_period_min )
 		speedf = streak_period_min;
 	float lenf = streak_length_min + speed * streak_length_change_per_kt;
 	if( lenf > streak_length_max )
 		lenf = streak_length_max;
    float t = fmod((float) elapsed_time, speedf) / speedf;
 //	t = 0.1f;
 	if( !down )
 		t = 1.0f - t;
 	float angle = 0.0f;
 	//glColor4f(1.0f, 0.7f, 0.7f, 0.9f); // XXX unneeded? overriden below
 	glBegin(GL_LINES);
 	if (slices >  MAX_RAIN_SLICE)
 		slices = MAX_RAIN_SLICE; // should never happen
 	for( int i = 0 ; i < slices ; i++ ) {
 		float x = cos(angle) * baseRadius;
 		float y = sin(angle) * baseRadius;
 		angle += da;
 		sgVec3 dir = {x, -height, y};
 		// rain drops at 2 different speed to simulate depth
 		float t1 = (i & 1 ? t : t + t) + rainpos[i];
 		if(t1 > 1.0f)	t1 -= 1.0f;
 		if(t1 > 1.0f)	t1 -= 1.0f;
 		// distant raindrops are more transparent
 		float c = t1 * (i & 1 ?
 				streak_bright_farmost_layer
 				: streak_bright_nearmost_layer);
 		glColor4f(c * light[0], c * light[1], c * light[2], c);
 		sgVec3 p1, p2;
 		sgScaleVec3(p1, dir, t1);
 		// distant raindrops are shorter
 		float t2 = t1 + (i & 1 ? lenf : lenf+lenf);
 		sgScaleVec3(p2, dir, t2);
 		glVertex3f(p1[0], p1[1] + height, p1[2]);
 		glVertex3f(p2[0], p2[1] + height, p2[2]);
 	}
 	glEnd();
 }
 void SGEnviro::drawRain(double pitch, double roll, double heading, double hspeed, double rain_norm) {
  // OSGFIXME
  return;
 #if 0
 	static int debug_period = 0;
 	if (debug_period++ == 50) {
 		debug_period = 0;
 		cout << "drawRain("
 			<< pitch << ", "
 			<< roll  << ", "
 			<< heading << ", "
 			<< hspeed << ", "
 			<< rain_norm << ");"
 			//" angle = " << angle
 			//<< " raindrop(KTS) = " << raindrop_speed_kts
 			<< endl;
 	}
 #endif
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glDisable(GL_DEPTH_TEST);
 	glShadeModel(GL_SMOOTH);
 	glEnable(GL_BLEND);
 	glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_ALPHA );
 	glDisable( GL_FOG );
 	glDisable(GL_LIGHTING);
 	int slice_count = static_cast<int>(
 			(streak_count_min + rain_norm*(streak_count_max-streak_count_min))
 				* precipitation_density / 100.0);
 	// www.wonderquest.com/falling-raindrops.htm says that
 	// Raindrop terminal velocity is 5 to 20mph
 	// Rather than model it accurately (temp, pressure, diameter), and make it
 	// smaller than terminal when closer to the precipitation cloud base,
 	// we interpolate in the 5-20mph range according to rain_norm.
 	double raindrop_speed_kts
 		= (5.0 + rain_norm*15.0) * SG_MPH_TO_MPS * SG_MPS_TO_KT;
 	float angle = atanf(hspeed / raindrop_speed_kts) * SG_RADIANS_TO_DEGREES;
 	glPushMatrix();
 		// the cone rotate with hspeed
 		angle = -pitch - angle;
 		glRotatef(roll, 0.0, 0.0, 1.0);
 		glRotatef(heading, 0.0, 1.0, 0.0);
 		glRotatef(angle, 1.0, 0.0, 0.0);
 		// up cone
 		DrawCone2(cone_base_radius, cone_height, 
 				slice_count, true, rain_norm, hspeed);
 		// down cone (usually not visible)
 		if(angle > 0.0 || heading != 0.0)
 			DrawCone2(cone_base_radius, -cone_height, 
 					slice_count, false, rain_norm, hspeed);
 	glPopMatrix();
 	glEnable(GL_LIGHTING);
 	glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
 	glEnable( GL_FOG );
 	glEnable(GL_DEPTH_TEST);
 }
 void SGEnviro::set_soundMgr(SGSoundMgr *mgr) {
 	soundMgr = mgr;
 }
 void SGEnviro::drawPrecipitation(double rain_norm, double snow_norm, double hail_norm, double pitch, double roll, double heading, double hspeed) {
  // OSGFIXME
  return;
 	if( precipitation_enable_state && rain_norm > 0.0)
 	  if( precipitation_max_alt >= last_alt )
 		drawRain(pitch, roll, heading, hspeed, rain_norm);
 }
 SGLightning::SGLightning(double _lon, double _lat, double _alt) :
 	nb_tree(0),
 	lon(_lon),
 	lat(_lat),
 	alt(_alt),
 	age(1.0 + sg_random() * 4.0)
 {
 //	sequence_count = 1 + sg_random() * 5.0;
 	lt_build();
 }
 SGLightning::~SGLightning() {
 }
 // lightning rendering code
 void SGLightning::lt_build_tree_branch(int tree_nr, Point3D &start, float energy, int nbseg, float segsize) {
  // OSGFIXME
  return;
 	sgVec3 dir, newdir;
 	int nseg = 0;
 	Point3D pt = start;
 	if( nbseg == 50 )
 		sgSetVec3( dir, 0.0, -1.0, 0.0 );
 	else {
 		sgSetVec3( dir, sg_random() - 0.5f, sg_random() - 0.5f, sg_random() - 0.5f);
 		sgNormaliseVec3(dir);
 	}
 	if( nb_tree >= MAX_LT_TREE_SEG )
 		return;
 	lt_tree[nb_tree].depth = tree_nr;
 	nseg = 0;
 	lt_tree[nb_tree].pt = pt;
 	lt_tree[nb_tree].prev = -1;
 	nb_tree ++;
 	// TODO:check agl
 	while(nseg < nbseg && pt.y() > 0.0) {
        int prev = nb_tree - 1;
        nseg++;
 		// add a branch
        if( energy * sg_random() > 0.8f )
 			lt_build_tree_branch(tree_nr + 1, pt, energy * 0.9f, nbseg == 50 ? 10 : static_cast<int>(nbseg * 0.4f), segsize * 0.7f);
 		if( nb_tree >= MAX_LT_TREE_SEG )
 			return;
 		sgSetVec3(newdir, (sg_random() - 0.5f), (sg_random() - 0.5f) - (nbseg == 50 ? 0.5f : 0.0), (sg_random() - 0.5f));
 		sgNormaliseVec3(newdir);
 		sgAddVec3( dir, newdir);
 		sgNormaliseVec3(dir);
 		sgVec3 scaleDir;
 		sgScaleVec3( scaleDir, dir, segsize * energy * 0.5f );
 		pt[PX] += scaleDir[0];
 		pt[PY] += scaleDir[1];
 		pt[PZ] += scaleDir[2];
 		lt_tree[nb_tree].depth = tree_nr;
 		lt_tree[nb_tree].pt = pt;
 		lt_tree[nb_tree].prev = prev;
 		nb_tree ++;
 	}
 }
 void SGLightning::lt_build(void) {
  // OSGFIXME
  return;
    Point3D top;
    nb_tree = 0;
    top[PX] = 0 ;
    top[PY] = alt;
    top[PZ] = 0;
    lt_build_tree_branch(0, top, 1.0, 50, top[PY] / 8.0);
 	if( ! sgEnviro.soundMgr )
 		return;
 	Point3D start( sgEnviro.last_lon*SG_DEGREES_TO_RADIANS, sgEnviro.last_lat*SG_DEGREES_TO_RADIANS, 0.0 );
 	Point3D dest( lon*SG_DEGREES_TO_RADIANS, lat*SG_DEGREES_TO_RADIANS, 0.0 );
 	double course = 0.0, dist = 0.0;
 	calc_gc_course_dist( dest, start, &course, &dist );
 	if( dist < 10000.0 && ! sgEnviro.snd_playing && (dist < sgEnviro.snd_dist || ! sgEnviro.snd_active) ) {
 		sgEnviro.snd_timer = 0.0;
 		sgEnviro.snd_wait  = dist / 340;
 		sgEnviro.snd_dist  = dist;
 		sgEnviro.snd_pos_lat = lat;
 		sgEnviro.snd_pos_lon = lon;
 		sgEnviro.snd_active = true;
 		sgEnviro.snd_playing = false;
 	}
 }
 void SGLightning::lt_Render(void) {
  // OSGFIXME
  return;
 	float flash = 0.5;
 	if( fmod(sgEnviro.elapsed_time*100.0, 100.0) > 50.0 )
 		flash = sg_random() * 0.75f + 0.25f;
    float h = lt_tree[0].pt[PY];
 	sgVec4 col={0.62f, 0.83f, 1.0f, 1.0f};
 	sgVec4 c;
 #define DRAW_SEG() \
 			{glColorMaterial(GL_FRONT, GL_EMISSION);  \
 			glDisable(GL_LINE_SMOOTH); glBegin(GL_LINES); \
 				glColor4fv(c); \
                glVertex3f(lt_tree[n].pt[PX], lt_tree[n].pt[PZ], lt_tree[n].pt[PY]); \
                glVertex3f(lt_tree[lt_tree[n].prev].pt[PX], lt_tree[lt_tree[n].prev].pt[PZ], lt_tree[lt_tree[n].prev].pt[PY]); \
 			glEnd(); glEnable(GL_LINE_SMOOTH);}
 	glDepthMask( GL_FALSE );
 	glEnable(GL_BLEND);
 	glBlendFunc( GL_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glDisable(GL_LIGHTING);
 	glDisable( GL_FOG );
 	glPushMatrix();
 	sgMat4 modelview, tmp;
    // OSGFIXME
 //     ssgGetModelviewMatrix( modelview );
 	sgCopyMat4( tmp, sgEnviro.transform );
    sgPostMultMat4( tmp, modelview );
    // OSGFIXME
 //     ssgLoadModelviewMatrix( tmp );
    Point3D start( sgEnviro.last_lon*SG_DEGREES_TO_RADIANS, sgEnviro.last_lat*SG_DEGREES_TO_RADIANS, 0.0 );
    Point3D dest( lon*SG_DEGREES_TO_RADIANS, lat*SG_DEGREES_TO_RADIANS, 0.0 );
    double course = 0.0, dist = 0.0;
    calc_gc_course_dist( dest, start, &course, &dist );
    double ax = 0.0, ay = 0.0;
    ax = cos(course) * dist;
    ay = sin(course) * dist;
 	glTranslatef( ax, ay, -sgEnviro.last_alt );
 	sgEnviro.radarEcho.push_back( SGWxRadarEcho ( course, 0.0, 0.0, dist, 0.0, age, true, 0, false ) );
 	for( int n = 0 ; n < nb_tree ; n++ ) {
        if( lt_tree[n].prev < 0 )
 			continue;
        float t1 = sgLerp(0.5, 1.0, lt_tree[n].pt[PY] / h);
 		t1 *= flash;
 		if( lt_tree[n].depth >= 2 ) {
            glLineWidth(3);
 			sgScaleVec4(c, col, t1 * 0.6f);
 			DRAW_SEG();
 		} else {
 			if( lt_tree[n].depth == 0 ) {
                glLineWidth(12);
 				sgScaleVec4(c, col, t1 * 0.5f);
 				DRAW_SEG();
                glLineWidth(6);
 				sgScaleVec4(c, col, t1);
 				DRAW_SEG();
 			} else {
                glLineWidth(6);
 				sgScaleVec4(c, col, t1 * 0.7f);
 				DRAW_SEG();
 			}
            if( lt_tree[n].depth == 0 ) 
                glLineWidth(3);
 			else
                glLineWidth(2);
            sgSetVec4(c, t1, t1, t1, t1);
 			DRAW_SEG();
 		}
 	}
    glLineWidth(1);
 	glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
 	glPopMatrix();
 	glDepthMask( GL_TRUE );	
 	glEnable( GL_FOG );
 	glEnable(GL_LIGHTING);
 }
 void SGEnviro::addLightning(double lon, double lat, double alt) {
  // OSGFIXME
  return;
 	if( lightnings.size() > 10)
 		return;
 	SGLightning *lt= new SGLightning(lon, lat, alt);
 	lightnings.push_back(lt);
 }
 void SGEnviro::drawLightning(void) {
  // OSGFIXME
  return;
 	list_of_lightning::iterator iLightning;
 	// play 'thunder' for lightning
 	if( snd_active )
 		if( !snd_playing ) {
 			// wait until sound has reached us
 			snd_timer += dt;
 			if( snd_timer >= snd_wait ) {
 				snd_playing = true;
 				// compute relative position of lightning
 				Point3D start( sgEnviro.last_lon*SG_DEGREES_TO_RADIANS, sgEnviro.last_lat*SG_DEGREES_TO_RADIANS, 0.0 );
 				Point3D dest( snd_pos_lon*SG_DEGREES_TO_RADIANS, snd_pos_lat*SG_DEGREES_TO_RADIANS, 0.0 );
 				double course = 0.0, dist = 0.0;
 				calc_gc_course_dist( dest, start, &course, &dist );
 				double ax = 0.0, ay = 0.0;
 				ax = cos(course) * dist;
 				ay = sin(course) * dist;
 				SGSharedPtr<SGSoundSample> snd = soundMgr->find("thunder");
 				if( snd ) {
 					ALfloat pos[3]={ax, ay, -sgEnviro.last_alt };
 					snd->set_source_pos(pos);
 					snd->play_once();
 				}
 			}
 		} else {
 			if( !soundMgr->is_playing("thunder") ) {
 				snd_active = false;
 				snd_playing = false;
 			}
 		}
 	if( ! lightning_enable_state )
 		return;
 	for( iLightning = lightnings.begin() ; iLightning != lightnings.end() ; iLightning++ ) {
 		if( dt )
 			if( sg_random() > 0.95f )
 				(*iLightning)->lt_build();
 		(*iLightning)->lt_Render();
 		(*iLightning)->age -= dt;
 		if( (*iLightning)->age < 0.0 ) {
 			delete (*iLightning);
 			lightnings.erase( iLightning );
 			break;
 		}
 	}
 }
 void SGEnviro::setFOV( float w, float h ) {
 	fov_width = w;
 	fov_height = h;
 }
 void SGEnviro::getFOV( float &w, float &h ) {
 	w = fov_width;
 	h = fov_height;
 }
@@ -0,0 +1,268 @@
 // Visual environment helper class
 //
 // Written by Harald JOHNSEN, started April 2005.
 // Minor changes/additions by Vivian Meazza Apr- May 2007
 //
 // Ported to OSG by Tim Moore Jun 2007
 //
 // Copyright (C) 2005  Harald JOHNSEN - hjohnsen@evc.net
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
 // published by the Free Software Foundation; either version 2 of the
 // License, or (at your option) any later version.
 //
 // This program 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
 // General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //
 #ifndef _VISUAL_ENVIRO_HXX
 #define _VISUAL_ENVIRO_HXX
 #include <plib/sg.h>
 #include <simgear/compiler.h>
 #include STL_STRING
 #include <vector>
 SG_USING_STD(vector);
 SG_USING_STD(string);
 class SGLightning;
 class SGSoundMgr;
 /**
 * Simulate some echo on a weather radar.
 * Container class for the wx radar instrument.
 */
 class SGWxRadarEcho {
 public:
 	SGWxRadarEcho(float _bearing, float _alt, float _radius, float _dist, float _heading,
 			double _LWC, bool _lightning, int _cloudId, bool _aircraft) :
 	  bearing (_bearing),
 	  heading( _heading ),
 	  alt ( _alt ),
 	  radius ( _radius ),
 	  dist ( _dist ),
 	  LWC ( _LWC ),
 	  lightning ( _lightning ),
 	  aircraft ( _aircraft ),
 	  cloudId ( _cloudId )
 	{}
 	/** the heading and bearing in radian are versus north */
 	float bearing, heading;
 	float alt, radius, dist;
 	/** reflectivity converted to liquid water content. */
 	double LWC;
 	/** if true then this data is for a lightning else it is for water echo. */
 	bool   lightning;
 	/** if true then this data is for an aircraft  */
 	bool aircraft;
 	/** Unique identifier of cloud */
 	int cloudId;
 };
 typedef vector<SGWxRadarEcho> list_of_SGWxRadarEcho;
 /**
 * Visual environment helper class.
 */
 class SGEnviro {
 friend class SGLightning;
 private:
 	void DrawCone2(float baseRadius, float height, int slices, bool down, double rain_norm, double speed);
 	void lt_update(void);
 	bool view_in_cloud;
 	bool precipitation_enable_state;
 	float precipitation_density;
 	float precipitation_max_alt;
 	bool turbulence_enable_state;
 	double last_cloud_turbulence, cloud_turbulence;
 	bool lightning_enable_state;
 	double elapsed_time, dt;
 	sgVec4	fog_color;
 	sgMat4 transform;
 	double last_lon, last_lat, last_alt;
 	SGSoundMgr	*soundMgr;
 	bool		snd_active, snd_playing;
 	double		snd_timer, snd_wait, snd_pos_lat, snd_pos_lon, snd_dist;
 	double		min_time_before_lt;
 	float fov_width, fov_height;
 	/** a list of all the radar echo. */
 	list_of_SGWxRadarEcho radarEcho;
 	static sgVec3 min_light;
 	static SGfloat streak_bright_nearmost_layer,
 				   streak_bright_farmost_layer,
 				   streak_period_max,
 				   streak_period_change_per_kt,
 				   streak_period_min,
 				   streak_length_min,
 				   streak_length_change_per_kt,
 				   streak_length_max;
 	static int streak_count_min, streak_count_max;
 	static SGfloat cone_base_radius,
 				   cone_height;
 public:
 	SGEnviro();
 	~SGEnviro();
 	/** Read the config from the precipitation rendering config properties.
 	 * @param precip_rendering_cfgNode "/sim/rendering/precipitation" in fg
 	 * Set from whatever info present in the
 	 * subnodes passed, substituting hardwired defaults for missing fields.
 	 * If NULL is given, do nothing.
 	 */
 	void config(const class SGPropertyNode* precip_rendering_cfgNode);
    /**
     * Forward a few states used for renderings.
     */
 	void startOfFrame( sgVec3 p, sgVec3 up, double lon, double lat, double alt, double delta_time);
 	void endOfFrame(void);
    /**
     * Whenever a cloud is drawn we check his 'impact' on the environment.
     * @param heading direction of cloud in radians
     * @param alt asl of cloud in meters
     * @param radius radius of cloud in meters
     * @param family cloud family
     * @param dist  squared dist to cloud in meters
     */
 	void callback_cloud(float heading, float alt, float radius, int family, float dist, int cloudId);
 	void drawRain(double pitch, double roll, double heading, double hspeed, double rain_norm);
    /**
     * Draw rain or snow precipitation around the viewer.
     * @param rain_norm rain normalized intensity given by metar class
     * @param snow_norm snow normalized intensity given by metar class
     * @param hail_norm hail normalized intensity given by metar class
     * @param pitch pitch rotation of viewer
     * @param roll roll rotation of viewer
     * @param hspeed moving horizontal speed of viewer in kt
     */
 	void drawPrecipitation(double rain_norm, double snow_norm, double hail_norm,
 							double pitch, double roll, double heading, double hspeed);
    /**
     * Draw the lightnings spawned by cumulo nimbus.
     */
 	void drawLightning(void);
    /**
     * Forward the fog color used by the rain rendering.
     * @param adj_fog_color color of the fog
     */
 	void setLight(sgVec4 adj_fog_color);
 	// this can be queried to add some turbulence for example
 	bool is_view_in_cloud(void) const;
 	void set_view_in_cloud(bool incloud);
 	double get_cloud_turbulence(void) const;
 	// Clouds
 	// return the size of the memory pool used by texture impostors
 	int get_clouds_CacheSize(void) const;
 	int get_CacheResolution(void) const;
 	float get_clouds_visibility(void) const;
 	float get_clouds_density(void) const;
 	bool get_clouds_enable_state(void) const;
 	bool get_turbulence_enable_state(void) const;
    /**
     * Set the size of the impostor texture cache for 3D clouds.
     * @param sizeKb size of the texture pool in Kb
     */
 	void set_clouds_CacheSize(int sizeKb);
    /**
     * Set the resolution of the impostor texture for 3D clouds.
     * @param resolutionPixels size of each texture in pixels (64|128|256)
     */
 	void set_CacheResolution(int resolutionPixels);
    /**
     * Set the maximum range used when drawing clouds.
 	 * Clouds are blended from totaly transparent at max range to totaly opaque around the viewer
     * @param distance in meters
     */
 	void set_clouds_visibility(float distance);
    /**
     * Set the proportion of clouds that will be rendered to limit drop in FPS.
     * @param density 0..100 no clouds drawn when density == 0, all are drawn when density == 100
     */
 	void set_clouds_density(float density);
    /**
     * Enable or disable the use of 3D clouds.
     * @param enable when false we draw the 2D layers
     */
 	void set_clouds_enable_state(bool enable);
    /**
     * Enable or disable the use of proximity cloud turbulence.
     * @param enable when true the turbulence is computed based on type of cloud around the AC
     */
 	void set_turbulence_enable_state(bool enable);
 	// rain/snow
 	float get_precipitation_density(void) const;
 	bool get_precipitation_enable_state(void) const;
 	/** 
 	 * Decrease the precipitation density to the given percentage.
 	 * (Only show the given percentage of rain streaks etc.)
 	 * Default precipitation density upon construction is 100.0.
 	 * @param density 0.0 to 100.0
 	 */
 	void set_precipitation_density(float density);
    /**
     * Enable or disable the rendering of precipitation around the viewer.
     * @param enable when true we will draw precipitation depending on metar data
     */
 	void set_precipitation_enable_state(bool enable);
 	// others
 	bool get_lightning_enable_state(void) const;
    /**
     * Enable or disable the rendering of lightning and the thunder sound.
     * @param enable when true we will draw lightning spwaned by cumulonimbus
     */
 	void set_lightning_enable_state(bool enable);
    /**
     * Spawn a new lighning at specified lon/lat.
     * @param lon position of the new lightning
     * @param lat position of the new lightning
     * @param alt asl of the starting point of the lightning in meters
     */
 	void addLightning(double lon, double lat, double alt);
    /**
     * Forward the sound manager instance to be able to play samples.
     * @param mgr a running sound manager
     */
 	void set_soundMgr(SGSoundMgr *mgr);
 	void setFOV( float w, float h );
 	void getFOV( float &w, float &h );
 	list_of_SGWxRadarEcho *get_radar_echo(void);
 	sgMat4 *get_transform(void) { return &transform; }
 };
 extern SGEnviro sgEnviro;
 #endif // _VISUAL_ENVIRO_HXX
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -27,9 +26,9 @@
 #ifndef _CELESTIALBODY_H_
 #define _CELESTIALBODY_H_
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 #include <simgear/constants.h>
@@ -3,7 +3,7 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -15,13 +15,15 @@
 // 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
+// You should have received a copy of the GNU General Public License
-// License along with this library; if not, write to the
+// along with this program; if not, write to the Free Software
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Boston, MA  02111-1307, USA.
 //
 // $Id$
 #ifdef HAVE_CONFIG_H
 #  include <simgear_config.h>
 #endif
 #include <iostream>
@@ -29,7 +31,7 @@
 // Constructor
-SGEphemeris::SGEphemeris( const string &path ) {
+SGEphemeris::SGEphemeris( const std::string &path ) {
    our_sun = new Star;
    moon = new MoonPos;
    mercury = new Mercury;
@@ -40,9 +42,8 @@ SGEphemeris::SGEphemeris( const string &path ) {
    uranus = new Uranus;
    neptune = new Neptune;
    nplanets = 7;
-    for ( int i = 0; i < nplanets; ++i ) {
+    for ( int i = 0; i < nplanets; ++i )
-        sgdSetVec3( planets[i], 0.0, 0.0, 0.0 );
+      planets[i] = SGVec3d::zeros();
    }
    stars = new SGStarData( SGPath(path) );
 }
@@ -7,7 +7,7 @@
 // All the core code underneath this is written by Durk Talsma.  See
 // the headers of all the other individual files for details.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -19,10 +19,9 @@
 // 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
+// You should have received a copy of the GNU General Public License
-// License along with this library; if not, write to the
+// along with this program; if not, write to the Free Software
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Boston, MA  02111-1307, USA.
 //
 // $Id$
@@ -30,8 +29,7 @@
 #ifndef _EPHEMERIS_HXX
 #define _EPHEMERIS_HXX
-
+#include <string>
 #include <plib/sg.h>
 #include <simgear/ephemeris/star.hxx>
 #include <simgear/ephemeris/moonpos.hxx>
@@ -44,11 +42,14 @@
 #include <simgear/ephemeris/neptune.hxx>
 #include <simgear/ephemeris/stardata.hxx>
 #include <simgear/math/SGMath.hxx>
 #include <simgear/misc/sg_path.hxx>
 /** Ephemeris class
 *
 * Written by Durk Talsma <d.talsma@direct.a2000.nl> and Curtis Olson
- * <curt@flightgear.org>
+ * <http://www.flightgear.org/~curt>
 *
 * Introduction 
 *
@@ -84,7 +85,7 @@ class SGEphemeris {
    // planets[i][1] = Declination
    // planets[i][2] = Magnitude
    int nplanets;
-    sgdVec3 planets[7];
+    SGVec3d planets[7];
    SGStarData *stars;
@@ -96,7 +97,7 @@ public:
     * calling the constructor you need to provide a path pointing to
     * your star database file.
     * @param path path to your star database */
-    SGEphemeris( const string &path );
+    SGEphemeris( const std::string &path );
    /** Destructor */
    ~SGEphemeris( void );
@@ -156,7 +157,7 @@ public:
     * the second is the declination, and the third is the magnitude.
     * @return planets array
     */
-    inline sgdVec3 *getPlanets() { return planets; }
+    inline SGVec3d *getPlanets() { return planets; }
    /** @return the numbers of defined stars. */
    inline int getNumStars() const { return stars->getNumStars(); }
@@ -168,7 +169,7 @@ public:
     * third is the magnitude.
     * @returns star array
     */
-    inline sgdVec3 *getStars() { return stars->getStars(); }
+    inline SGVec3d *getStars() { return stars->getStars(); }
 };
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -172,7 +171,7 @@ void MoonPos::updatePosition(double mjd, double lst, double lat, Star *ourSun)
  // SG_LOG( SG_GENERAL, SG_INFO, "rho = " << rho );
  if (geoRa < 0)
-    geoRa += (2*SGD_PI);
+    geoRa += SGD_2PI;
  HA = lst - (3.8197186 * geoRa);
  /* SG_LOG( SG_GENERAL, SG_INFO, "t->getLst() = " << t->getLst() 
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -80,7 +79,7 @@ void Star::updatePosition(double mjd)
  double 
    actTime, eccAnom, 
    xv, yv, v, r,
-    xe, ye, ze, ecl;
+    xe, ecl;
  updateOrbElements(mjd);
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -35,6 +34,7 @@ class Star : public CelestialBody
 private:
    double xs, ys;     // the sun's rectangular geocentric coordinates
    double ye, ze;     // the sun's rectangularequatorial rectangular geocentric coordinates
    double distance;   // the sun's distance to the earth
 public:
@@ -47,6 +47,8 @@ public:
    double getw();
    double getxs();
    double getys();
    double getye();
    double getze();
    double getDistance();
 };
@@ -71,6 +73,16 @@ inline double Star::getys()
  return ys;
 }
 inline double Star::getye()
 {
   return ye;
 }
 inline double Star::getze()
 {
   return ze;
 }
 inline double Star::getDistance()
 {
  return distance;
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -14,15 +14,18 @@
 // 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
+// You should have received a copy of the GNU General Public License
-// License along with this library; if not, write to the
+// along with this program; if not, write to the Free Software
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Boston, MA  02111-1307, USA.
 //
 // $Id$
 #ifdef HAVE_CONFIG_H
 #  include <simgear_config.h>
 #endif
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include "stardata.hxx"
@@ -32,16 +35,9 @@
 #endif
 // Constructor
-SGStarData::SGStarData() :
+SGStarData::SGStarData( const SGPath& path )
    nstars(0)
 {
-}
+    load(path);
 SGStarData::SGStarData( SGPath path ) :
    nstars(0)
 {
    data_path = SGPath( path );
    load();
 }
@@ -50,31 +46,28 @@ SGStarData::~SGStarData() {
 }
-bool SGStarData::load() {
+bool SGStarData::load( const SGPath& path ) {
-    // -dw- avoid local data > 32k error by dynamic allocation of the
+    _stars.clear();
    // array, problem for some compilers
    stars = new sgdVec3[SG_MAX_STARS];
-     // build the full path name to the stars data base file
+    // build the full path name to the stars data base file
-    data_path.append( "stars" );
+    SGPath tmp = path;
-    SG_LOG( SG_ASTRO, SG_INFO, "  Loading stars from " << data_path.str() );
+    tmp.append( "stars" );
    SG_LOG( SG_ASTRO, SG_INFO, "  Loading stars from " << tmp.str() );
-    sg_gzifstream in( data_path.str() );
+    sg_gzifstream in( tmp.str() );
    if ( ! in.is_open() ) {
 	SG_LOG( SG_ASTRO, SG_ALERT, "Cannot open star file: "
-		<< data_path.str() );
+		<< tmp.str() );
-	exit(-1);
+        return false;
    }
    double ra, dec, mag;
    char c;
    string name;
    nstars = 0;
    // read in each line of the file
-    while ( ! in.eof() && nstars < SG_MAX_STARS ) {
+    while ( ! in.eof() ) {
 	in >> skipcomment;
        getline( in, name, ',' );
@@ -114,13 +107,10 @@ bool SGStarData::load() {
 	in >> mag;
 	// cout << " star data = " << ra << " " << dec << " " << mag << endl;
-
+        _stars.push_back(SGVec3d(ra, dec, mag));
 	sgdSetVec3( stars[nstars], ra, dec, mag );
 	++nstars;
    }
-    SG_LOG( SG_ASTRO, SG_INFO, "  Loaded " << nstars << " stars" );
+    SG_LOG( SG_ASTRO, SG_INFO, "  Loaded " << _stars.size() << " stars" );
    return true;
 }
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -14,10 +14,9 @@
 // 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
+// You should have received a copy of the GNU General Public License
-// License along with this library; if not, write to the
+// along with this program; if not, write to the Free Software
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Boston, MA  02111-1307, USA.
 //
 // $Id$
@@ -25,37 +24,28 @@
 #ifndef _SG_STARDATA_HXX
 #define _SG_STARDATA_HXX
 #include <vector>
 #include <simgear/math/SGMath.hxx>
-#include <plib/sg.h>
+class SGPath;
 #include <simgear/misc/sg_path.hxx>
 #define SG_MAX_STARS 850
 class SGStarData {
    int nstars;
    sgdVec3 *stars;
    SGPath data_path;
 public:
    // Constructor
-    SGStarData();
+    SGStarData( const SGPath& path );
    SGStarData( SGPath path );
    // Destructor
    ~SGStarData();
    // load the stars database
-    bool load();
+    bool load( const SGPath& path );
    // stars
-    inline int getNumStars() const { return nstars; }
+    inline int getNumStars() const { return _stars.size(); }
-    inline sgdVec3 *getStars() { return stars; }
+    inline SGVec3d *getStars() { return &(_stars[0]); }
 private:
    std::vector<SGVec3d> _stars;
 };
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -15,10 +15,9 @@
 * 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
+ * You should have received a copy of the GNU General Public License
- * License along with this library; if not, write to the
+ * along with this program; if not, write to the Free Software
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 * Boston, MA  02111-1307, USA.
 *
 * $Id$
 **************************************************************************/
@@ -49,9 +49,9 @@ tcp_client_LDADD = \
 socktest_SOURCES = socktest.cxx
 socktest_LDADD = \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/io/libsgio.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
 	-lplibnet -lplibul -lz \
 	$(network_LIBS) \
@@ -60,13 +60,17 @@ socktest_LDADD = \
 lowtest_SOURCES = lowtest.cxx
 lowtest_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.a
+	$(top_builddir)/simgear/io/libsgio.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
 	$(base_LIBS) -lz
 decode_binobj_SOURCES = decode_binobj.cxx
 decode_binobj_LDADD = \
 	$(top_builddir)/simgear/io/libsgio.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(base_LIBS) -lz
@@ -1,3 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #  include <simgear_config.h>
 #endif
 #include <simgear/compiler.h>
 #include <unistd.h>
@@ -33,14 +37,14 @@ int main( int argc, char **argv ) {
           obj.get_gbs_radius());
    cout << endl;
-    point_list nodes = obj.get_wgs84_nodes();
+    std::vector<SGVec3d> nodes = obj.get_wgs84_nodes();
    cout << "# vertex list" << endl;
    for ( i = 0; i < (int)nodes.size(); ++i ) {
        printf("v %.5f %.5f %.5f\n", nodes[i].x(), nodes[i].y(), nodes[i].z() );
    }
    cout << endl;
-    point_list normals = obj.get_normals();
+    std::vector<SGVec3f> normals = obj.get_normals();
    cout << "# vertex normal list" << endl;
    for ( i = 0; i < (int)normals.size(); ++i ) {
        printf("vn %.5f %.5f %.5f\n",
@@ -48,7 +52,7 @@ int main( int argc, char **argv ) {
    }
    cout << endl;
-    point_list texcoords = obj.get_texcoords();
+    std::vector<SGVec2f> texcoords = obj.get_texcoords();
    cout << "# texture coordinate list" << endl;
    for ( i = 0; i < (int)texcoords.size(); ++i ) {
        printf("vt %.5f %.5f\n",
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
@@ -70,3 +70,9 @@ int SGIOChannel::writestring( const char *str ) {
 bool SGIOChannel::close() {
    return false;
 }
 // dummy eof routine
 bool SGIOChannel::eof() {
    return false;
 }
@@ -5,7 +5,7 @@
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
@@ -152,6 +152,14 @@ public:
     */
    virtual bool close();
    /**
     * The eof() method returns true if end of file has been reached
     * in a context where that makes sense.  Otherwise it returns
     * false.
     * @return result of eof check
     */
    virtual bool eof();
    inline void set_type( SGChannelType t ) { type = t; }
    inline SGChannelType get_type() const { return type; }
@@ -4,7 +4,7 @@
 // Shamelessly adapted from plib (plib.sourceforge.net) January 2001
 //
 // Original version Copyright (C) 2000  the plib team
-// Local changes Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Local changes Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
@@ -59,7 +59,7 @@ void sgReadFloat ( gzFile fd, float *var )
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)var);
+        sgEndianSwap( (uint32_t *)var);
    }
 }
@@ -67,7 +67,7 @@ void sgReadFloat ( gzFile fd, float *var )
 void sgWriteFloat ( gzFile fd, const float var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)&var);
+        sgEndianSwap( (uint32_t *)&var);
    }
    if ( gzwrite ( fd, (void *)(&var), sizeof(float) ) != sizeof(float) ) {
        write_error = true ;
@@ -81,7 +81,7 @@ void sgReadDouble ( gzFile fd, double *var )
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (uint64*)var);
+        sgEndianSwap( (uint64_t *)var);
    }
 }
@@ -89,7 +89,7 @@ void sgReadDouble ( gzFile fd, double *var )
 void sgWriteDouble ( gzFile fd, const double var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (uint64*)&var);
+        sgEndianSwap( (uint64_t *)&var);
    }
    if ( gzwrite ( fd, (void *)(&var), sizeof(double) ) != sizeof(double) ) {
        write_error = true ;
@@ -103,7 +103,7 @@ void sgReadUInt ( gzFile fd, unsigned int *var )
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)var);
+        sgEndianSwap( (uint32_t *)var);
    }
 }
@@ -111,7 +111,7 @@ void sgReadUInt ( gzFile fd, unsigned int *var )
 void sgWriteUInt ( gzFile fd, const unsigned int var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)&var);
+        sgEndianSwap( (uint32_t *)&var);
    }
    if ( gzwrite ( fd, (void *)(&var), sizeof(unsigned int) )
 	 != sizeof(unsigned int) )
@@ -127,7 +127,7 @@ void sgReadInt ( gzFile fd, int *var )
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)var);
+        sgEndianSwap( (uint32_t *)var);
    }
 }
@@ -135,7 +135,7 @@ void sgReadInt ( gzFile fd, int *var )
 void sgWriteInt ( gzFile fd, const int var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)&var);
+        sgEndianSwap( (uint32_t *)&var);
    }
    if ( gzwrite ( fd, (void *)(&var), sizeof(int) ) != sizeof(int) ) {
        write_error = true ;
@@ -143,48 +143,48 @@ void sgWriteInt ( gzFile fd, const int var )
 }
-void sgReadLong ( gzFile fd, long int *var )
+void sgReadLong ( gzFile fd, int32_t *var )
 {
-    if ( gzread ( fd, var, sizeof(long int) ) != sizeof(long int) ) {
+    if ( gzread ( fd, var, sizeof(int32_t) ) != sizeof(int32_t) ) {
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)var);
+        sgEndianSwap( (uint32_t *)var);
    }
 }
-void sgWriteLong ( gzFile fd, const long int var )
+void sgWriteLong ( gzFile fd, const int32_t var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned int*)&var);
+        sgEndianSwap( (uint32_t *)&var);
    }
-    if ( gzwrite ( fd, (void *)(&var), sizeof(long int) )
+    if ( gzwrite ( fd, (void *)(&var), sizeof(int32_t) )
-         != sizeof(long int) )
+         != sizeof(int32_t) )
    {
        write_error = true ;
    }
 }
-void sgReadLongLong ( gzFile fd, int64 *var )
+void sgReadLongLong ( gzFile fd, int64_t *var )
 {
-    if ( gzread ( fd, var, sizeof(int64) ) != sizeof(int64) ) {
+    if ( gzread ( fd, var, sizeof(int64_t) ) != sizeof(int64_t) ) {
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (uint64*)var);
+        sgEndianSwap( (uint64_t *)var);
    }
 }
-void sgWriteLongLong ( gzFile fd, const int64 var )
+void sgWriteLongLong ( gzFile fd, const int64_t var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (uint64*)&var);
+        sgEndianSwap( (uint64_t *)&var);
    }
-    if ( gzwrite ( fd, (void *)(&var), sizeof(int64) )
+    if ( gzwrite ( fd, (void *)(&var), sizeof(int64_t) )
-         != sizeof(int64) )
+         != sizeof(int64_t) )
    {
        write_error = true ;
    }
@@ -197,7 +197,7 @@ void sgReadUShort ( gzFile fd, unsigned short *var )
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned short int*)var);
+        sgEndianSwap( (uint16_t *)var);
    }
 }
@@ -205,7 +205,7 @@ void sgReadUShort ( gzFile fd, unsigned short *var )
 void sgWriteUShort ( gzFile fd, const unsigned short var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned short*)&var);
+        sgEndianSwap( (uint16_t *)&var);
    }
    if ( gzwrite ( fd, (void *)(&var), sizeof(unsigned short) )
 	 != sizeof(unsigned short) )
@@ -221,7 +221,7 @@ void sgReadShort ( gzFile fd, short *var )
        read_error = true ;
    }
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned short int*)var);
+        sgEndianSwap( (uint16_t *)var);
    }
 }
@@ -229,7 +229,7 @@ void sgReadShort ( gzFile fd, short *var )
 void sgWriteShort ( gzFile fd, const short var )
 {
    if ( sgIsBigEndian() ) {
-        sgEndianSwap( (unsigned short*)&var);
+        sgEndianSwap( (uint16_t *)&var);
    }
    if ( gzwrite ( fd, (void *)(&var), sizeof(short) ) != sizeof(short) ) {
        write_error = true ;
@@ -244,7 +244,7 @@ void sgReadFloat ( gzFile fd, const unsigned int n, float *var )
    }
    if ( sgIsBigEndian() ) {
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned int*)var++);
+            sgEndianSwap( (uint32_t *)var++);
        }
    }
 }
@@ -257,7 +257,7 @@ void sgWriteFloat ( gzFile fd, const unsigned int n, const float *var )
        float *ptr = swab;
        memcpy( swab, var, sizeof(float) * n );
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned int*)ptr++);
+            sgEndianSwap( (uint32_t *)ptr++);
        }
        var = swab;
    }
@@ -275,7 +275,7 @@ void sgReadDouble ( gzFile fd, const unsigned int n, double *var )
    }
    if ( sgIsBigEndian() ) {
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (uint64*)var++);
+            sgEndianSwap( (uint64_t *)var++);
        }
    }
 }
@@ -288,7 +288,7 @@ void sgWriteDouble ( gzFile fd, const unsigned int n, const double *var )
        double *ptr = swab;
        memcpy( swab, var, sizeof(double) * n );
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (uint64*)ptr++);
+            sgEndianSwap( (uint64_t *)ptr++);
        }
        var = swab;
    }
@@ -325,7 +325,7 @@ void sgReadUShort ( gzFile fd, const unsigned int n, unsigned short *var )
    }
    if ( sgIsBigEndian() ) {
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned short int*)var++);
+            sgEndianSwap( (uint16_t *)var++);
        }
    }
 }
@@ -338,7 +338,7 @@ void sgWriteUShort ( gzFile fd, const unsigned int n, const unsigned short *var
        unsigned short *ptr = swab;
        memcpy( swab, var, sizeof(unsigned short) * n );
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned short*)ptr++);
+            sgEndianSwap( (uint16_t *)ptr++);
        }
        var = swab;
    }
@@ -360,7 +360,7 @@ void sgReadShort ( gzFile fd, const unsigned int n, short *var )
    }
    if ( sgIsBigEndian() ) {
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned short int*)var++);
+            sgEndianSwap( (uint16_t *)var++);
        }
    }
 }
@@ -373,7 +373,7 @@ void sgWriteShort ( gzFile fd, const unsigned int n, const short *var )
        short *ptr = swab;
        memcpy( swab, var, sizeof(short) * n );
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned short*)ptr++);
+            sgEndianSwap( (uint16_t *)ptr++);
        }
        var = swab;
    }
@@ -394,7 +394,7 @@ void sgReadUInt ( gzFile fd, const unsigned int n, unsigned int *var )
    }
    if ( sgIsBigEndian() ) {
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned int*)var++);
+            sgEndianSwap( (uint32_t *)var++);
        }
    }
 }
@@ -407,7 +407,7 @@ void sgWriteUInt ( gzFile fd, const unsigned int n, const unsigned int *var )
        unsigned int *ptr = swab;
        memcpy( swab, var, sizeof(unsigned int) * n );
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned int*)ptr++);
+            sgEndianSwap( (uint32_t *)ptr++);
        }
        var = swab;
    }
@@ -429,7 +429,7 @@ void sgReadInt ( gzFile fd, const unsigned int n, int *var )
    }
    if ( sgIsBigEndian() ) {
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned int*)var++);
+            sgEndianSwap( (uint32_t *)var++);
        }
    }
 }
@@ -442,7 +442,7 @@ void sgWriteInt ( gzFile fd, const unsigned int n, const int *var )
        int *ptr = swab;
        memcpy( swab, var, sizeof(int) * n );
        for ( unsigned int i = 0; i < n; ++i ) {
-            sgEndianSwap( (unsigned int*)ptr++);
+            sgEndianSwap( (uint32_t *)ptr++);
        }
        var = swab;
    }
@@ -4,7 +4,7 @@
 // Shamelessly adapted from plib  January 2001
 //
 // Original version Copyright (C) 2000  the plib team
-// Local changes Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Local changes Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 //
@@ -27,19 +27,13 @@
 #ifndef _SG_LOWLEVEL_HXX
 #define _SG_LOWLEVEL_HXX
 #include <stdio.h>
 #include <zlib.h>
 #include <plib/sg.h>
-#ifdef _MSC_VER
+#include <simgear/compiler.h>
-typedef __int64 int64;
+#include <simgear/misc/stdint.hxx>
 typedef __int64 uint64;
 #else
 typedef long long int64;
 typedef unsigned long long uint64;
 #endif
 // Note that output is written in little endian form (and converted as
 // necessary for big endian machines)
@@ -54,10 +48,10 @@ void sgReadUInt ( gzFile fd, unsigned int *var ) ;
 void sgWriteUInt ( gzFile fd, const unsigned int var ) ;
 void sgReadInt ( gzFile fd, int *var ) ;
 void sgWriteInt ( gzFile fd, const int var ) ;
-void sgReadLong ( gzFile fd, long int *var ) ;
+void sgReadLong ( gzFile fd, int32_t *var ) ;
-void sgWriteLong ( gzFile fd, const long int var ) ;
+void sgWriteLong ( gzFile fd, const int32_t var ) ;
-void sgReadLongLong ( gzFile fd, int64 *var ) ;
+void sgReadLongLong ( gzFile fd, int64_t *var ) ;
-void sgWriteLongLong ( gzFile fd, const int64 var ) ;
+void sgWriteLongLong ( gzFile fd, const int64_t var ) ;
 void sgReadUShort ( gzFile fd, unsigned short *var ) ;
 void sgWriteUShort ( gzFile fd, const unsigned short var ) ;
 void sgReadShort ( gzFile fd, short *var ) ;
@@ -121,52 +115,4 @@ void sgClearWriteError();
 int sgReadError();
 int sgWriteError();
 inline bool sgIsLittleEndian() {
    static const int sgEndianTest = 1;
    return (*((char *) &sgEndianTest ) != 0);
 }
 inline bool sgIsBigEndian() {
    static const int sgEndianTest = 1;
    return (*((char *) &sgEndianTest ) == 0);
 }
 inline void sgEndianSwap(unsigned short *x) {
    *x =
        (( *x >>  8 ) & 0x00FF ) | 
        (( *x <<  8 ) & 0xFF00 ) ;
 }
 inline void sgEndianSwap(unsigned int *x) {
    *x =
        (( *x >> 24 ) & 0x000000FF ) | 
        (( *x >>  8 ) & 0x0000FF00 ) | 
        (( *x <<  8 ) & 0x00FF0000 ) | 
        (( *x << 24 ) & 0xFF000000 ) ;
 }
 inline void sgEndianSwap(uint64 *x) {
 #ifndef _MSC_VER
    *x =
        (( *x >> 56 ) & 0x00000000000000FFULL ) | 
        (( *x >> 40 ) & 0x000000000000FF00ULL ) | 
        (( *x >> 24 ) & 0x0000000000FF0000ULL ) | 
        (( *x >>  8 ) & 0x00000000FF000000ULL ) | 
        (( *x <<  8 ) & 0x000000FF00000000ULL ) | 
        (( *x << 24 ) & 0x0000FF0000000000ULL ) |
        (( *x << 40 ) & 0x00FF000000000000ULL ) |
        (( *x << 56 ) & 0xFF00000000000000ULL ) ;
 #else
    *x =
        (( *x >> 56 ) & 0x00000000000000FF ) | 
        (( *x >> 40 ) & 0x000000000000FF00 ) | 
        (( *x >> 24 ) & 0x0000000000FF0000 ) | 
        (( *x >>  8 ) & 0x00000000FF000000 ) | 
        (( *x <<  8 ) & 0x000000FF00000000 ) | 
        (( *x << 24 ) & 0x0000FF0000000000 ) |
        (( *x << 40 ) & 0x00FF000000000000 ) |
        (( *x << 56 ) & 0xFF00000000000000 ) ;
 #endif
 }
 #endif // _SG_LOWLEVEL_HXX
@@ -25,22 +25,22 @@ int main() {
    short s = 1111;
    cout << "short s = " << s << endl;
-    sgEndianSwap((unsigned short *)&s);
+    sgEndianSwap((uint16_t *)&s);
    cout << "short s = " << s << endl;
-    sgEndianSwap((unsigned short *)&s);
+    sgEndianSwap((uint16_t *)&s);
    cout << "short s = " << s << endl;
    int i = 1111111;
    cout << "int i = " << i << endl;
-    sgEndianSwap((unsigned int *)&i);
+    sgEndianSwap((uint32_t *)&i);
    cout << "int i = " << i << endl;
-    sgEndianSwap((unsigned int *)&i);
+    sgEndianSwap((uint32_t *)&i);
    cout << "int i = " << i << endl;
    double x = 1111111111;
    cout << "double x = " << x << endl;
-    sgEndianSwap((unsigned long long *)&x);
+    sgEndianSwap((uint64_t *)&x);
    cout << "double x = " << x << endl;
-    sgEndianSwap((unsigned long long *)&x);
+    sgEndianSwap((uint64_t *)&x);
    cout << "double x = " << x << endl;
 }
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started January 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 //
@@ -36,6 +36,7 @@
 #include STL_STRING
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include "lowlevel.hxx"
 #include "sg_binobj.hxx"
@@ -45,7 +46,7 @@ SG_USING_STD( string );
 SG_USING_STD( vector );
-enum {
+enum sgObjectTypes {
    SG_BOUNDING_SPHERE = 0,
    SG_VERTEX_LIST = 1,
@@ -58,20 +59,19 @@ enum {
    SG_TRIANGLE_FACES = 10,
    SG_TRIANGLE_STRIPS = 11,
    SG_TRIANGLE_FANS = 12
-} sgObjectTypes;
+};
-enum {
+enum sgIndexTypes {
    SG_IDX_VERTICES =  0x01,
    SG_IDX_NORMALS =   0x02,
    SG_IDX_COLORS =    0x04,
    SG_IDX_TEXCOORDS = 0x08
-} sgIndexTypes;
+};
-enum {
+enum sgPropertyTypes {
    SG_MATERIAL = 0,
    SG_INDEX_TYPES = 1
-} sgPropertyTypes;
+};
 class sgSimpleBuffer {
@@ -116,7 +116,7 @@ public:
 // calculate the center of a list of points, by taking the halfway
 // point between the min and max points.
-static Point3D calc_center( point_list& wgs84_nodes ) {
+Point3D sgCalcCenter( point_list& wgs84_nodes ) {
    Point3D p, min, max;
    if ( wgs84_nodes.size() ) {
@@ -174,7 +174,7 @@ static void read_object( gzFile fp,
    int idx_size;
    bool do_vertices, do_normals, do_colors, do_texcoords;
    int j, k, idx;
-    static sgSimpleBuffer buf( 32768 );  // 32 Kb
+    sgSimpleBuffer buf( 32768 );  // 32 Kb
    char material[256];
    // default values
@@ -240,8 +240,8 @@ static void read_object( gzFile fp,
 	if ( nbytes > buf.get_size() ) { buf.resize( nbytes ); }
 	char *ptr = buf.get_ptr();
 	sgReadBytes( fp, nbytes, ptr );
-	int count = nbytes / (idx_size * sizeof(short));
+	int count = nbytes / (idx_size * sizeof(unsigned short));
-	short *sptr = (short *)ptr;
+	unsigned short *sptr = (unsigned short *)ptr;
 	int_list vs; vs.clear();
 	int_list ns; ns.clear();
 	int_list cs; cs.clear();
@@ -249,7 +249,7 @@ static void read_object( gzFile fp,
 	for ( k = 0; k < count; ++k ) {
 	    if ( sgIsBigEndian() ) {
 		for ( idx = 0; idx < idx_size; ++idx ) {
-		    sgEndianSwap( (unsigned short *)&(sptr[idx]) );
+		    sgEndianSwap( (uint16_t *)&(sptr[idx]) );
 		}
 	    }
 	    idx = 0;
@@ -280,13 +280,13 @@ static void read_object( gzFile fp,
 // read a binary file and populate the provided structures.
 bool SGBinObject::read_bin( const string& file ) {
-    Point3D p;
+    SGVec3d p;
    int i, j, k;
    unsigned int nbytes;
-    static sgSimpleBuffer buf( 32768 );  // 32 Kb
+    sgSimpleBuffer buf( 32768 );  // 32 Kb
    // zero out structures
-    gbs_center = Point3D( 0 );
+    gbs_center = SGVec3d(0, 0, 0);
    gbs_radius = 0.0;
    wgs84_nodes.clear();
@@ -322,7 +322,7 @@ bool SGBinObject::read_bin( const string& file ) {
 	string filegz = file + ".gz";
 	if ( (fp = gzopen( filegz.c_str(), "rb" )) == NULL ) {
            SG_LOG( SG_EVENT, SG_ALERT,
-               "ERROR: opening " << file << " or " << filegz << "for reading!");
+               "ERROR: opening " << file << " or " << filegz << " for reading!");
 	    return false;
 	}
@@ -403,17 +403,17 @@ bool SGBinObject::read_bin( const string& file ) {
 		double *dptr = (double *)ptr;
 		if ( sgIsBigEndian() ) {
-		    sgEndianSwap( (uint64 *)&(dptr[0]) );
+		    sgEndianSwap( (uint64_t *)&(dptr[0]) );
-		    sgEndianSwap( (uint64 *)&(dptr[1]) );
+		    sgEndianSwap( (uint64_t *)&(dptr[1]) );
-		    sgEndianSwap( (uint64 *)&(dptr[2]) );
+		    sgEndianSwap( (uint64_t *)&(dptr[2]) );
 		}
-		gbs_center = Point3D( dptr[0], dptr[1], dptr[2] );
+		gbs_center = SGVec3d( dptr[0], dptr[1], dptr[2] );
 		// cout << "Center = " << gbs_center << endl;
 		ptr += sizeof(double) * 3;
 		float *fptr = (float *)ptr;
 		if ( sgIsBigEndian() ) {
-		    sgEndianSwap( (unsigned int *)fptr );
+		    sgEndianSwap( (uint32_t *)fptr );
 		}
 		gbs_radius = fptr[0];
 		// cout << "Bounding radius = " << gbs_radius << endl;
@@ -443,11 +443,11 @@ bool SGBinObject::read_bin( const string& file ) {
 		wgs84_nodes.reserve( count );
 		for ( k = 0; k < count; ++k ) {
 		    if ( sgIsBigEndian() ) {
-			sgEndianSwap( (unsigned int *)&(fptr[0]) );
+			sgEndianSwap( (uint32_t *)&(fptr[0]) );
-			sgEndianSwap( (unsigned int *)&(fptr[1]) );
+			sgEndianSwap( (uint32_t *)&(fptr[1]) );
-			sgEndianSwap( (unsigned int *)&(fptr[2]) );
+			sgEndianSwap( (uint32_t *)&(fptr[2]) );
 		    }
-		    wgs84_nodes.push_back( Point3D(fptr[0], fptr[1], fptr[2]) );
+		    wgs84_nodes.push_back( SGVec3d(fptr[0], fptr[1], fptr[2]) );
 		    fptr += 3;
 		}
 	    }
@@ -476,12 +476,13 @@ bool SGBinObject::read_bin( const string& file ) {
 		colors.reserve(count);
 		for ( k = 0; k < count; ++k ) {
 		    if ( sgIsBigEndian() ) {
-			sgEndianSwap( (unsigned int *)&(fptr[0]) );
+			sgEndianSwap( (uint32_t *)&(fptr[0]) );
-			sgEndianSwap( (unsigned int *)&(fptr[1]) );
+			sgEndianSwap( (uint32_t *)&(fptr[1]) );
-			sgEndianSwap( (unsigned int *)&(fptr[2]) );
+			sgEndianSwap( (uint32_t *)&(fptr[2]) );
-			sgEndianSwap( (unsigned int *)&(fptr[3]) );
+			sgEndianSwap( (uint32_t *)&(fptr[3]) );
 		    }
-		    colors.push_back( Point3D( fptr[0], fptr[1], fptr[2] ) );
+		    SGVec4f color( fptr[0], fptr[1], fptr[2], fptr[3] );
 		    colors.push_back( color );
 		    fptr += 4;
 		}
 	    }
@@ -508,14 +509,11 @@ bool SGBinObject::read_bin( const string& file ) {
 		int count = nbytes / 3;
 		normals.reserve( count );
 		for ( k = 0; k < count; ++k ) {
-                    sgdVec3 normal;
+                    SGVec3f normal((ptr[0]) / 127.5 - 1.0,
-                    sgdSetVec3( normal,
+                                   (ptr[1]) / 127.5 - 1.0,
-                               (ptr[0]) / 127.5 - 1.0,
+                                   (ptr[2]) / 127.5 - 1.0);
                               (ptr[1]) / 127.5 - 1.0,
                               (ptr[2]) / 127.5 - 1.0 );
                    sgdNormalizeVec3( normal );
-		    normals.push_back(Point3D(normal[0], normal[1], normal[2]));
+		    normals.push_back(normalize(normal));
 		    ptr += 3;
 		}
 	    }
@@ -544,10 +542,10 @@ bool SGBinObject::read_bin( const string& file ) {
 		texcoords.reserve(count);
 		for ( k = 0; k < count; ++k ) {
 		    if ( sgIsBigEndian() ) {
-			sgEndianSwap( (unsigned int *)&(fptr[0]) );
+			sgEndianSwap( (uint32_t *)&(fptr[0]) );
-			sgEndianSwap( (unsigned int *)&(fptr[1]) );
+			sgEndianSwap( (uint32_t *)&(fptr[1]) );
 		    }
-		    texcoords.push_back( Point3D( fptr[0], fptr[1], 0 ) );
+		    texcoords.push_back( SGVec2f( fptr[0], fptr[1] ) );
 		    fptr += 2;
 		}
 	    }
@@ -612,28 +610,17 @@ bool SGBinObject::read_bin( const string& file ) {
 bool SGBinObject::write_bin( const string& base, const string& name,
 			     const SGBucket& b )
 {
    Point3D p;
    sgVec2 t;
    sgVec3 pt;
    sgVec4 color;
    int i, j;
    unsigned char idx_mask;
    int idx_size;
-    string dir = base + "/" + b.gen_base_path();
+    SGPath file = base + "/" + b.gen_base_path() + "/" + name + ".gz";
-    string command = "mkdir -p " + dir;
+    file.create_dir( 0755 );
-#if defined(_MSC_VER) || defined(__MINGW32__)
+    cout << "Output file = " << file.str() << endl;
    system( (string("mkdir ") + dir).c_str() );
 #else
    system(command.c_str());
 #endif
    string file = dir + "/" + name + ".gz";
    cout << "Output file = " << file << endl;
    gzFile fp;
    if ( (fp = gzopen( file.c_str(), "wb9" )) == NULL ) {
-	cout << "ERROR: opening " << file << " for writing!" << endl;
+	cout << "ERROR: opening " << file.str() << " for writing!" << endl;
 	return false;
    }
@@ -656,7 +643,7 @@ bool SGBinObject::write_bin( const string& base, const string& name,
    // write header magic
    sgWriteUInt( fp, SG_FILE_MAGIC_NUMBER );
    time_t calendar_time = time(NULL);
-    sgWriteLong( fp, (long int)calendar_time );
+    sgWriteLong( fp, (int32_t)calendar_time );
    // calculate and write number of top level objects
    string material;
@@ -745,9 +732,8 @@ bool SGBinObject::write_bin( const string& base, const string& name,
    sgWriteShort( fp, 1 );		                 // nelements
    sgWriteUInt( fp, wgs84_nodes.size() * sizeof(float) * 3 ); // nbytes
    for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
-	p = wgs84_nodes[i] - gbs_center;
+        SGVec3f p = toVec3f(wgs84_nodes[i] - gbs_center);
-	sgSetVec3( pt, p.x(), p.y(), p.z() );
+	sgWriteVec3( fp, p.data() );
 	sgWriteVec3( fp, pt );
    }
    // dump vertex color list
@@ -756,12 +742,7 @@ bool SGBinObject::write_bin( const string& base, const string& name,
    sgWriteShort( fp, 1 );		                 // nelements
    sgWriteUInt( fp, colors.size() * sizeof(float) * 4 ); // nbytes
    for ( i = 0; i < (int)colors.size(); ++i ) {
-	p = colors[i];
+	sgWriteVec4( fp, colors[i].data() );
        // Right now we have a place holder for color alpha but we
        // need to update the interface so the calling program can
        // provide the info.
 	sgSetVec4( color, p.x(), p.y(), p.z(), 1.0 );
 	sgWriteVec4( fp, color );
    }
    // dump vertex normal list
@@ -771,7 +752,7 @@ bool SGBinObject::write_bin( const string& base, const string& name,
    sgWriteUInt( fp, normals.size() * 3 );              // nbytes
    char normal[3];
    for ( i = 0; i < (int)normals.size(); ++i ) {
-	p = normals[i];
+        SGVec3f p = normals[i];
 	normal[0] = (unsigned char)((p.x() + 1.0) * 127.5);
 	normal[1] = (unsigned char)((p.y() + 1.0) * 127.5);
 	normal[2] = (unsigned char)((p.z() + 1.0) * 127.5);
@@ -784,9 +765,7 @@ bool SGBinObject::write_bin( const string& base, const string& name,
    sgWriteShort( fp, 1 );		                // nelements
    sgWriteUInt( fp, texcoords.size() * sizeof(float) * 2 ); // nbytes
    for ( i = 0; i < (int)texcoords.size(); ++i ) {
-	p = texcoords[i];
+	sgWriteVec2( fp, texcoords[i].data() );
 	sgSetVec2( t, p.x(), p.y() );
 	sgWriteVec2( fp, t );
    }
    // dump point groups if they exist
@@ -858,7 +837,8 @@ bool SGBinObject::write_bin( const string& base, const string& name,
 	    // find next group
 	    material = tri_materials[start];
 	    while ( (end < (int)tri_materials.size()) && 
-		    (material == tri_materials[end]) )
+		    (material == tri_materials[end]) &&
 		    3*(end-start) < 32760 )
 	    {
 		// cout << "end = " << end << endl;
 		end++;
@@ -1048,24 +1028,15 @@ bool SGBinObject::write_bin( const string& base, const string& name,
 bool SGBinObject::write_ascii( const string& base, const string& name,
 			       const SGBucket& b )
 {
    Point3D p;
    int i, j;
-    string dir = base + "/" + b.gen_base_path();
+    SGPath file = base + "/" + b.gen_base_path() + "/" + name;
-    string command = "mkdir -p " + dir;
+    file.create_dir( 0755 );
-#if defined(_MSC_VER) || defined(__MINGW32__)
+    cout << "Output file = " << file.str() << endl;
    system( (string("mkdir ") + dir).c_str() );
 #else
    system(command.c_str());
 #endif
    // string file = dir + "/" + b.gen_index_str();
    string file = dir + "/" + name;
    cout << "Output file = " << file << endl;
    FILE *fp;
    if ( (fp = fopen( file.c_str(), "w" )) == NULL ) {
-	cout << "ERROR: opening " << file << " for writing!" << endl;
+	cout << "ERROR: opening " << file.str() << " for writing!" << endl;
 	return false;
    }
@@ -1098,7 +1069,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
    // dump vertex list
    fprintf(fp, "# vertex list\n");
    for ( i = 0; i < (int)wgs84_nodes.size(); ++i ) {
-	p = wgs84_nodes[i] - gbs_center;
+        SGVec3d p = wgs84_nodes[i] - gbs_center;
 	fprintf(fp,  "v %.5f %.5f %.5f\n", p.x(), p.y(), p.z() );
    }
@@ -1106,7 +1077,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
    fprintf(fp, "# vertex normal list\n");
    for ( i = 0; i < (int)normals.size(); ++i ) {
-	p = normals[i];
+        SGVec3f p = normals[i];
 	fprintf(fp,  "vn %.5f %.5f %.5f\n", p.x(), p.y(), p.z() );
    }
    fprintf(fp, "\n");
@@ -1114,7 +1085,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
    // dump texture coordinates
    fprintf(fp, "# texture coordinate list\n");
    for ( i = 0; i < (int)texcoords.size(); ++i ) {
-	p = texcoords[i];
+        SGVec2f p = texcoords[i];
 	fprintf(fp,  "vt %.5f %.5f\n", p.x(), p.y() );
    }
    fprintf(fp, "\n");
@@ -1140,13 +1111,13 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
 	    // make a list of points for the group
 	    point_list group_nodes;
 	    group_nodes.clear();
-	    Point3D bs_center;
+	    SGVec3d bs_center;
 	    double bs_radius = 0;
 	    for ( i = start; i < end; ++i ) {
 		for ( j = 0; j < (int)tris_v[i].size(); ++j ) {
-		    group_nodes.push_back( wgs84_nodes[ tris_v[i][j] ] );
+                    group_nodes.push_back( Point3D::fromSGVec3(wgs84_nodes[ tris_v[i][j] ]) );
-		    bs_center = calc_center( group_nodes );
+		    bs_center = sgCalcCenter( group_nodes ).toSGVec3d();
-		    bs_radius = sgCalcBoundingRadius( bs_center, group_nodes );
+		    bs_radius = sgCalcBoundingRadius( Point3D::fromSGVec3(bs_center), group_nodes );
 		}
 	    }
@@ -1191,13 +1162,13 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
 	    // make a list of points for the group
 	    point_list group_nodes;
 	    group_nodes.clear();
-	    Point3D bs_center;
+	    SGVec3d bs_center;
 	    double bs_radius = 0;
 	    for ( i = start; i < end; ++i ) {
 		for ( j = 0; j < (int)strips_v[i].size(); ++j ) {
-		    group_nodes.push_back( wgs84_nodes[ strips_v[i][j] ] );
+                    group_nodes.push_back( Point3D::fromSGVec3(wgs84_nodes[ strips_v[i][j] ]) );
-		    bs_center = calc_center( group_nodes );
+		    bs_center = sgCalcCenter( group_nodes ).toSGVec3d();
-		    bs_radius = sgCalcBoundingRadius( bs_center, group_nodes );
+		    bs_radius = sgCalcBoundingRadius( Point3D::fromSGVec3(bs_center), group_nodes );
 		}
 	    }
@@ -1224,7 +1195,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
    // close the file
    fclose(fp);
-    command = "gzip --force --best " + file;
+    string command = "gzip --force --best " + file.str();
    system(command.c_str());
    return true;
@@ -5,7 +5,7 @@
 // Written by Curtis Olson, started January 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
@@ -89,13 +89,13 @@ typedef group_list::const_iterator const_group_list_iterator;
 class SGBinObject {
    unsigned short version;
-    Point3D gbs_center;
+    SGVec3d gbs_center;
    float gbs_radius;
-    point_list wgs84_nodes;	// vertex list
+    std::vector<SGVec3d> wgs84_nodes;	// vertex list
-    point_list colors;		// color list
+    std::vector<SGVec4f> colors;	// color list
-    point_list normals;		// normal list
+    std::vector<SGVec3f> normals;	// normal list
-    point_list texcoords;	// texture coordinate list
+    std::vector<SGVec2f> texcoords;	// texture coordinate list
    group_list pts_v;		// points vertex index
    group_list pts_n;		// points normal index
@@ -125,23 +125,51 @@ public:
    inline unsigned short get_version() const { return version; }
-    inline const Point3D& get_gbs_center() const { return gbs_center; }
+    inline Point3D get_gbs_center() const { return Point3D::fromSGVec3(gbs_center); }
-    inline void set_gbs_center( const Point3D& p ) { gbs_center = p; }
+    inline void set_gbs_center( const Point3D& p ) { gbs_center = p.toSGVec3d(); }
    inline const SGVec3d& get_gbs_center2() const { return gbs_center; }
    inline void set_gbs_center( const SGVec3d& p ) { gbs_center = p; }
    inline float get_gbs_radius() const { return gbs_radius; }
    inline void set_gbs_radius( float r ) { gbs_radius = r; }
-    inline const point_list& get_wgs84_nodes() const { return wgs84_nodes; }
+    inline const std::vector<SGVec3d>& get_wgs84_nodes() const
-    inline void set_wgs84_nodes( const point_list& n ) { wgs84_nodes = n; }
+    { return wgs84_nodes; }
    inline void set_wgs84_nodes( const std::vector<SGVec3d>& n )
    { wgs84_nodes = n; }
    inline void set_wgs84_nodes( const point_list& n )
    {
      wgs84_nodes.resize(n.size());
      for (unsigned i = 0; i < wgs84_nodes.size(); ++i)
        wgs84_nodes[i] = n[i].toSGVec3d();
    }
-    inline const point_list& get_colors() const { return colors; }
+    inline const std::vector<SGVec4f>& get_colors() const { return colors; }
-    inline void set_colors( const point_list& c ) { colors = c; }
+    inline void set_colors( const std::vector<SGVec4f>& c ) { colors = c; }
    inline void set_colors( const point_list& c )
    {
      colors.resize(c.size());
      for (unsigned i = 0; i < colors.size(); ++i)
        colors[i] = SGVec4f(c[i].toSGVec3f(), 1);
    }
-    inline const point_list& get_normals() const { return normals; }
+    inline const std::vector<SGVec3f>& get_normals() const { return normals; }
-    inline void set_normals( const point_list& n ) { normals = n; }
+    inline void set_normals( const std::vector<SGVec3f>& n ) { normals = n; }
    inline void set_normals( const point_list& n )
    {
      normals.resize(n.size());
      for (unsigned i = 0; i < normals.size(); ++i)
        normals[i] = n[i].toSGVec3f();
    }
-    inline const point_list& get_texcoords() const { return texcoords; }
+    inline const std::vector<SGVec2f>& get_texcoords() const { return texcoords; }
-    inline void set_texcoords( const point_list& t ) { texcoords = t; }
+    inline void set_texcoords( const std::vector<SGVec2f>& t ) { texcoords = t; }
    inline void set_texcoords( const point_list& t )
    {
      texcoords.resize(t.size());
      for (unsigned i = 0; i < texcoords.size(); ++i)
        texcoords[i] = t[i].toSGVec2f();
    }
    inline const group_list& get_pts_v() const { return pts_v; }
    inline void set_pts_v( const group_list& g ) { pts_v = g; }
@@ -221,6 +249,16 @@ public:
 };
 /**
 * \relates SGBinObject
 * Calculate the center of a list of points, by taking the halfway
 * point between the min and max points.
 * @param wgs84_nodes list of points in wgs84 coordinates
 * @return center point
 */
 Point3D sgCalcCenter( point_list& wgs84_nodes );
 /**
 * \relates SGBinObject
 * Calculate the bounding sphere of a set of nodes.
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
@@ -29,6 +29,7 @@
 #  include <io.h>
 #endif
 #include <simgear/misc/stdint.hxx>
 #include <simgear/debug/logstream.hxx>
 #include "sg_file.hxx"
@@ -39,6 +40,7 @@ SG_USING_STD(string);
 SGFile::SGFile( const string &file) {
    set_type( sgFileType );
    file_name = file;
    eof_flag = true;
 }
@@ -70,6 +72,7 @@ bool SGFile::open( const SGProtocolDir d ) {
 	return false;
    }
    eof_flag = false;
    return true;
 }
@@ -77,7 +80,11 @@ bool SGFile::open( const SGProtocolDir d ) {
 // read a block of data of specified size
 int SGFile::read( char *buf, int length ) {
    // read a chunk
-    return ::read( fp, buf, length );
+    ssize_t result = ::read( fp, buf, length );
    if ( length > 0 && result == 0 ) {
        eof_flag = true;
    }
    return result;
 }
@@ -87,7 +94,10 @@ int SGFile::readline( char *buf, int length ) {
    int pos = lseek( fp, 0, SEEK_CUR );
    // read a chunk
-    int result = ::read( fp, buf, length );
+    ssize_t result = ::read( fp, buf, length );
    if ( length > 0 && result == 0 ) {
        eof_flag = true;
    }
    // find the end of line and reset position
    int i;
@@ -130,5 +140,6 @@ bool SGFile::close() {
 	return false;
    }
    eof_flag = true;
    return true;
 }
@@ -4,7 +4,7 @@
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
@@ -54,6 +54,7 @@ class SGFile : public SGIOChannel {
    string file_name;
    int fp;
    bool eof_flag;
 public:
@@ -89,6 +90,9 @@ public:
    /** @return the name of the file being manipulated. */
    inline string get_file_name() const { return file_name; }
    /** @return true of eof conditions exists */
    inline bool eof() const { return eof_flag; };
 };
--- a/Show More
+++ b/Show More