Ready for 0.3.8 release.

- In sky.cxx blend low density cloud layers (few/scattered) into nothing (but
  don't touch visibility distance) as we approach them so we can fly through
  clean.
- For high density cloud layers (broken/overcast) we do not fade the layers
  out, but we fade visibility to nearly nothing as we approach the layer.

.cvsignore

@@ -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

Doxyfile

@@ -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.3
+PROJECT_NUMBER         = 0.3.8
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

DoxygenMain.cxx

@@ -33,6 +33,11 @@
  *   planets for a given time, date, season, earth location, etc.
  *   (SGEphemeris)
  *
+ * - Code to render a realistic sky dome, cloud layers, sun, moon,
+ *   stars, and planets all with realistic day/night/sunset/sunrise
+ *   effects.  Includes things like correct moon phase, textured moon,
+ *   sun halo, etc. (SGSky is built on top of SGCloudLayer ...)
+ *
  * - Simple serial (SGSerial), file (SGFile), socket (SGSocket), and
  *   UDP socket (SGSocketUDP) I/O abstractions.
  *

Makefile.am

@@ -1,9 +1,8 @@
 EXTRA_DIST = \
 	acinclude.m4 \
 	autogen.sh \
-	DoxygenMain.cxx
+	DoxygenMain.cxx \
 	README.MSVC \
-	README.metakit \
 	README.zlib \
 	SimGear.dsp \
 	SimGear.dsw
@@ -11,7 +10,7 @@ EXTRA_DIST = \
 SUBDIRS	= src-libs simgear
 
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.9/admin/am2dsp.pl)
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear-0.9/admin/am2dsp.pl)
 
 #
 # Rule to build RPM distribution package

NEWS

@@ -1,3 +1,97 @@
+New in 0.3.8
+* January 18, 2005
+
+* Configure script does a sanity check for the existance 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 coverages, 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 (subtlely.)
+* 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
+
+* Removed Metakit, FlightGear no longer uses it.
+* Removed all glut dependencies from SimGear.
+* Moved FGEventMgr and FGSubsystemMgr over to SimGear.
+* Some more incremental work on 3D clouds.
+* Added some "fastmath" functions.
+* Some lighting tweaks and fixes (especially for taxiways.)
+* Added support for "blend" and "scale" and "texture" animations.
+* Added support for animating rotations around an arbitrary axis (so the
+  aircraft designer isn't forced to figure out animations as a combination
+  of rotations around X, Y, and X axes.
+* Updates to sky dome modeling and make cloud layers follow the curve
+  of the earth (sort of.)
+* Updates to sky dome, cloud, and sunrise/sunset color and lighting
+  effects to make them more realistic and lifelike.
+* Better support for detecting and using OpenGL extensions at run time.
+* Add support for win32-pthreads in MSVC.NET
+* Various MSVC fixes.
+* Various Solaris fixes.
+* Various cygwin/mingwin fixes.
+* Various Mac OS X fixes.
+* Various Irix fixes.
+
+
 New in 0.3.3
 * June 3, 2003
 

README.OpenAL

@@ -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.

README.metakit

@@ -1,285 +0,0 @@
-For your convenience (and with the author's permission) a copy of the
-MetaKit source is bundled with SimGear in $(top_srcdir)/src-libs/.
-You must have metakit installed before you can build SimGear.
-
-- Most linux distributions have a metakit package.  For linux
-  developers, we recommend ysou install your distributions package
-  rather than building from source.
-
-- For developers on most other platforms, you will have to build
-  metakit from source and install it yourself.  For your convenience a
-  tar ball of the metakit source is included with the simgear source
-  distribution.  Untar the metakit source, and follow the included
-  build and installation instructions.
-
-Once metakit is installed you can return to configuring and building
-Simgear.
-
-=============================================================================
-
-Potentially important build note:
-
-  Later on when you are linking programs with -lmk4 (i.e. FlightGear or one
-  of it's associated programs) if you come across an error similar to the
-  following:
-
-     c++  -Wall -O2 -L/usr/local/lib -o gensimple  gensimple.o libAirports.a
-          -lsgdebug -lsgmisc -lmk4 -lz -lm 
-     /usr/local/lib/libmk4.a(view.o)(.text+0x1c8):view.cpp: multiple definition
-          of `c4_View::~c4_View(void)'
-    libAirports.a(simple.o)(.text$_$_7c4_View+0x0):simple.cxx: first defined
-          here
-    collect2: ld returned 1 exit status
-    make[2]: *** [gensimple] Error 1
-    make[2]: Leaving directory `/home/curt/FlightGear-0.7.7/src/Airports'
-    make[1]: *** [all-recursive] Error 1
-    make[1]: Leaving directory `/home/curt/FlightGear-0.7.7/src'
-    make: *** [all-recursive] Error 1
-
-  Then you need to come back and rebuild Metakit with the -DNDEBUG flag.
-  For unix/cygwin systems, modify the unix/Makefile file and add -DNDEBUG
-  to the CFLAGS line.
-
-Now we return you to the official metakit readme ... :-)
-
-
-The MetaKit Library 2.01                                            March 2000
-==============================================================================
-
-
-WHAT IT IS - MetaKit is an embeddable database which runs on Unix, Windows,
-    Macintosh, and other platforms.  It lets you build applications which
-    store their data efficiently, in a portable way, and which will not need a
-    complex runtime installation.  In terms of the data model, MetaKit takes
-    the middle ground between RDBMS, OODBMS, and flat-file databases - yet it
-    is quite different from each of them.
-
-WHAT IT ISN'T - MetaKit is not: 1) multi-user/-threading, 2) scalable to
-    gigabytes, 3) proprietary software, 4) full of bugs, 5) just a toy.
-
-TECHNOLOGY - Everything is stored variable-sized yet with efficient positional
-    row access.  Changing an existing datafile structure is as simple as re-
-    opening it with that new structure.  All changes are transacted.  You can
-    mix and match software written in C++, Python, and Tcl.  Things can't get
-    much more flexible...
-
-CORE - The Metakit core library is written in C++.  It has a code footprint of
-    just over 100 Kb on Windows.  It can be used as DLL, or linked statically.
-    Debug builds include extensive assertion checks to catch problems early.
-
-PYTHON - The binding for Python is called "Mk4py".  It uses SCXX by Gordon
-    McMillan as C++ glue interface.  The source is in directory "python/".
-
-TCL/TK - The MK extension for Tcl is called "Mk4tcl".  It is being used in a
-    number of commercial projects, for in-house use as well as in commercially
-    distributed products.  The source is in directory "tcl/".
-
-LICENSE AND SUPPORT - MetaKit 2.01 is distributed as open source software (the
-    X/MIT-style license is at the end of this document).  Commercial support
-    is available through an Enterprise License, see the URL mentioned below.
-
-DOCUMENTATION - All documentation uses HTML.  The main page is "MetaKit.html",
-    which leads to the rest of the documentation in the "doc/" directory.
-
-WEBSITE URLS - The main pages on the world wide web, for news and downloads:
-    Homepage:       http://www.equi4.com/metakit/
-    Python news:    http://www.equi4.com/metakit/python.html
-    Tcl/Tk news:    http://www.equi4.com/metakit/tcl.html
-    License info:   http://www.equi4.com/metakit/license.html
-    Contact info:   http://www.equi4.com/contact.html
-
-
-INSTALLATION
-============
-
-Starting with this release, all platform builds and language bindings are now
-designed to work from a single common "builds/" directory.  It turns out to
-be impossible to keep build side-effects limited to *just* this directory
-(CodeWarrior can't be told where to place its temp data, and Visual C++ still
-alters a few files next to the project ".dsw" file, to name two offenders).
-
-UNIX
-
-    It is no longer advised to build the Unix code in the "unix/" directory.
-    Instead, you should perform the following steps:
-        % cd builds
-        % ../unix/configure
-        % make
-        % make test
-    And optionally (this only installs the core lib, not script extensions):
-        % make install
-
-    By switching to the "builds/" directory, you will keep the distribution
-    directory tree 100% unaltered.  All changes are made in this subdir, and
-    all final build results are left behind in this same subdir.
-
-    Nastiness: if you build Mk4tcl, please do a "make Mk4tcl.so" as well.
-    And if you intend to create the Python extension, do a "make Mk4py.so".
-    The "libmk4tcl.so.0.0.0" and "libMk4py.so.0.0.0" targets are bogus ones.
-
-    You will probably have to make changes in the makefile to locate the
-    proper includes and libs for Python (Tcl has been fixed, see "--with-tcl).
-    You probably only need to adjust "CXX_SWITCHES_PY" to find the headers.
-
-    To build with STL containers and strings, you can do the following:
-        make CXXFLAGS='-Dq4_STD' test   # add -O3 etc, as needed
-    This passes the test suite on Linux RedHat 5.2 with gcc 2.95-2.
-
-    See below for some platform-specific build notes.
-
-WINDOWS
-
-    There is a "win/" directory which contains subdirectories for a number of
-    compiler systems.  MetaKit has been built with many different compilers
-    in the past (Microsoft, Borland, Watcom, Symantec, Metrowerks, Optima),
-    but to preserve my sanity (there are 12 configurations for MSVC6 alone!),
-    I am limiting myself to MSVC6, MWCW5, Borland C++ Builder 4, and Cygwin.
-
-    The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects
-    for the C++ demo (mkdemo), building dll's (mkdll), static libs (mklib),
-    regression tests (mktest), as well as Tcl (mktcl) and Python (mkpython).
-    It has been set up to place all intermediate files and final results in
-    the "builds/" subdirectory, even though you'll launch it from "win/".
-
-    To build with STL containers and strings under MSVC, define "q4_STD".
-    To build with MFC containers and strings under MSVC, define "q4_MFC".
-
-    The Metrowerks Codewarrior project is in the "mac/" directory, and can be
-    used to build both Mac and Windows versions (on either Mac *or* Windows).
-    The core libraries are built with "mac/cw5.mcp", demos / tests are built
-    with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp".
-
-    The Borland C++ Builder projects have not yet been incorporated in this
-    release, but the "KitViewer" application is an example of how to use BCB.
-
-    The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the
-    unix autoconf system, and must be launched as described above for UNIX.
-    I have upgraded to the latest development of libtool to be able to build
-    DLL's with Cygwin.  You can build the "-mno-cygwin" version by editing
-    the Makefile by hand and adding that option to CXXFLAGS.
-
-    Rob Bloodgood adds that the following GCC options are for maximum code
-    efficiency on x86 hardware: "-O2 -m486 -malign-loops=2 -malign-jumps=2".
-    I have not yet tried this myself, but am passing on the tip.
-
-MACINTOSH
-
-    The Mac version requires Metrowerks CodeWarrior 5.  See the info above
-    in the Windows section (MWCW is multi-platform).  The projects are all
-    located in the "mac/" folder, which is also where MWCW will place its own
-    "... Data" folders with intermediate results.  As with all other setups,
-    final results are made to end up in the "builds/" directory.
-
-    Static 68K builds appear to work fine, the 68K CFM variants will need
-    some more work (I couldn't get the libraries to export their symbols).
-
-
-PLATFORM-SPECIFIC NOTES
-=======================
-
-* Linux RH 5.2 / gcc 2.95.2
-
-    Builds with gcc 2.95.2 work out of the box.  The Tcl extension ends up as
-    ".libs/libmk4tcl.so.0.0.0" (to please libtool), and should be renamed to
-    "Mk4tcl.so".  Similarly, ".libs/libMk4py.so.0.0.0" is in fact the Python
-    extension, and *must* be renamed to "Mk4py.so" to call it from Python.
-
-    The core MK libs end up as ".libs/libmk4.a" and ".libs/libmk4.so.0.0.0".
-
-* Solaris 2.6 / gcc 2.8.1
-
-    The Solaris builds are nasty for several reasons:
-
-    - I do not own such a machine, and often have to make arrangements
-      (or fight limited space on one of the machines I can telnet to).
-    - The gcc 2.8.1 optimizer appears to be buggy, I have had to turn off
-      the default "-O3" flag to prevent compiler crashes (several files).
-      This problems appears to be resolved with gcc 2.95.
-    - Locking on Solaris (especially w.r.t NFS) remains a mystery to me.
-      The Tcl and Python extensions both use locking (the core not yet).
-      See tcl/Mk4tcl.cpp around line 520, and python/PyStorage.cpp around
-      line 80 for details.  It's all pretty messy, and not 100% correct.
-
-    Despite this, I'm doing my best to resolve these issues.  Having a solid
-    build of the core *and* of Tcl / Python extensions is quite important.
-
-* Other Unix systems
-
-    No further notes, though many systems will build fine out of the box.
-
-* Windows
-
-    MSVC 6 builds MK as static lib and as DLL (universal config, I have not
-    yet created build versions with MFC or STL, mainly because MK can now be
-    used in all contexts regardless of how it was built).  The Python and Tcl
-    extensions build as dynamic extensions (a static build is easy to add).
-
-    MWCW 5 builds MK as static lib and as DLL (interestingly enough, the DLL
-    is slightly smaller than MSVC 6 - 102 vs 108 Kb - when their runtimes are
-    linked in dynamically as well).  I have not added Win builds for Tcl or
-    Python, since MSVC 6 has those already.
-
-    Cygwin B20.1, with gcc 2.95.2 ugrade, also builds MK as static lib and as
-    DLL.  Both "pure" Cygwin (i.e. requiring cygwin1.dll) and mingw32 (using
-    the -mno-cygwin flag) build, but there are some hairy include issues when
-    it comes to choosing the right locking model for Tcl and Python.  These
-    issues have not been resolved fully.
-
-* Macintosh
-
-    MWCW 5 builds PPC shared libs, PPC static libs, and 68K static libraries.
-
-    Building 68K CFM libraries leads to a "MetaKit 68K.shlb" which comes out
-    of the linker without errors, but the result does not seem to have any
-    export symbols defined (despite the fact that the library is over 200 K).
-    Because of that, I've been unable to build apps or Mk4tcl/Mk4py so far.
-
-    The other three configurations build, but for some reason MK's regression
-    test stops at L03 (everything up to that point looks ok, i.e. over 90%).
-
-    The Mk4tcl PPC extension appears to work (quick manual test), and so does
-    the Python extension, "Mk4py.PPC.slb".  I have not yet given these two
-    a serious workout, hoping to have a basic test harness in place soon.
-
-* VMS, BeOS, ...
-
-    No news yet, please report your findings with any other platform builds.
-
-
-WHAT'S MISSING HERE
-===================
-
-    - a section on basic concepts (or maybe it doesn't belong here?)
-    - a section on getting started (C++, Python, Tcl all differ - point to
-      the respective intro pages)
-    - maybe a small sample for each of C++ / Tcl / Python, to give an idea
-    - mention TclKit, scripted docs (WiKit/Tequila?), VFS?
-    - I forgot... please tell me :)
-
-
-LICENSE AND COPYRIGHT STATEMENT
-===============================
-
-Copyright (c) 1996-2000 Jean-Claude Wippler
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-==============================================================================
--- Jean-Claude Wippler <jcw@equi4.com>

Thanks

@@ -90,7 +90,7 @@ David Megginson <david@megginson.com>
   SimGear property manager/registry
 
 
-Curt Olson <curt@flightgear.org>
+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 +175,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)

configure.ac

@@ -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.3)
+AM_INIT_AUTOMAKE(SimGear, 0.3.8)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.
@@ -42,19 +40,41 @@ dnl set the $host variable based on local machine/os
 AC_CANONICAL_HOST
 
 dnl Used on the Irix platform
-AR="ar"
-ARFLAGS="cru"
 case "${host}" in
 *-*-irix*)
-    if test "$CXX" = "CC"; then
-        AR="CC -ar"
+    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
     ;;
+*)
+    AR="ar"
+    ARFLAGS="cru"
+    compatibility_DIR=
+    ;;
 esac
 AC_SUBST(AR)
 AC_SUBST(ARFLAGS)
+AC_SUBST(compatibility_DIR)
 
 if echo $includedir | egrep "simgear$" > /dev/null; then
     echo "includedir is" $includedir "libdir is" $libdir
@@ -91,6 +111,13 @@ 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
 
 dnl Determine an extra directories to add to include/lib search paths
 case "${host}" in
@@ -105,7 +132,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
@@ -134,55 +161,35 @@ esac
 
 dnl Checks for libraries.
 
-null_LIBS="$LIBS"
-
-AC_CHECK_LIB(m, cos)
-
-base_LIBS="$LIBS"
-
 dnl Thread related checks
-AC_CHECK_LIB(pthread, pthread_exit)
 AC_CHECK_HEADER(pthread.h)
-if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
+AC_SEARCH_LIBS(pthread_exit, [pthread c_r])
+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
-    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"
+
+  if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
     CXXFLAGS="-pthread $CXXFLAGS"
     CFLAGS="-pthread $FLAGS"
-    save_LIBS=$LIBS
-    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
 fi
-AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes")
 
-AC_CHECK_LIB(socket, socket)
+AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_header_pthread_h" = "xyes")
 
-dnl check for glut location
-AC_CHECK_HEADER(GL/glut.h)
-if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-    AC_DEFINE([GLUT_H], "GL/glut.h", [Define as glut.h include location])
-else
-    AC_CHECK_HEADER(GLUT/glut.h)
-    if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-        AC_DEFINE([GLUT_H], "GLUT/glut.h", [Define as glut.h include location])
-    else
-        echo "Neither GL/glut.h nor GLUT/glut.h found.  Cannot continue"
-        exit
-    fi
-fi
+thread_LIBS="$LIBS"
+LIBS=""
+
+dnl search for network related libraries
+AC_SEARCH_LIBS(inet_addr, xnet)
+AC_SEARCH_LIBS(socket, socket)
+
+network_LIBS="$LIBS"
+LIBS=""
+
+dnl check for some default libraries
+AC_SEARCH_LIBS(cos, m)
+
+base_LIBS="$LIBS"
 
 dnl check for OpenGL related libraries
 case "${host}" in
@@ -193,7 +200,7 @@ case "${host}" in
     AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
     AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
 
-    LIBS="$LIBS -lglut32 -lglu32 -lopengl32"
+    LIBS="$LIBS -lglu32 -lopengl32"
     LIBS="$LIBS -luser32 -lgdi32 -lwinmm"
 
     dnl add -lwsock32 for mingwin
@@ -209,35 +216,28 @@ case "${host}" in
 *-apple-darwin*)
     dnl Mac OS X
 
-    LIBS="$LIBS -framework GLUT -framework OpenGL -framework Carbon -lobjc"
+    LIBS="$LIBS -framework OpenGL -framework Carbon -lobjc"
     ;;
 
 *)
     dnl X-Windows based machines
 
-    AC_CHECK_LIB(X11, XCreateWindow)
-    AC_CHECK_LIB(Xext, XShmCreateImage)
-    AC_CHECK_LIB(Xi, XGetExtensionVersion)
-    AC_CHECK_LIB(ICE, IceOpenConnection)
-    AC_CHECK_LIB(SM, SmcOpenConnection)
-    AC_CHECK_LIB(Xt, XtMalloc)
-    AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
+    AC_SEARCH_LIBS(XCreateWindow, X11)
+    AC_SEARCH_LIBS(XShmCreateImage, Xext)
+    AC_SEARCH_LIBS(XGetExtensionVersion, Xi)
+    AC_SEARCH_LIBS(IceOpenConnection, ICE)
+    AC_SEARCH_LIBS(SmcOpenConnection, SM)
+    AC_SEARCH_LIBS(XtMalloc, Xt)
+    AC_SEARCH_LIBS(XmuLookupStandardColormap, Xmu)
     
-    AC_CHECK_LIB(GLcore, glNewList)
-    if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then
-	dnl if no GLcore, check for GL
-	AC_CHECK_LIB(GL, glNewList)
-	if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
-	    dnl if no GL, check for MesaGL
-	    AC_CHECK_LIB(MesaGL, glNewList)
-	fi
-    else
+    AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ])
+    if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then
 	dnl if GLcore found, then also check for GL
-	AC_CHECK_LIB(GL, glXCreateContext)
+        AC_SEARCH_LIBS(glXCreateContext, GL)
     fi
 
     dnl if using mesa, check for xmesa.h
-    if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
+    if test "x$ac_cv_search_glNewList" = "x-lMesaGL"; then
 	AC_CHECK_HEADER(GL/fxmesa.h)
 	if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then
 	    AC_DEFINE([XMESA], 1, [Define for fxmesa])
@@ -245,13 +245,7 @@ case "${host}" in
         fi
     fi
 
-    AC_CHECK_LIB(GLU, gluLookAt)
-    if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
-	dnl if no GLU, check for MesaGLU
-	AC_CHECK_LIB(MesaGLU, gluLookAt)
-    fi
-
-    LIBS="$LIBS -lglut"
+    AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ])
     ;;
 
 esac
@@ -259,8 +253,59 @@ esac
 opengl_LIBS="$LIBS"
 LIBS="$base_LIBS"
 
+dnl check for OpenAL libraries
+OPENAL_OK="no"
+case "${host}" in
+*-*-cygwin* | *-*-mingw32*)
+    dnl CygWin under Windoze.
+
+    AC_SEARCH_LIBS(alGenBuffers, openal32)
+    AC_SEARCH_LIBS(alutInit, [ openal32 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)
+    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)
 
 dnl Check for MS Windows environment
 AC_CHECK_HEADER(windows.h)
@@ -284,11 +329,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;
@@ -303,55 +348,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_RESULT(yes)
-)
-
-dnl Check for MetaKit
-AC_CHECK_HEADER(mk4.h)
-if test "x$ac_cv_header_mk4_h" != "xyes"; then
-    echo
-    echo "MetaKit library not found."
-    echo
-    echo "If your OS does not provide an installable package for MetaKit"
-    echo "you will have to compile and install it first yourself.  A copy"
-    echo "of metakit-$(VERSION).tar.gz is included with SimGear.  You will"
-    echo "have to untar this source code, and follow its included instructions"
-    echo "to compile and install on your system."
-    echo
-    echo "configure aborted."
-    exit
-fi
-
-AC_MSG_CHECKING([for metakit 2.4.3 or newer])
-saved_LIBS="$LIBS"
-LIBS="$saved_LIBS -lmk4"
-AC_TRY_RUN([
-#include <mk4.h>
-
-#define MIN_MK4_VERSION 243
-
-int main() {
-    int major, minor, micro;
-
-    if ( d4_MetaKitLibraryVersion < MIN_MK4_VERSION ) {
-	 return -1;
-    }
-
-    return 0;
-}
-
-],
-  AC_MSG_RESULT(yes),
-  [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([
-
-Install metakit 2.4.3 or later first.
-
-Or, the compiler may not be finding your libmk4.so library.
-Please check the config.log file for specific details of the
-failure if you believe you have the correct metakit version.
-Also, look up this issue in the FlightGear FAQ.])],
+   AC_MSG_ERROR([Install plib 1.8.4 or later first...])],
   AC_MSG_RESULT(yes)
 )
 
@@ -392,11 +389,14 @@ 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)
 
@@ -407,24 +407,29 @@ AC_CONFIG_FILES([ \
 	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/screen/Makefile \
 	simgear/serial/Makefile \
 	simgear/sound/Makefile \
+	simgear/structure/Makefile \
 	simgear/threads/Makefile \
 	simgear/timing/Makefile \
 	simgear/xgl/Makefile \
@@ -448,20 +453,13 @@ fi
 echo -n "Automake version: "
 automake --version | head -1
 
-if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
-   echo "With GL/glut.h"
-fi
-if test "x$ac_cv_header_GLUT_glut_h" = "xyes"; then
-   echo "With GLUT/glut.h"
-fi
-
 if test "x$with_jpeg_factory" = "xyes"; then
    echo "With JPEG Factory support"
 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.)"

simgear/Makefile.am

@@ -5,7 +5,7 @@ SGTHREAD_DIR =
 endif
 
 # METAR_DIRS =
-METAR_DIRS = metar
+METAR_DIRS = environment
 
 EXTRA_DIST = simgear_config.h.vc5 version.h.in
 
@@ -13,16 +13,18 @@ include_HEADERS = \
 	compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
 
 SUBDIRS = \
-	compatibility \
+	$(compatibility_DIR) \
 	xml \
 	debug \
 	misc \
+	structure \
 	bucket \
 	ephemeris \
 	io \
 	magvar \
 	math \
 	$(METAR_DIRS) \
+	nasal \
 	props \
 	route \
 	scene \
@@ -33,4 +35,4 @@ SUBDIRS = \
 	timing \
 	xgl
 
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = $(SUBDIRS) compatibility threads

simgear/bucket/newbucket.cxx

@@ -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

simgear/bucket/newbucket.hxx

@@ -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
@@ -257,14 +257,16 @@ public:
     // 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.

simgear/compatibility/MIPSpro721/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

simgear/compatibility/MIPSpro721/Makefile.am

@@ -0,0 +1,14 @@
+includedir = @includedir@/compatibility/
+
+include_HEADERS	= \
+	iostream \
+	strstream \
+	sstream \
+	istream \
+	fstream \
+	iterator \
+	iomanip \
+	new \
+	streambuf \
+	\
+	irix_string

simgear/compatibility/MIPSpro721/fstream

@@ -8,8 +8,8 @@
 
   namespace std {
     using ::fstream;
-    using ::ifstream;
     using ::ofstream;
+    using ::ifstream;
   };
 
 

simgear/compatibility/MIPSpro721/iomanip

@@ -5,7 +5,11 @@
 # include <iomanip.h>
 
 namespace std {
+
    using ::setw;
+   using ::setprecision;
+
+   inline int  setfill(int f) { ::setfill(f); }
 };
 
 #endif // !__SG_IOMANIP

simgear/compatibility/MIPSpro721/iostream

@@ -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 {
@@ -31,7 +30,20 @@
     using ::ostream;
 
     using ::dec;
+    using ::oct;
     using ::hex;
+
+    enum  { skipws=ios::skipws,
+            left=ios::left, right=ios::right, internal=ios::internal,
+            showbase=ios::showbase, showpoint=ios::showpoint,
+            uppercase=ios::uppercase, showpos=ios::showpos,
+            scientific=ios::scientific, fixed=ios::fixed,
+            unitbuf=ios::unitbuf, stdio=ios::stdio
+#if _BOOL && __EDG_ABI_COMPATIBILITY_VERSION>227 /* bool support */
+            ,boolalpha=ios::boolalpha
+#endif /* bool support */
+          };
+
   };
 
 # endif

simgear/compatibility/MIPSpro721/irix_string

@@ -0,0 +1,47 @@
+
+#ifndef __SGI_HXX
+#define __SGI_HXX 1
+
+#ifdef __cplusplus
+
+#include <string>
+
+inline bool
+operator!=( const std::string& lhs, const char* rhs)
+{
+    return lhs.compare( rhs ) != 0;
+}
+
+inline bool
+operator!=( const char* lhs, const std::string& rhs)
+{
+    return rhs.compare( lhs ) != 0;
+}
+
+inline bool
+operator==( const std::string& lhs, const char* rhs)
+{
+    return lhs.compare( rhs ) == 0;
+}
+
+inline bool
+operator==( const char* lhs, const std::string& rhs)
+{
+    return rhs.compare( lhs ) == 0;
+}
+
+inline std::string
+operator+(const std::string& lhs, const char* rhs)
+{
+    return lhs + std::string(rhs);
+}
+
+inline std::string
+operator+(const char* lhs, const std::string& rhs)
+{
+    return std::string(lhs) + rhs;
+}
+
+#endif /* __cplusplus */
+
+#endif /* !__SGI_HXX */

simgear/compatibility/MIPSpro721/sstream

@@ -0,0 +1,22 @@
+
+#ifndef __SG_SSTREAM
+#define __SG_SSTREAM 1
+
+# include <iostream>
+# include <strstream>
+# include <string>
+
+namespace std {
+
+   class ostringstream : public ostrstream {
+   public:
+      std::string str() {  return string(ostrstream::str()); }
+   };
+
+
+   typedef istrstream istringstream;
+
+};
+
+#endif // !__SG_SSTREAM
+

simgear/compatibility/MIPSpro740/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

simgear/compatibility/MIPSpro740/Makefile.am

@@ -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

simgear/compatibility/Makefile.am

@@ -1,31 +1,3 @@
-includedir = @includedir@/compatibility
+SUBDIRS = $(MIPSpro_DIRS)
 
-EXTRA_DIST = README
-
-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
+DIST_SUBDIRS = MIPSpro721 MIPSpro740

simgear/compatibility/sstream

@@ -1,13 +0,0 @@
-
-#ifndef __SG_SSTREAM
-#define __SG_SSTREAM 1
-
-# include <strstream>
-
-namespace std {
-   typedef ::ostrstream ostringstream;
-   typedef ::istrstream istringstream;
-};
-
-#endif // !__SG_SSTREAM
-

simgear/compiler.h

@@ -121,7 +121,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 +149,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 +213,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,6 +229,7 @@
 #    define STL_STRING     <string>
 #    define STL_STRSTREAM  <strstream>
 
+#    define isnan _isnan
 #    define snprintf _snprintf
 
 #    pragma warning(disable: 4786) // identifier was truncated to '255' characters
@@ -307,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
@@ -315,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)
@@ -334,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
 
@@ -362,6 +366,23 @@
 
 #endif // __ICC
 
+//
+// Platform dependent gl.h and glut.h definitions
+//
+
+#ifdef __APPLE__
+#  define SG_GL_H <OpenGL/gl.h>
+#  define SG_GLU_H <OpenGL/glu.h>
+#  define SG_GLEXT_H <OpenGL/glext.h>
+#  define SG_GLUT_H <GLUT/glut.h>
+#else
+#  define SG_GL_H <GL/gl.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.
 //

simgear/constants.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
@@ -106,21 +106,51 @@
 #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
+
+/** 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

simgear/debug/debug_types.h

@@ -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;

simgear/debug/logstream.hxx

@@ -28,6 +28,10 @@
 
 #include <simgear/compiler.h>
 
+#ifdef _MSC_VER
+#  include <windows.h>
+#endif
+
 #ifdef SG_HAVE_STD_INCLUDES
 # include <streambuf>
 # include <iostream>
@@ -180,7 +184,23 @@ logbuf::set_log_state( sgDebugClass c, sgDebugPriority p )
 inline logbuf::int_type
 logbuf::overflow( int c )
 {
+#ifdef _MSC_VER
+    static has_console = false;
+    if ( logging_enabled ) {
+        if ( !has_console ) {
+            AllocConsole();
+            freopen("conin$", "r", stdin);
+            freopen("conout$", "w", stdout);
+            freopen("conout$", "w", stderr);
+            has_console = true;
+        }
+        sbuf->sputc(c);
+    }
+    else
+        return EOF == 0 ? 1: 0;
+#else
     return logging_enabled ? sbuf->sputc(c) : (EOF == 0 ? 1: 0);
+#endif
 }
 
 /**

simgear/environment/.cvsignore

@@ -0,0 +1,4 @@
+.deps
+Makefile
+Makefile.in
+metar

simgear/environment/Makefile.am

@@ -0,0 +1,9 @@
+includedir = @includedir@/environment
+
+lib_LIBRARIES = libsgenvironment.a
+
+include_HEADERS = metar.hxx
+
+libsgenvironment_a_SOURCES = metar.cxx
+
+INCLUDES = -I$(top_srcdir)

simgear/environment/metar.hxx

@@ -0,0 +1,261 @@
+// 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, 59 Temple Place, Suite 330, Boston, MA 02111-1307, 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
+	};
+
+	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(0),
+		_extent(-1),
+		_extent_string(0),
+		_depth(NaN),
+		_friction(NaN),
+		_friction_string(0),
+		_comment(0),
+		_wind_shear(false) {}
+
+	inline const char		*getDeposit()		const { return _deposit; }
+	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 SGMetarVisibility	getMinVisibility()	const { return _min_visibility; }
+	inline SGMetarVisibility	getMaxVisibility()	const { return _max_visibility; }
+
+protected:
+	SGMetarVisibility _min_visibility;
+	SGMetarVisibility _max_visibility;
+	const char	*_deposit;
+	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) {}
+
+	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 = "");
+	~SGMetar();
+
+	enum ReportType {
+		NONE,
+		AUTO,
+		COR,
+		RTD
+	};
+
+	inline const char *getData()		const { return _data; }
+	inline const char *getUnusedData()	const { return _m; }
+	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 SGMetarVisibility& getMinVisibility()	{ return _min_visibility; }
+	inline SGMetarVisibility& getMaxVisibility()	{ return _max_visibility; }
+	inline SGMetarVisibility& getVertVisibility()	{ return _vert_visibility; }
+	inline SGMetarVisibility *getDirVisibility()	{ 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; }
+
+	double		getRelHumidity()	const;
+
+	inline vector<SGMetarCloud>& getClouds()	{ return _clouds; }
+	inline map<string, SGMetarRunway>& getRunways()	{ return _runways; }
+	inline vector<string>& getWeather()		{ return _weather; }
+
+protected:
+	string	_url;
+	int	_grpcount;
+	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;
+
+	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();
+
+	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);
+	void	normalizeData();
+};
+
+#undef NaN
+#endif // _METAR_HXX

simgear/ephemeris/Makefile.am

@@ -4,7 +4,7 @@ lib_LIBRARIES = libsgephem.a
 
 include_HEADERS = \
 	celestialBody.hxx \
-        ephemeris.hxx \
+	ephemeris.hxx \
 	jupiter.hxx \
 	mars.hxx \
 	mercury.hxx \

simgear/ephemeris/ephemeris.cxx

@@ -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
@@ -23,6 +23,8 @@
 // $Id$
 
 
+#include <iostream>
+
 #include "ephemeris.hxx"
 
 
@@ -37,6 +39,10 @@ SGEphemeris::SGEphemeris( const string &path ) {
     saturn = new Saturn;
     uranus = new Uranus;
     neptune = new Neptune;
+    nplanets = 7;
+    for ( int i = 0; i < nplanets; ++i ) {
+        sgdSetVec3( planets[i], 0.0, 0.0, 0.0 );
+    }
     stars = new SGStarData( SGPath(path) );
 }
 

simgear/ephemeris/ephemeris.hxx

@@ -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
@@ -48,7 +48,7 @@
 /** Ephemeris class
  *
  * Written by Durk Talsma <d.talsma@direct.a2000.nl> and Curtis Olson
- * <curt@flightgear.org>
+ * <http://www.flightgear.org/~curt>
  *
  * Introduction 
  *

simgear/ephemeris/stardata.cxx

@@ -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

simgear/ephemeris/stardata.hxx

@@ -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

simgear/io/Makefile.am

@@ -31,8 +31,9 @@ tcp_server_LDADD = \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
-	-lplibnet -lplibul -lz
+	-lplibnet -lplibul -lz \
+	$(network_LIBS) \
+	$(base_LIBS)
 
 tcp_client_SOURCES = tcp_client.cxx
 
@@ -41,30 +42,35 @@ tcp_client_LDADD = \
 	$(top_builddir)/simgear/debug/libsgdebug.a \
 	$(top_builddir)/simgear/bucket/libsgbucket.a \
 	$(top_builddir)/simgear/misc/libsgmisc.a \
-        $(top_builddir)/simgear/xml/libsgxml.a \
-	-lplibnet -lplibul -lz
+	-lplibnet -lplibul -lz \
+	$(network_LIBS) \
+	$(base_LIBS)
 
 socktest_SOURCES = socktest.cxx
 
 socktest_LDADD = \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-        $(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 \
-	$(top_builddir)/simgear/xml/libsgxml.a \
-	-lplibnet -lplibul -lz
+	-lplibnet -lplibul -lz \
+	$(network_LIBS) \
+	$(base_LIBS)
 
 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/bucket/libsgbucket.a \
-        $(top_builddir)/simgear/misc/libsgmisc.a \
-        $(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
-	-lz
+	$(top_builddir)/simgear/debug/libsgdebug.a \
+	$(top_builddir)/simgear/bucket/libsgbucket.a \
+	$(top_builddir)/simgear/misc/libsgmisc.a \
+	$(base_LIBS) -lz

simgear/io/iochannel.cxx

@@ -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

simgear/io/iochannel.hxx

@@ -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

simgear/io/lowlevel.cxx

@@ -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

simgear/io/lowlevel.hxx

@@ -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

simgear/io/sg_binobj.cxx

@@ -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
@@ -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() ) {
@@ -1145,7 +1145,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
 	    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] ] );
-		    bs_center = calc_center( group_nodes );
+		    bs_center = sgCalcCenter( group_nodes );
 		    bs_radius = sgCalcBoundingRadius( bs_center, group_nodes );
 		}
 	    }
@@ -1196,7 +1196,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
 	    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] ] );
-		    bs_center = calc_center( group_nodes );
+		    bs_center = sgCalcCenter( group_nodes );
 		    bs_radius = sgCalcBoundingRadius( bs_center, group_nodes );
 		}
 	    }

simgear/io/sg_binobj.hxx

@@ -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
@@ -221,6 +221,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.

simgear/io/sg_file.cxx

@@ -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

simgear/io/sg_file.hxx

@@ -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

simgear/io/sg_serial.cxx

@@ -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
@@ -133,7 +133,7 @@ int SGSerial::write( const char *buf, const int length ) {
     int result = port.write_port( buf, length );
 
     if ( result != length ) {
-	SG_LOG( SG_IO, SG_ALERT, "Error writing data: " << device );
+	SG_LOG( SG_IO, SG_WARN, "Error writing data: " << device );
     }
 
     return result;

simgear/io/sg_serial.hxx

@@ -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

simgear/io/sg_socket.cxx

@@ -3,7 +3,7 @@
 // Written by Curtis Olson, started November 1999.
 // Modified by Bernie Bright <bbright@bigpond.net.au>, May 2002.
 //
-// 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
@@ -28,6 +28,8 @@
 #include <strings.h>
 #endif
 
+#include STL_IOSTREAM
+
 #include <simgear/debug/logstream.hxx>
 
 #include "sg_socket.hxx"
@@ -42,7 +44,8 @@ SGSocket::SGSocket( const string& host, const string& port_,
     client(0),
     is_tcp(false),
     is_server(false),
-    first_read(false)
+    first_read(false),
+    timeout(0)
 {
     if (!init)
     {
@@ -54,7 +57,7 @@ SGSocket::SGSocket( const string& host, const string& port_,
     {
 	is_tcp = true;
     }
-    else if ( style != (string)"udp" )
+    else if ( style != "udp" )
     {
 	SG_LOG( SG_IO, SG_ALERT,
 		"Error: SGSocket() unknown style = " << style );
@@ -218,7 +221,14 @@ SGSocket::read( char *buf, int length )
 
     if (result > 0)
     {
-	result = sock.recv( buf, length );
+       if (is_tcp && is_server)
+	{
+            result = client->recv( buf, length );
+        }
+        else
+        {
+            result = sock.recv( buf, length );
+        }
 
 	if ( result != length )
 	{
@@ -250,7 +260,7 @@ SGSocket::readline( char *buf, int length )
 	// read a chunk, keep in the save buffer until we have the
 	// requested amount read
 
-	if (is_tcp)
+       if (is_tcp && is_server)
 	{
 	    char *buf_ptr = save_buf + save_len;
 	    result = client->recv( buf_ptr, SG_IO_MAX_MSG_SIZE - save_len );
@@ -323,7 +333,7 @@ SGSocket::write( const char *buf, const int length )
 
     if ( s->send( buf, length ) < 0 )
     {
-	SG_LOG( SG_IO, SG_ALERT, "Error writing to socket: " << port );
+	SG_LOG( SG_IO, SG_WARN, "Error writing to socket: " << port );
 	error_condition = true;
     }
 
@@ -379,7 +389,7 @@ SGSocket::poll()
     netSocket* writers[1];
     writers[0] = 0;
 
-    int result = netSocket::select( readers, writers, 0 );
+    int result = netSocket::select( readers, writers, timeout );
 
     if (result > 0 && is_server && client == 0)
     {

simgear/io/sg_socket.hxx

@@ -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
@@ -64,6 +64,7 @@ private:
     bool is_tcp;
     bool is_server;
     bool first_read;
+    int timeout;
 
     static bool init;
 
@@ -156,6 +157,9 @@ public:
      */
     bool nonblock();
 
+    // set timeout (default: 0)
+    inline void set_timeout(int i) { timeout = i; }
+
     /** @return the remote host name */
     inline string get_hostname() const { return hostname; }
 

simgear/io/sg_socket_udp.cxx

@@ -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
@@ -162,7 +162,7 @@ int SGSocketUDP::write( const char *buf, const int length ) {
     bool error_condition = false;
 
     if ( sock.send( buf, length, 0 ) < 0 ) {
-	SG_LOG( SG_IO, SG_ALERT, "Error writing to socket: " << port );
+	SG_LOG( SG_IO, SG_WARN, "Error writing to socket: " << port );
 	error_condition = true;
 	return 0;
     }

simgear/io/sg_socket_udp.hxx

@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started November 2001.
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  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

simgear/magvar/Makefile.am

@@ -12,6 +12,8 @@ noinst_PROGRAMS = testmagvar
 
 testmagvar_SOURCES = testmagvar.cxx
 
-testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
+testmagvar_LDADD = \
+	$(top_builddir)/simgear/magvar/libsgmagvar.a \
+	$(base_LIBS)
 
 INCLUDES = -I$(top_srcdir)

simgear/magvar/magvar.cxx

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started July 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

simgear/magvar/magvar.hxx

@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started July 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

simgear/math/Makefile.am

@@ -12,7 +12,8 @@ include_HEADERS = \
 	sg_memory.h \
 	sg_random.h \
 	sg_types.hxx \
-	vector.hxx
+	vector.hxx \
+	fastmath.hxx
 
 EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
 
@@ -22,6 +23,7 @@ libsgmath_a_SOURCES = \
 	polar3d.cxx \
 	sg_geodesy.cxx \
 	sg_random.c \
-	vector.cxx
+	vector.cxx \
+	fastmath.cxx
 
 INCLUDES = -I$(top_srcdir)

simgear/math/fastmath.cxx

@@ -0,0 +1,291 @@
+/*
+ * \file fastmath.cxx
+ * fast mathematics routines.
+ *
+ * Refferences:
+ *
+ * A Fast, Compact Approximation of the Exponential Function
+ * Nicol N. Schraudolph
+ * IDSIA, Lugano, Switzerland
+ * http://www.inf.ethz.ch/~schraudo/pubs/exp.pdf
+ *
+ * Base-2 exp, Laurent de Soras
+ * http://www.musicdsp.org/archive.php?classid=5#106
+ *
+ * Fast log() Function, by Laurent de Soras:
+ * http://www.flipcode.com/cgi-bin/msg.cgi?showThread=Tip-Fastlogfunction&forum=totd&id=-1
+ *
+ * Sin, Cos, Tan approximation
+ * http://www.musicdsp.org/showArchiveComment.php?ArchiveID=115
+ *
+ * fast floating point power computation:
+ * http://playstation2-linux.com/download/adam/power.c
+ */
+
+/*
+ * $Id$
+ */
+
+
+
+#include "fastmath.hxx"
+#define  SGD_PI_2  1.57079632679489661923
+
+/**
+ * This function is on avarage 9 times faster than the system exp() function
+ * and has an error of about 1.5%
+ */
+static union {
+    double d;
+    struct {
+#if BYTE_ORDER == BIG_ENDIAN
+        int i, j;
+#else
+        int j, i;
+#endif
+    } n;
+} _eco;
+
+double fast_exp(double val) {
+    const double a = 1048576/M_LN2;
+    const double b_c = 1072632447; /* 1072693248 - 60801 */
+
+    _eco.n.i = (int)(a*val + b_c);
+
+    return _eco.d;
+}
+
+/*
+ * Linear approx. between 2 integer values of val. Uses 32-bit integers.
+ * Not very efficient but faster than exp()
+ */
+double fast_exp2( const double val )
+{
+    int e;
+    double ret;
+
+    if (val >= 0) {
+        e = int (val);
+        ret = val - (e - 1);
+
+#if BYTE_ORDER == BIG_ENDIAN
+        ((*((int *) &ret)) &= ~(2047 << 20)) += (e + 1023) << 20;
+#else
+        ((*(1 + (int *) &ret)) &= ~(2047 << 20)) += (e + 1023) << 20;
+#endif
+    } else {
+        e = int (val + 1023);
+        ret = val - (e - 1024);
+
+#if BYTE_ORDER == BIG_ENDIAN
+        ((*((int *) &ret)) &= ~(2047 << 20)) += e << 20;
+#else
+        ((*(1 + (int *) &ret)) &= ~(2047 << 20)) += e << 20;
+#endif
+    }
+
+    return ret;
+}
+
+
+/*
+ *
+ */
+float _fast_log2(const float val)
+{
+    float result, tmp;
+    float mp = 0.346607f;
+
+    result = *(int*)&val;
+    result *= 1.0/(1<<23);
+    result = result - 127;
+ 
+    tmp = result - floor(result);
+    tmp = (tmp - tmp*tmp) * mp;
+    return tmp + result;
+}
+
+float _fast_pow2(const float val)
+{
+    float result;
+
+    float mp = 0.33971f;
+    float tmp = val - floor(val);
+    tmp = (tmp - tmp*tmp) * mp;
+
+    result = val + 127 - tmp; 
+    result *= (1<<23);
+    *(int*)&result = (int)result;
+    return result;
+}
+
+
+
+/**
+ * While we're on the subject, someone might have use for these as well?
+ * Float Shift Left and Float Shift Right. Do what you want with this.
+ */
+void fast_BSL(float &x, register unsigned long shiftAmount) {
+
+	*(unsigned long*)&x+=shiftAmount<<23;
+
+}
+
+void fast_BSR(float &x, register unsigned long shiftAmount) {
+
+	*(unsigned long*)&x-=shiftAmount<<23;
+
+}
+
+
+/*
+ * fastpow(f,n) gives a rather *rough* estimate of a float number f to the
+ * power of an integer number n (y=f^n). It is fast but result can be quite a
+ * bit off, since we directly mess with the floating point exponent.
+ * 
+ * Use it only for getting rough estimates of the values and where precision 
+ * is not that important.
+ */
+float fast_pow(const float f, const int n)
+{
+    long *lp,l;
+    lp=(long*)(&f);
+    l=*lp;l-=0x3F800000l;l<<=(n-1);l+=0x3F800000l;
+    *lp=l;
+    return f;
+}
+
+float fast_root(const float f, const int n)
+{
+    long *lp,l;
+    lp=(long*)(&f);
+    l=*lp;l-=0x3F800000l;l>>=(n-1);l+=0x3F800000l;
+    *lp=l;
+    return f;
+}
+
+
+/*
+ * Code for approximation of cos, sin, tan and inv sin, etc.
+ * Surprisingly accurate and very usable.
+ *
+ * Domain:
+ * Sin/Cos    [0, pi/2]
+ * Tan        [0,pi/4]
+ * InvSin/Cos [0, 1]
+ * InvTan     [-1, 1]
+ */
+
+float fast_sin(const float val)
+{
+    float fASqr = val*val;
+    float fResult = -2.39e-08f;
+    fResult *= fASqr;
+    fResult += 2.7526e-06f;
+    fResult *= fASqr;
+    fResult -= 1.98409e-04f;
+    fResult *= fASqr;
+    fResult += 8.3333315e-03f;
+    fResult *= fASqr;
+    fResult -= 1.666666664e-01f;
+    fResult *= fASqr;
+    fResult += 1.0f;
+    fResult *= val;
+
+    return fResult;
+}
+
+float fast_cos(const float val)
+{
+    float fASqr = val*val;
+    float fResult = -2.605e-07f;
+    fResult *= fASqr;
+    fResult += 2.47609e-05f;
+    fResult *= fASqr;
+    fResult -= 1.3888397e-03f;
+    fResult *= fASqr;
+    fResult += 4.16666418e-02f;
+    fResult *= fASqr;
+    fResult -= 4.999999963e-01f;
+    fResult *= fASqr;
+    fResult += 1.0f;
+
+    return fResult;  
+}
+
+float fast_tan(const float val)
+{
+    float fASqr = val*val;
+    float fResult = 9.5168091e-03f;
+    fResult *= fASqr;
+    fResult += 2.900525e-03f;
+    fResult *= fASqr;
+    fResult += 2.45650893e-02f;
+    fResult *= fASqr;
+    fResult += 5.33740603e-02f;
+    fResult *= fASqr;
+    fResult += 1.333923995e-01f;
+    fResult *= fASqr;
+    fResult += 3.333314036e-01f;
+    fResult *= fASqr;
+    fResult += 1.0f;
+    fResult *= val;
+
+    return fResult;
+
+}
+
+float fast_asin(float val)
+{
+    float fRoot = sqrt(1.0f-val);
+    float fResult = -0.0187293f;
+    fResult *= val;
+    fResult += 0.0742610f;
+    fResult *= val;
+    fResult -= 0.2121144f;
+    fResult *= val;
+    fResult += 1.5707288f;
+    fResult = SGD_PI_2 - fRoot*fResult;
+
+    return fResult;
+}
+
+float fast_acos(float val)
+{
+    float fRoot = sqrt(1.0f-val);
+    float fResult = -0.0187293f;
+    fResult *= val;
+    fResult += 0.0742610f;
+    fResult *= val;
+    fResult -= 0.2121144f;
+    fResult *= val;
+    fResult += 1.5707288f;
+    fResult *= fRoot;
+
+    return fResult;
+}
+
+float fast_atan(float val)
+{
+    float fVSqr = val*val;
+    float fResult = 0.0028662257f;
+    fResult *= fVSqr;
+    fResult -= 0.0161657367f;
+    fResult *= fVSqr;
+    fResult += 0.0429096138f;
+    fResult *= fVSqr;
+    fResult -= 0.0752896400f;
+    fResult *= fVSqr;
+    fResult += 0.1065626393f;
+    fResult *= fVSqr;
+    fResult -= 0.1420889944f;
+    fResult *= fVSqr;
+    fResult += 0.1999355085f;
+    fResult *= fVSqr;
+    fResult -= 0.3333314528f;
+    fResult *= fVSqr;
+    fResult += 1.0f;
+    fResult *= val;
+
+    return fResult;
+}

simgear/math/fastmath.hxx

@@ -0,0 +1,117 @@
+/*
+ * \file fastmath.hxx
+ * fast mathematics routines.
+ *
+ * Refferences:
+ *
+ * A Fast, Compact Approximation of the Exponential Function
+ * Nicol N. Schraudolph
+ * IDSIA, Lugano, Switzerland
+ * http://www.inf.ethz.ch/~schraudo/pubs/exp.pdf
+ *
+ * Fast log() Function, by Laurent de Soras:
+ * http://www.flipcode.com/cgi-bin/msg.cgi?showThread=Tip-Fastlogfunction&forum=totd&id=-1
+ *
+ */
+
+/*
+ * $Id$
+ */
+
+#ifndef _SG_FMATH_HXX
+#define _SG_FMATH_HXX 1
+
+#ifndef __cplusplus
+# error This library requires C++
+#endif
+
+#ifdef _MSC_VER
+#define  _USE_MATH_DEFINES
+#endif
+#include <math.h>
+
+
+double fast_exp(double val);
+double fast_exp2(const double val);
+
+float fast_pow(const float val1, const float val2);
+float fast_log2(const float cal);
+float fast_root(const float f, const int n);
+
+float _fast_pow2(const float cal);
+float _fast_log2(const float val);
+
+float fast_sin(const float val);
+float fast_cos(const float val);
+float fast_tan(const float val);
+float fast_asin(const float val);
+float fast_acos(const float val);
+float fast_atan(const float val);
+
+void fast_BSL(float &x, register unsigned long shiftAmount);
+void fast_BSR(float &x, register unsigned long shiftAmount);
+
+
+inline float fast_log2 (float val)
+{
+    int * const  exp_ptr = reinterpret_cast <int *> (&val);
+    int          x = *exp_ptr;
+    const int    log_2 = ((x >> 23) & 255) - 128;
+    x &= ~(255 << 23);
+    x += 127 << 23;
+    *exp_ptr = x;
+
+    val = ((-1.0f/3) * val + 2) * val - 2.0f/3;   // (1)
+
+    return (val + log_2);
+}
+
+
+/**
+ * This function is about 3 times faster than the system log() function
+ * and has an error of about 0.01%
+ */
+inline float fast_log (const float &val)
+{
+   return (fast_log2 (val) * 0.69314718f);
+}
+
+inline float fast_log10 (const float &val)
+{
+   return (fast_log2(val) / 3.321928095f);
+}
+
+
+/**
+ * This function is about twice as fast as the system pow(x,y) function
+ */
+inline float fast_pow(const float val1, const float val2)
+{
+   return _fast_pow2(val2 * _fast_log2(val1));
+}
+
+
+/*
+ * Haven't seen this elsewhere, probably because it is too obvious?
+ * Anyway, these functions are intended for 32-bit floating point numbers
+ * only and should work a bit faster than the regular ones.
+ */
+inline float fast_abs(float f)
+{
+    int i=((*(int*)&f)&0x7fffffff);
+    return (*(float*)&i);
+}
+
+inline float fast_neg(float f)
+{
+    int i=((*(int*)&f)^0x80000000);
+    return (*(float*)&i);
+}
+
+inline int fast_sgn(float f)
+{
+    return 1+(((*(int*)&f)>>31)<<1);
+}
+
+#endif // !_SG_FMATH_HXX
+

simgear/math/interpolater.cxx

@@ -4,7 +4,7 @@
 //
 // Written by Curtis Olson, started April 1998.
 //
-// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 1998  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

simgear/math/interpolater.hxx

@@ -6,7 +6,7 @@
 
 // Written by Curtis Olson, started April 1998.
 //
-// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 1998  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

simgear/math/leastsqs.cxx

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started September 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/math/leastsqs.hxx

@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started September 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/math/localconsts.hxx

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started September 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

simgear/math/point3d.hxx

@@ -8,7 +8,7 @@
  * Adapted from algebra3 by Jean-Francois Doue, started October 1998.
  */
 
-// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 1998  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

simgear/math/polar3d.cxx

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started June 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/math/polar3d.hxx

@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started June 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/math/sg_geodesy.cxx

@@ -1,167 +1,212 @@
-// sg_geodesy.cxx -- routines to convert between geodetic and geocentric 
-//                   coordinate systems.
-//
-// Copied and adapted directly from LaRCsim/ls_geodesy.c
-//
-// See below for the complete original LaRCsim comments.
-//
-// $Id$
-
-#include <simgear/compiler.h>
-
-#ifdef SG_HAVE_STD_INCLUDES
-# include <cmath>
-# include <cerrno>
-# include <cstdio>
-#else
-# include <math.h>
-# include <errno.h>
-# include <stdio.h>
-#endif
-
 #include <simgear/constants.h>
-#include <simgear/debug/logstream.hxx>
-
-#include "point3d.hxx"
 #include "sg_geodesy.hxx"
-#include "localconsts.hxx"
 
-
-SG_USING_STD(cout);
-
-
-// #define DOMAIN_ERR_DEBUG 1
-
-
-// sgGeocToGeod(lat_geoc, radius, *lat_geod, *alt, *sea_level_r)
-//     INPUTS:	
-//         lat_geoc	Geocentric latitude, radians, + = North
-//         radius	C.G. radius to earth center (meters)
+// Notes:
 //
-//     OUTPUTS:
-//         lat_geod	Geodetic latitude, radians, + = North
-//         alt		C.G. altitude above mean sea level (meters)
-//         sea_level_r	radius from earth center to sea level at
-//                      local vertical (surface normal) of C.G. (meters)
+// The XYZ/cartesian coordinate system in use puts the X axis through
+// zero lat/lon (off west Africa), the Z axis through the north pole,
+// and the Y axis through 90 degrees longitude (in the Indian Ocean).
+//
+// All latitude and longitude values are in radians.  Altitude is in
+// meters, with zero on the WGS84 ellipsoid.
+//
+// The code below makes use of the notion of "squashed" space.  This
+// is a 2D cylindrical coordinate system where the radius from the Z
+// axis is multiplied by SQUASH; the earth in this space is a perfect
+// circle with a radius of POLRAD.
+//
+// Performance: with full optimization, a transformation from
+// lat/lon/alt to XYZ and back takes 5263 CPU cycles on my 2.2GHz
+// Pentium 4.  About 83% of this is spent in the iterative sgCartToGeod()
+// algorithm.
 
+// These are hard numbers from the WGS84 standard.  DON'T MODIFY
+// unless you want to change the datum.
+static const double EQURAD = 6378137;
+static const double iFLATTENING = 298.257223563;
 
-void sgGeocToGeod( const double& lat_geoc, const double& radius,
-                   double *lat_geod, double *alt, double *sea_level_r )
+// These are derived quantities more useful to the code:
+#if 0
+static const double SQUASH = 1 - 1/iFLATTENING;
+static const double STRETCH = 1/SQUASH;
+static const double POLRAD = EQURAD * SQUASH;
+#else
+// High-precision versions of the above produced with an arbitrary
+// precision calculator (the compiler might lose a few bits in the FPU
+// operations).  These are specified to 81 bits of mantissa, which is
+// higher than any FPU known to me:
+static const double SQUASH  = 0.9966471893352525192801545;
+static const double STRETCH = 1.0033640898209764189003079;
+static const double POLRAD  = 6356752.3142451794975639668;
+#endif
+
+// Returns a "local" geodetic latitude: an approximation that will be
+// correct only at zero altitude.
+static double localLat(double r, double z)
 {
-#ifdef DOMAIN_ERR_DEBUG
-    errno = 0;			// start with error zero'd
-#endif
-
-    double t_lat, x_alpha, mu_alpha, delt_mu, r_alpha, l_point, rho_alpha;
-    double sin_mu_a, denom,delt_lambda, lambda_sl, sin_lambda_sl;
-
-    if( ( (SGD_PI_2 - lat_geoc) < SG_ONE_SECOND )        // near North pole
-	|| ( (SGD_PI_2 + lat_geoc) < SG_ONE_SECOND ) )   // near South pole
-    {
-	*lat_geod = lat_geoc;
-	*sea_level_r = SG_EQUATORIAL_RADIUS_M*E;
-	*alt = radius - *sea_level_r;
-    } else {
-	// cout << "  lat_geoc = " << lat_geoc << endl;
-	t_lat = tan(lat_geoc);
-	// cout << "  tan(t_lat) = " << t_lat << endl;
-	x_alpha = E*SG_EQUATORIAL_RADIUS_M/sqrt(t_lat*t_lat + E*E);
-#ifdef DOMAIN_ERR_DEBUG
-	if ( errno ) {
-	    perror("fgGeocToGeod()");
-	    SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" << t_lat*t_lat + E*E << ")" );
-	}
-#endif
-	// cout << "  x_alpha = " << x_alpha << endl;
-	double tmp = sqrt(SG_EQ_RAD_SQUARE_M - x_alpha * x_alpha);
-	if ( tmp < 0.0 ) { tmp = 0.0; }
-#ifdef DOMAIN_ERR_DEBUG
-	if ( errno ) {
-	    perror("fgGeocToGeod()");
-	    SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" << SG_EQ_RAD_SQUARE_M - x_alpha * x_alpha
-		    << ")" );
-	}
-#endif
-	mu_alpha = atan2(tmp,E*x_alpha);
-	if (lat_geoc < 0) mu_alpha = - mu_alpha;
-	sin_mu_a = sin(mu_alpha);
-	delt_lambda = mu_alpha - lat_geoc;
-	r_alpha = x_alpha/cos(lat_geoc);
-	l_point = radius - r_alpha;
-	*alt = l_point*cos(delt_lambda);
-
-	denom = sqrt(1-EPS*EPS*sin_mu_a*sin_mu_a);
-#ifdef DOMAIN_ERR_DEBUG
-	if ( errno ) {
-	    perror("fgGeocToGeod()");
-	    SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
-		    1-EPS*EPS*sin_mu_a*sin_mu_a << ")" );
-	}
-#endif
-	rho_alpha = SG_EQUATORIAL_RADIUS_M*(1-EPS)/
-	    (denom*denom*denom);
-	delt_mu = atan2(l_point*sin(delt_lambda),rho_alpha + *alt);
-	*lat_geod = mu_alpha - delt_mu;
-	lambda_sl = atan( E*E * tan(*lat_geod) ); // SL geoc. latitude
-	sin_lambda_sl = sin( lambda_sl );
-	*sea_level_r = 
-	    sqrt(SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
-#ifdef DOMAIN_ERR_DEBUG
-	if ( errno ) {
-	    perror("fgGeocToGeod()");
-	    SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
-		    SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
-		    << ")" );
-	}
-#endif
-
-    }
-
+    // Squash to a spherical earth, compute a tangent vector to the
+    // surface circle (in squashed space, the surface is a perfect
+    // sphere) by swapping the components and negating one, stretch to
+    // real coordinates, and take an inverse-tangent/perpedicular
+    // vector to get a local geodetic "up" vector.  (Those steps all
+    // cook down to just a few multiplies).  Then just turn it into an
+    // angle.
+    double upr = r * SQUASH;
+    double upz = z * STRETCH;
+    return atan2(upz, upr);
 }
 
-
-// sgGeodToGeoc( lat_geod, alt, *sl_radius, *lat_geoc )
-//     INPUTS:	
-//         lat_geod	Geodetic latitude, radians, + = North
-//         alt		C.G. altitude above mean sea level (meters)
-//
-//     OUTPUTS:
-//         sl_radius	SEA LEVEL radius to earth center (meters)
-//                      (add Altitude to get true distance from earth center.
-//         lat_geoc	Geocentric latitude, radians, + = North
-//
-
-
-void sgGeodToGeoc( const double& lat_geod, const double& alt, double *sl_radius,
-		      double *lat_geoc )
+// This is the inverse of the algorithm in localLat().  It returns the
+// (cylindrical) coordinates of a surface latitude expressed as an
+// "up" unit vector.
+static void surfRZ(double upr, double upz, double* r, double* z)
 {
-    double lambda_sl, sin_lambda_sl, cos_lambda_sl, sin_mu, cos_mu, px, py;
-    
-#ifdef DOMAIN_ERR_DEBUG
-    errno = 0;
-#endif
+    // We are
+    // converting a (2D, cylindrical) "up" vector defined by the
+    // geodetic latitude into unitless R and Z coordinates in
+    // cartesian space.
+    double R = upr * STRETCH;
+    double Z = upz * SQUASH;
 
-    lambda_sl = atan( E*E * tan(lat_geod) ); // sea level geocentric latitude
-    sin_lambda_sl = sin( lambda_sl );
-    cos_lambda_sl = cos( lambda_sl );
-    sin_mu = sin(lat_geod);                  // Geodetic (map makers') latitude
-    cos_mu = cos(lat_geod);
-    *sl_radius = 
-	sqrt(SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl));
-#ifdef DOMAIN_ERR_DEBUG
-	if ( errno ) {
-	    perror("fgGeodToGeoc()");
-	    SG_LOG( SG_GENERAL, SG_ALERT, "sqrt(" <<
-		    SG_EQ_RAD_SQUARE_M / (1 + ((1/(E*E))-1)*sin_lambda_sl*sin_lambda_sl)
-		    << ")" );
-	}
-#endif
-    py = *sl_radius*sin_lambda_sl + alt*sin_mu;
-    px = *sl_radius*cos_lambda_sl + alt*cos_mu;
-    *lat_geoc = atan2( py, px );
+    // Now we need to turn R and Z into a surface point.  That is,
+    // pick a coefficient C for them such that the point is on the
+    // surface when converted to "squashed" space:
+    //  (C*R*SQUASH)^2 + (C*Z)^2 = POLRAD^2
+    //   C^2 = POLRAD^2 / ((R*SQUASH)^2 + Z^2)
+    double sr = R * SQUASH;
+    double c = POLRAD / sqrt(sr*sr + Z*Z);
+    R *= c;
+    Z *= c;
+
+    *r = R; *z = Z;
 }
 
+// Returns the insersection of the line joining the center of the
+// earth and the specified cylindrical point with the surface of the
+// WGS84 ellipsoid.  Works by finding a normalization constant (in
+// squashed space) that places the squashed point on the surface of
+// the sphere.
+static double seaLevelRadius(double r, double z)
+{
+    double sr = r * SQUASH;
+    double norm = POLRAD/sqrt(sr*sr + z*z);
+    r *= norm;
+    z *= norm;
+    return sqrt(r*r + z*z);
+}
 
+// Convert a cartexian XYZ coordinate to a geodetic lat/lon/alt.  This
+// is a "recursion relation".  In essence, it iterates over the 2D
+// part of sgGeodToCart refining its approximation at each step.  The
+// MAX_LAT_ERROR threshold is picked carefully to allow us to reach
+// the full precision of an IEEE double.  While this algorithm might
+// look slow, it's not.  It actually converges very fast indeed --
+// I've never seen it take more than six iterations under normal
+// conditions.  Three or four is more typical. (It gets slower as the
+// altitude/error gets larger; at 50000m altitude, it starts to need
+// seven loops.)  One caveat is that at *very* large altitudes, it
+// starts making very poor guesses as to latitude.  As altitude
+// approaches infinity, it should be guessing with geocentric
+// coordinates, not "local geodetic up" ones.
+void sgCartToGeod(const double* xyz, double* lat, double* lon, double* alt)
+{
+    // The error is expressed as a radian angle, and we want accuracy
+    // to 1 part in 2^50 (an IEEE double has between 51 and 52
+    // significant bits of magnitude due to the "hidden" digit; leave
+    // at least one bit free for potential slop).  In real units, this
+    // works out to about 6 nanometers.
+    static const double MAX_LAT_ERROR = 8.881784197001252e-16;
+    double x = xyz[0], y = xyz[1], z = xyz[2];
+
+    // Longitude is trivial.  Convert to cylindrical "(r, z)"
+    // coordinates while we're at it.
+    *lon = atan2(y, x);
+    double r = sqrt(x*x + y*y);
+
+    double lat1, lat2 = localLat(r, z);
+    double r2, z2, dot;
+    do {
+        lat1 = lat2;
+
+        // Compute an "up" vector
+        double upr = cos(lat1);
+        double upz = sin(lat1);
+
+        // Find the surface point with that latitude
+        surfRZ(upr, upz, &r2, &z2);
+
+        // Convert r2z2 to the vector pointing from the surface to rz
+        r2 = r - r2;
+        z2 = z - z2;
+
+        // Dot it with "up" to get an approximate altitude
+        dot = r2*upr + z2*upz;
+
+        // And compute an approximate geodetic surface coordinate
+        // using that altitude, so now: R2Z2 = RZ - ((RZ - SURF) dot
+        // UP)
+        r2 = r - dot * upr;
+        z2 = z - dot * upz;
+
+        // Find the latitude of *that* point, and iterate
+        lat2 = localLat(r2, z2);
+    } while(fabs(lat2 - lat1) > MAX_LAT_ERROR);
+
+    // All done!  We have an accurate geodetic lattitude, now
+    // calculate the altitude as a cartesian distance between the
+    // final geodetic surface point and the initial r/z coordinate.
+    *lat = lat1;
+    double dr = r - r2;
+    double dz = z - z2;
+    double altsign = (dot > 0) ? 1 : -1;
+    *alt = altsign * sqrt(dr*dr + dz*dz);
+}
+
+void sgGeodToCart(double lat, double lon, double alt, double* xyz)
+{
+    // This is the inverse of the algorithm in localLat().  We are
+    // converting a (2D, cylindrical) "up" vector defined by the
+    // geodetic latitude into unitless R and Z coordinates in
+    // cartesian space.
+    double upr = cos(lat);
+    double upz = sin(lat);
+    double r, z;
+    surfRZ(upr, upz, &r, &z);
+
+    // Add the altitude using the "up" unit vector we calculated
+    // initially.
+    r += upr * alt;
+    z += upz * alt;
+
+    // Finally, convert from cylindrical to cartesian
+    xyz[0] = r * cos(lon);
+    xyz[1] = r * sin(lon);
+    xyz[2] = z;
+}
+
+void sgGeocToGeod(double lat_geoc, double radius,
+                  double *lat_geod, double *alt, double *sea_level_r)
+{
+    // Build a fake cartesian point, and run it through CartToGeod
+    double lon_dummy, xyz[3];
+    xyz[0] = cos(lat_geoc) * radius;
+    xyz[1] = 0;
+    xyz[2] = sin(lat_geoc) * radius;
+    sgCartToGeod(xyz, lat_geod, &lon_dummy, alt);
+    *sea_level_r = seaLevelRadius(xyz[0], xyz[2]);
+}
+
+void sgGeodToGeoc(double lat_geod, double alt,
+                  double *sl_radius, double *lat_geoc)
+{
+    double xyz[3];
+    sgGeodToCart(lat_geod, 0, alt, xyz);
+    *lat_geoc = atan2(xyz[2], xyz[0]);
+    *sl_radius = seaLevelRadius(xyz[0], xyz[2]);
+}
+
+////////////////////////////////////////////////////////////////////////
+//
 // Direct and inverse distance functions 
 //
 // Proceedings of the 7th International Symposium on Geodetic
@@ -175,13 +220,11 @@ void sgGeodToGeoc( const double& lat_geod, const double& alt, double *sl_radius,
 //
 // modified for FlightGear to use WGS84 only -- Norman Vine
 
-#define GEOD_INV_PI SGD_PI
+static const double GEOD_INV_PI = SGD_PI;
 
 // s == distance
 // az = azimuth
 
-// for WGS_84 a = 6378137.000, rf = 298.257223563;
-
 static inline double M0( double e2 ) {
     //double e4 = e2*e2;
     return GEOD_INV_PI*(1.0 - e2*( 1.0/4.0 + e2*( 3.0/64.0 + 
@@ -191,12 +234,12 @@ static inline double M0( double e2 ) {
 
 // given, alt, lat1, lon1, az1 and distance (s), calculate lat2, lon2
 // and az2.  Lat, lon, and azimuth are in degrees.  distance in meters
-int geo_direct_wgs_84 ( const double& alt, const double& lat1,
-                        const double& lon1, const double& az1,
-                        const double& s, double *lat2, double *lon2,
+int geo_direct_wgs_84 ( double alt, double lat1,
+                        double lon1, double az1,
+                        double s, double *lat2, double *lon2,
                         double *az2 )
 {
-    double a = 6378137.000, rf = 298.257223563;
+    double a = EQURAD, rf = iFLATTENING;
     double RADDEG = (GEOD_INV_PI)/180.0, testv = 1.0E-10;
     double f = ( rf > 0.0 ? 1.0/rf : 0.0 );
     double b = a*(1.0-f);
@@ -284,12 +327,12 @@ int geo_direct_wgs_84 ( const double& alt, const double& lat1,
 // given alt, lat1, lon1, lat2, lon2, calculate starting and ending
 // az1, az2 and distance (s).  Lat, lon, and azimuth are in degrees.
 // distance in meters
-int geo_inverse_wgs_84( const double& alt, const double& lat1,
-                        const double& lon1, const double& lat2,
-			const double& lon2, double *az1, double *az2,
+int geo_inverse_wgs_84( double alt, double lat1,
+                        double lon1, double lat2,
+			double lon2, double *az1, double *az2,
                         double *s )
 {
-    double a = 6378137.000, rf = 298.257223563;
+    double a = EQURAD, rf = iFLATTENING;
     int iter=0;
     double RADDEG = (GEOD_INV_PI)/180.0, testv = 1.0E-10;
     double f = ( rf > 0.0 ? 1.0/rf : 0.0 );
@@ -399,92 +442,3 @@ int geo_inverse_wgs_84( const double& alt, const double& lat1,
 	return 0;
     }
 }
-
-
-/***************************************************************************
-
-	TITLE:	ls_geodesy
-	
-----------------------------------------------------------------------------
-
-	FUNCTION:	Converts geocentric coordinates to geodetic positions
-
-----------------------------------------------------------------------------
-
-	MODULE STATUS:	developmental
-
-----------------------------------------------------------------------------
-
-	GENEALOGY:	Written as part of LaRCSim project by E. B. Jackson
-
-----------------------------------------------------------------------------
-
-	DESIGNED BY:	E. B. Jackson
-	
-	CODED BY:	E. B. Jackson
-	
-	MAINTAINED BY:	E. B. Jackson
-
-----------------------------------------------------------------------------
-
-	MODIFICATION HISTORY:
-	
-	DATE	PURPOSE						BY
-	
-	930208	Modified to avoid singularity near polar region.	EBJ
-	930602	Moved backwards calcs here from ls_step.		EBJ
-	931214	Changed erroneous Latitude and Altitude variables to 
-		*lat_geod and *alt in routine ls_geoc_to_geod.		EBJ
-	940111	Changed header files from old ls_eom.h style to ls_types, 
-		and ls_constants.  Also replaced old DATA type with new
-		SCALAR type.						EBJ
-
-	CURRENT RCS HEADER:
-
-$Header$
- * Revision 1.5  1994/01/11  18:47:05  bjax
- * Changed include files to use types and constants, not ls_eom.h
- * Also changed DATA type to SCALAR type.
- *
- * Revision 1.4  1993/12/14  21:06:47  bjax
- * Removed global variable references Altitude and Latitude.   EBJ
- *
- * Revision 1.3  1993/06/02  15:03:40  bjax
- * Made new subroutine for calculating geodetic to geocentric; changed name
- * of forward conversion routine from ls_geodesy to ls_geoc_to_geod.
- *
-
-----------------------------------------------------------------------------
-
-	REFERENCES:
-
-		[ 1]	Stevens, Brian L.; and Lewis, Frank L.: "Aircraft 
-			Control and Simulation", Wiley and Sons, 1992.
-			ISBN 0-471-61397-5		      
-
-
-----------------------------------------------------------------------------
-
-	CALLED BY:	ls_aux
-
-----------------------------------------------------------------------------
-
-	CALLS TO:
-
-----------------------------------------------------------------------------
-
-	INPUTS:	
-		lat_geoc	Geocentric latitude, radians, + = North
-		radius		C.G. radius to earth center, ft
-
-----------------------------------------------------------------------------
-
-	OUTPUTS:
-		lat_geod	Geodetic latitude, radians, + = North
-		alt		C.G. altitude above mean sea level, ft
-		sea_level_r	radius from earth center to sea level at
-				local vertical (surface normal) of C.G.
-
---------------------------------------------------------------------------*/
-
-

simgear/math/sg_geodesy.hxx

@@ -1,26 +1,7 @@
-/**
- * \file sg_geodesy.hxx
- * Routines to convert between geodetic and geocentric coordinate systems.
- * Copied and adapted directly from LaRCsim/ls_geodesy.c
- */
-
-// See below for the complete original LaRCsim comments.
-//
-// $Id$
-
-
 #ifndef _SG_GEODESY_HXX
 #define _SG_GEODESY_HXX
 
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
 #include <simgear/math/point3d.hxx>
-#include <simgear/math/polar3d.hxx>
-
 
 /** 
  * Convert from geocentric coordinates to geodetic coordinates
@@ -31,45 +12,78 @@
  * @param sea_level_r (out) radius from earth center to sea level at
  *        local vertical (surface normal) of C.G. (meters)
  */
-void sgGeocToGeod( const double& lat_geoc, const double& radius,
-                   double *lat_geod, double *alt, double *sea_level_r );
+void sgGeocToGeod(double lat_geoc, double radius,
+                  double *lat_geod, double *alt, double *sea_level_r);
 
 
 /**
- * Convert from geodetic coordinates to geocentric coordinates
+ * Convert from geodetic coordinates to geocentric coordinates.
+ * WARNING: this function is non-reversible.  Due to the fact that
+ * "up" is a different direction for geocentric and geodetic frames,
+ * you can not simply add your "alt" parameter to the "sl_radius"
+ * result and get back (via sgGeodToGeoc()) to the coordinates you
+ * started with.  The error under normal conditions will be of
+ * centimeter order; whether that is important or not is application
+ * dependent. Consider using sgGeodToCart() instead.
+ *
  * @param lat_geod (in) Geodetic latitude, radians, + = North
  * @param alt (in) C.G. altitude above mean sea level (meters)
  * @param sl_radius (out) SEA LEVEL radius to earth center (meters)
- *        (add Altitude to get true distance from earth center.
  * @param lat_geoc (out) Geocentric latitude, radians, + = North
  */
-void sgGeodToGeoc( const double& lat_geod, const double& alt,
-                   double *sl_radius, double *lat_geoc );
+void sgGeodToGeoc(double lat_geod, double alt,
+                  double *sl_radius, double *lat_geoc );
+
+/**
+ * Convert a cartesian point to a geodetic lat/lon/altitude.
+ *
+ * @param xyz (in) Pointer to cartesian point.
+ * @param lat (out) Latitude, in radians
+ * @param lon (out) Longitude, in radians
+ * @param alt (out) Altitude, in meters above the WGS84 ellipsoid
+ */
+void sgCartToGeod(const double* xyz, double* lat, double* lon, double* alt);
+
+/**
+ * Convert a cartesian point to a geodetic lat/lon/altitude.
+ * Alternate form using Point3D objects.
+ *
+ * @param cartesian point
+ * @return geodetic point
+ */
+inline Point3D sgCartToGeod(const Point3D& p)
+{
+    double lat, lon, alt, xyz[3];
+    xyz[0] = p.x(); xyz[1] = p.y(); xyz[2] = p.z(); 
+    sgCartToGeod(xyz, &lat, &lon, &alt);
+    return Point3D(lon, lat, alt);
+}
 
 
 /**
- * Convert a geodetic point lon(radians), lat(radians), elev(meter) to
- * a cartesian point.
+ * Convert a geodetic lat/lon/altitude to a cartesian point.
+ *
+ * @param lat (in) Latitude, in radians
+ * @param lon (in) Longitude, in radians
+ * @param alt (in) Altitude, in meters above the WGS84 ellipsoid
+ * @param xyz (out) Pointer to cartesian point.
+ */
+void sgGeodToCart(double lat, double lon, double alt, double* xyz);
+
+/**
+ * Convert a geodetic lat/lon/altitude to a cartesian point.
+ * Alternate form using Point3D objects.
+ *
  * @param geodetic point
  * @return cartesian point
  */
-inline Point3D sgGeodToCart(const Point3D& geod) {
-    double gc_lon, gc_lat, sl_radius;
-
-    // printf("A geodetic point is (%.2f, %.2f, %.2f)\n", 
-    //        geod[0], geod[1], geod[2]);
-
-    gc_lon = geod.lon();
-    sgGeodToGeoc(geod.lat(), geod.radius(), &sl_radius, &gc_lat);
-
-    // printf("A geocentric point is (%.2f, %.2f, %.2f)\n", gc_lon, 
-    //        gc_lat, sl_radius+geod[2]);
-
-    Point3D pp = Point3D( gc_lon, gc_lat, sl_radius + geod.radius());
-    return sgPolarToCart3d(pp);
+inline Point3D sgGeodToCart(const Point3D& geod)
+{
+    double xyz[3];
+    sgGeodToCart(geod.lat(), geod.lon(), geod.elev(), xyz);
+    return Point3D(xyz[0], xyz[1], xyz[2]);
 }
 
-
 /**
  * Given a starting position and an offset radial and distance,
  * calculate an ending positon on a wgs84 ellipsoid.
@@ -82,9 +96,9 @@ inline Point3D sgGeodToCart(const Point3D& geod) {
  * @param lon2 (out) degrees
  * @param az2 (out) return course in degrees
  */
-int geo_direct_wgs_84 ( const double& alt, const double& lat1,
-                        const double& lon1, const double& az1, 
-			const double& s, double *lat2, double *lon2,
+int geo_direct_wgs_84 ( double alt, double lat1,
+                        double lon1, double az1, 
+			double s, double *lat2, double *lon2,
                         double *az2 );
 
 
@@ -100,98 +114,9 @@ int geo_direct_wgs_84 ( const double& alt, const double& lat1,
  * @param az2 (out) end heading degrees
  * @param s (out) distance meters
  */
-int geo_inverse_wgs_84( const double& alt, const double& lat1,
-                        const double& lon1, const double& lat2,
-			const double& lon2, double *az1, double *az2,
+int geo_inverse_wgs_84( double alt, double lat1,
+                        double lon1, double lat2,
+			double lon2, double *az1, double *az2,
                         double *s );
 
-
-/***************************************************************************
-
-	TITLE:	ls_geodesy
-	
-----------------------------------------------------------------------------
-
-	FUNCTION:	Converts geocentric coordinates to geodetic positions
-
-----------------------------------------------------------------------------
-
-	MODULE STATUS:	developmental
-
-----------------------------------------------------------------------------
-
-	GENEALOGY:	Written as part of LaRCSim project by E. B. Jackson
-
-----------------------------------------------------------------------------
-
-	DESIGNED BY:	E. B. Jackson
-	
-	CODED BY:	E. B. Jackson
-	
-	MAINTAINED BY:	E. B. Jackson
-
-----------------------------------------------------------------------------
-
-	MODIFICATION HISTORY:
-	
-	DATE	PURPOSE						BY
-	
-	930208	Modified to avoid singularity near polar region.	EBJ
-	930602	Moved backwards calcs here from ls_step.		EBJ
-	931214	Changed erroneous Latitude and Altitude variables to 
-		*lat_geod and *alt in routine ls_geoc_to_geod.		EBJ
-	940111	Changed header files from old ls_eom.h style to ls_types, 
-		and ls_constants.  Also replaced old DATA type with new
-		SCALAR type.						EBJ
-
-	CURRENT RCS HEADER:
-
-$Header$
-
- * Revision 1.5  1994/01/11  18:47:05  bjax
- * Changed include files to use types and constants, not ls_eom.h
- * Also changed DATA type to SCALAR type.
- *
- * Revision 1.4  1993/12/14  21:06:47  bjax
- * Removed global variable references Altitude and Latitude.   EBJ
- *
- * Revision 1.3  1993/06/02  15:03:40  bjax
- * Made new subroutine for calculating geodetic to geocentric; changed name
- * of forward conversion routine from ls_geodesy to ls_geoc_to_geod.
- *
-
-----------------------------------------------------------------------------
-
-	REFERENCES:
-
-		[ 1]	Stevens, Brian L.; and Lewis, Frank L.: "Aircraft 
-			Control and Simulation", Wiley and Sons, 1992.
-			ISBN 0-471-61397-5		      
-
-
-----------------------------------------------------------------------------
-
-	CALLED BY:	ls_aux
-
-----------------------------------------------------------------------------
-
-	CALLS TO:
-
-----------------------------------------------------------------------------
-
-	INPUTS:	
-		lat_geoc	Geocentric latitude, radians, + = North
-		radius		C.G. radius to earth center, ft
-
-----------------------------------------------------------------------------
-
-	OUTPUTS:
-		lat_geod	Geodetic latitude, radians, + = North
-		alt		C.G. altitude above mean sea level, ft
-		sea_level_r	radius from earth center to sea level at
-				local vertical (surface normal) of C.G.
-
---------------------------------------------------------------------------*/
-
-
 #endif // _SG_GEODESY_HXX

simgear/math/sg_random.c

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started July 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/math/sg_random.h

@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started July 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/math/sg_types.hxx

@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started March 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

simgear/math/vector.cxx

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started December 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/math/vector.hxx

@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started December 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  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

simgear/metar/Antoi.cpp

@@ -1,72 +0,0 @@
-#include <stdlib.h>
- 
-/********************************************************************/
-/*                                                                  */
-/*  Title:         antoi                                            */
-/*  Date:          Jan 28, 1991                                     */
-/*  Organization:  W/OSO242 - Graphics and Display Section          */
-/*  Programmer:    Allan Darling                                    */
-/*  Language:      C/370                                            */
-/*                                                                  */
-/*  Abstract:      This function will convert a character array     */
-/*                 (string) of length (len) into an integer.        */
-/*                 The integer is created via a call to the         */
-/*                 function atoi.  This function extends the        */
-/*                 functionality of atoi by removing the            */
-/*                 requirement for a sentinal delimited string      */
-/*                 as input.                                        */
-/*                                                                  */
-/*  Input: - Pointer to an array of characters.                     */
-/*         - Integer indicating the number of character to include  */
-/*           in the conversion.                                     */
-/*                                                                  */
-/*  Output:- An integer corresponding to the value in the character */
-/*           array or INT32_MIN (-2147483647-1) if the function is  */
-/*           unable to acquire system storage.                      */
-/*                                                                  */
-/*  Modification History:                                           */
-/*                 None                                             */
-/*                                                                  */
-/********************************************************************/
-
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#endif
-
-#ifndef INT32_MIN
-#  define INT32_MIN (-2147483647-1)
-#endif
-
-int antoi(char * string, int len)
-{
- 
-    /*******************/
-    /* local variables */
-    /*******************/
- 
-    char * tmpstr;
-    int i,
-        retval;
- 
- 
-    /*****************/
-    /* function body */
-    /*****************/
- 
-    tmpstr = (char *)malloc((len+1) * sizeof(char));
- 
-    if (tmpstr == NULL) return INT32_MIN;
- 
-    for (i = 0; i < len; i++)
-       tmpstr[i] = string[i];
- 
-    tmpstr[len] = '\0';
- 
-    retval = atoi(tmpstr);
- 
-    free(tmpstr);
- 
-    return(retval);
- 
-} /* end antoi */
- 

simgear/metar/Charcmp.cpp

@@ -1,163 +0,0 @@
-#include "Local.h"     /* standard header file */
- 
-/********************************************************************/
-/*                                                                  */
-/*  Title:         charcmp                                          */
-/*  Organization:  W/OSO242 - GRAPHICS AND DISPLAY SECTION          */
-/*  Date:          12 Dec 1995                                      */
-/*  Programmer:    CINDY L. CHONG                                   */
-/*  Language:      C/370                                            */
-/*                                                                  */
-/*  Abstract:      This function will compare each character in the */
-/*                 string match with each character in the pattern  */
-/*                 which is made up of characters.   The str can    */
-/*                 be longer than the pattern.                      */
-/*                                                                  */
-/*  External Functions Called:                                      */
-/*                 None.                                            */
-/*                                                                  */
-/*  Input:         str is a pointer to char                         */
-/*                 pattern is a pointer to char                     */
-/*                                                                  */
-/*  Output:        Return true if str matches pattern,              */
-/*                 otherwise, return false                          */
-/*                                                                  */
-/*  Modification History:                                           */
-/*                 None.                                            */
-/*                                                                  */
-/********************************************************************/
- 
-bool charcmp(char *str, char *pattern)
-{
- 
- 
-   /**********************************************************/
-   /* Loop while str and pattern is not equal to null, then  */
-   /* inscreases str and pattern by one                      */
-   /**********************************************************/
- 
-   for (; *pattern != '\0'; pattern++)
-   {
-      if (*str == '\0')
-         return FALSE;
- 
-      /************************************************************/
-      /* If pattern match str, then increase str and jump out the */
-      /* case and read next char of the str and pattern           */
-      /************************************************************/
- 
-      if ( isspace(*pattern) )
-         pattern = nxtalpha(pattern);
- 
-      switch( *pattern )
-      {
-         case 'c':
-            if ( !isalnum(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 'a':
-            if ( !isalpha(*str) )
-            {
-               return FALSE;
-            }
-            str++;
-            break;
- 
-         case 'n':
-            if ( !iscntrl(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 'd':
-            if ( !isdigit(*str) )
-            {
-               return FALSE;
-            }
-            str++;
-            break;
- 
-         case 'g':
-            if ( !isgraph(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 'i':
-            if ( !islower(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 'p':
-            if ( !isprint(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 't':
-            if ( !ispunct(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 'w':
-            if ( !isspace(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 'u':
-            if ( !isupper(*str++) )
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 's':
-            if (*str++ != ' ')
-            {
-               return FALSE;
-            }
-            break;
- 
-         case 'm':
-            if ( !isspace(*str) )
-            {
-               return FALSE;
-            }
-            else
-            {
-               while ( isspace(*str) )
-                  str++;
-            }
-            break;
- 
-         case '\'':
-            pattern++;
-            if (*pattern != *str)
-            {
-               return FALSE;
-            }
-            pattern++;
-            str++;
-            break;
- 
-         default:
-            return FALSE;
- 
-      } /* end switch */
- 
-   } /* end for */
- 
-   return (TRUE);
-}