A bit of fg->sg namespace changing.

diff --git a/src/Autopilot/auto_gui.cxx b/src/Autopilot/auto_gui.cxx
index 51ae12e753a866be7c1c18b276db259424b9c4f2..56943208a6439b671c9b449057cdf0ada3fa904c 100644 (file)
--- a/src/Autopilot/auto_gui.cxx
+++ b/src/Autopilot/auto_gui.cxx
@@ -33,7 +33,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/fgpath.hxx>
 
 #include <Airports/simple.hxx>

diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx
index e43ae568acab010db6c6eae3fa0794566885da55..6a99e05707ac08a6c0cef6989b071f722ddbe494 100644 (file)
--- a/src/Autopilot/newauto.cxx
+++ b/src/Autopilot/newauto.cxx
@@ -31,7 +31,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include <Cockpit/radiostack.hxx>
 #include <Controls/controls.hxx>

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 46931cf66146ce8fa8437828ec10afc1fcd582a7..c4f04923472cbfa855fd08e8a657818cf9424b08 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -72,7 +72,7 @@ FGRadioStack::~FGRadioStack() {
 void FGRadioStack::update( double lon, double lat, double elev ) {
     need_update = false;
 
-    Point3D aircraft = fgGeodToCart( Point3D( lon, lat, elev ) );
+    Point3D aircraft = sgGeodToCart( Point3D( lon, lat, elev ) );
     Point3D station;
     double az1, az2, s;
 

diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index 44afb4f4e121c4c72df5d431ec1472a7d11df0cd..6a89a73c21b6803e4b2a24a49621712dcbf9218d 100644 (file)
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -47,7 +47,7 @@ HISTORY
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/fgpath.hxx>
 
 #include <Aircraft/aircraft.hxx>
@@ -181,9 +181,9 @@ int FGBalloonSim::copy_from_BalloonSim() {
     double alt     = temp[2] * METER_TO_FEET;
 
     double lat_geod, tmp_alt, sl_radius1, sl_radius2, tmp_lat_geoc;
-    fgGeocToGeod( lat_geoc, EQUATORIAL_RADIUS_M + alt * FEET_TO_METER,
+    sgGeocToGeod( lat_geoc, EQUATORIAL_RADIUS_M + alt * FEET_TO_METER,
                  &lat_geod, &tmp_alt, &sl_radius1 );
-    fgGeodToGeoc( lat_geod, alt * FEET_TO_METER, &sl_radius2, &tmp_lat_geoc );
+    sgGeodToGeoc( lat_geod, alt * FEET_TO_METER, &sl_radius2, &tmp_lat_geoc );
 
     FG_LOG( FG_FLIGHT, FG_DEBUG, "lon = " << lon << " lat_geod = " << lat_geod
            << " lat_geoc = " << lat_geoc

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 5f3a77b2fbd7907b2ff4f51157eaef0b9c07b58e..1f112907d9a6cac133fc75e999c5e808208d3c45 100644 (file)
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -31,7 +31,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/fgpath.hxx>
 
 #include <Scenery/scenery.hxx>
@@ -326,9 +326,9 @@ int FGJSBsim::copy_from_JSBsim() {
   double alt = FDMExec.GetPosition()->Geth();
   double lat_geod, tmp_alt, sl_radius1, sl_radius2, tmp_lat_geoc;
 
-  fgGeocToGeod( lat_geoc, EQUATORIAL_RADIUS_M + alt * FEET_TO_METER,
+  sgGeocToGeod( lat_geoc, EQUATORIAL_RADIUS_M + alt * FEET_TO_METER,
                 &lat_geod, &tmp_alt, &sl_radius1 );
-  fgGeodToGeoc( lat_geod, alt * FEET_TO_METER, &sl_radius2, &tmp_lat_geoc );
+  sgGeodToGeoc( lat_geod, alt * FEET_TO_METER, &sl_radius2, &tmp_lat_geoc );
 
   FG_LOG( FG_FLIGHT, FG_DEBUG, "lon = " << lon << " lat_geod = " << lat_geod
           << " lat_geoc = " << lat_geoc

diff --git a/src/FDM/MagicCarpet.cxx b/src/FDM/MagicCarpet.cxx
index 31a428aa2e42c8a38b313e87cd6b44a0f0018fe9..708046b4dd296b9b0291b28c6019713a04f4cb72 100644 (file)
--- a/src/FDM/MagicCarpet.cxx
+++ b/src/FDM/MagicCarpet.cxx
@@ -21,7 +21,7 @@
 // $Id$
 
 
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 
@@ -79,7 +79,7 @@ int FGMagicCarpet::update( int multiloop ) {
     //      << endl;
 
     double sl_radius, lat_geoc;
-    fgGeodToGeoc( get_Latitude(), get_Altitude(), &sl_radius, &lat_geoc );
+    sgGeodToGeoc( get_Latitude(), get_Altitude(), &sl_radius, &lat_geoc );
 
     // update altitude
     double real_climb_rate = -controls.get_elevator() * 5000; // feet/sec

diff --git a/src/FDM/flight.cxx b/src/FDM/flight.cxx
index e444ed383e260458dab1d0cf0e6ed7703163c97e..93a6c27eaa24d33c72ffe749a66dbc4eec39cead 100644 (file)
--- a/src/FDM/flight.cxx
+++ b/src/FDM/flight.cxx
@@ -25,7 +25,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include <FDM/LaRCsim/ls_interface.h>
 #include <Main/options.hxx>
@@ -127,7 +127,7 @@ void fgFDMForceAltitude(int model, double alt_meters) {
     double lat_geoc;
 
     // Set the FG variables first
-    fgGeodToGeoc( base_fdm_state.get_Latitude(), alt_meters, 
+    sgGeodToGeoc( base_fdm_state.get_Latitude(), alt_meters, 
                  &sea_level_radius_meters, &lat_geoc);
 
     base_fdm_state.set_Altitude( alt_meters * METER_TO_FEET );

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 4280059f23d702e38bb339cbdb0712e1022b31aa..42181b0a29994b0cce5b30738b420960ed523733 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -49,9 +49,9 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/fgpath.hxx>
 #include <simgear/timing/sg_time.hxx>
 
@@ -445,7 +445,7 @@ bool fgInitSubsystems( void ) {
 
     /*
     geod_pos = Point3D( cur_fdm_state->get_Longitude(), cur_fdm_state->get_Latitude(), 0.0);
-    tmp_abs_view_pos = fgGeodToCart(geod_pos);
+    tmp_abs_view_pos = sgGeodToCart(geod_pos);
 
     FG_LOG( FG_GENERAL, FG_DEBUG,
            "Initial abs_view_pos = " << tmp_abs_view_pos );
@@ -481,7 +481,7 @@ bool fgInitSubsystems( void ) {
     double sea_level_radius_meters;
     double lat_geoc;
     // Set the FG variables first
-    fgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(),
+    sgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(),
                  &sea_level_radius_meters, &lat_geoc);
     cur_fdm_state->set_Geocentric_Position( lat_geoc, cur_fdm_state->get_Longitude(),
                                cur_fdm_state->get_Altitude() +
@@ -758,7 +758,7 @@ void fgReInitSubsystems( void )
     double sea_level_radius_meters;
     double lat_geoc;
     // Set the FG variables first
-    fgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(), 
+    sgGeodToGeoc( cur_fdm_state->get_Latitude(), cur_fdm_state->get_Altitude(), 
                  &sea_level_radius_meters, &lat_geoc);
     cur_fdm_state->set_Geocentric_Position( lat_geoc, cur_fdm_state->get_Longitude(), 
                                cur_fdm_state->get_Altitude() + 

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 71687c7790388ca93f43cd7f9752411eb5788a47..b3304d651bbbce61f1edb333a1bfafc3bdea8c2c 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -38,6 +38,7 @@
 #include <Network/native.hxx>
 #include <Network/garmin.hxx>
 #include <Network/nmea.hxx>
+#include <Network/props.hxx>
 #include <Network/pve.hxx>
 #include <Network/ray.hxx>
 #include <Network/rul.hxx>
@@ -81,6 +82,9 @@ static FGProtocol *parse_port_config( const string& config )
     } else if ( protocol == "nmea" ) {
        FGNMEA *nmea = new FGNMEA;
        io = nmea;
+    } else if ( protocol == "props" ) {
+       FGProps *props = new FGProps;
+       io = props;
     } else if ( protocol == "pve" ) {
        FGPVE *pve = new FGPVE;
        io = pve;

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 1af678e3cbf078f9d448beb19c7dd615f1d5a1f2..7f09e45f909aefe872033856b13c63cb0db9e32d 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -66,7 +66,6 @@
 
 #include <simgear/constants.h>  // for VERSION
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/fg_random.h>
 #include <simgear/misc/fgpath.hxx>

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 8571b1ca0f82457951b9b164a8447a77d2043dbe..631dac8081c64e104b8baa9761e97c9eca6c429f 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -829,6 +829,8 @@ int fgOPTIONS::parse_option( const string& arg ) {
        parse_channel( "garmin", arg.substr(9) );
     } else if ( arg.find( "--nmea=" ) != string::npos ) {
        parse_channel( "nmea", arg.substr(7) );
+    } else if ( arg.find( "--props=" ) != string::npos ) {
+       parse_channel( "props", arg.substr(8) );
     } else if ( arg.find( "--pve=" ) != string::npos ) {
        parse_channel( "pve", arg.substr(6) );
     } else if ( arg.find( "--ray=" ) != string::npos ) {

diff --git a/src/Main/views.cxx b/src/Main/views.cxx
index 92450c635916044fe6a555748a31c95e8f43a7bc..23db806d419bde98fc3e1c13b4e191100a6e6e7e 100644 (file)
--- a/src/Main/views.cxx
+++ b/src/Main/views.cxx
@@ -213,7 +213,7 @@ void FGView::UpdateViewMath( const FGInterface& f ) {
                 f.get_Lat_geocentric(), 
                 f.get_Sea_level_radius() * FEET_TO_METER );
 
-    cur_zero_elev = fgPolarToCart3d(p) - scenery.center;
+    cur_zero_elev = sgPolarToCart3d(p) - scenery.center;
 
     // calculate view position in current FG view coordinate system
     // p.lon & p.lat are already defined earlier, p.radius was set to
@@ -225,7 +225,7 @@ void FGView::UpdateViewMath( const FGInterface& f ) {
        p.setz( p.radius() + scenery.cur_elev + 0.5 * METER_TO_FEET );
     }
 
-    abs_view_pos = fgPolarToCart3d(p);
+    abs_view_pos = sgPolarToCart3d(p);
        
     view_pos = abs_view_pos - scenery.center;
 
@@ -286,7 +286,7 @@ void FGView::UpdateViewMath( const FGInterface& f ) {
     
     // Alternative method to Derive local up vector based on
     // *geodetic* coordinates
-    // alt_up = fgPolarToCart(FG_Longitude, FG_Latitude, 1.0);
+    // alt_up = sgPolarToCart(FG_Longitude, FG_Latitude, 1.0);
     // printf( "    Alt Up = (%.4f, %.4f, %.4f)\n", 
     //         alt_up.x, alt_up.y, alt_up.z);
 

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index b03d9924137b8f3900972e231d4a7644db397bc0..935886cbd037fd4090fe246fbaaeeb6e56f7a568 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -23,7 +23,7 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/fgstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
 

diff --git a/src/Navaids/ils.hxx b/src/Navaids/ils.hxx
index 21b202138b44d376e8202a45f32398fb0eff969b..6eedeb1c7ce6fcb8217acbae4e30e139a9ae389c 100644 (file)
--- a/src/Navaids/ils.hxx
+++ b/src/Navaids/ils.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/fgstream.hxx>
 
 #ifdef FG_HAVE_STD_INCLUDES
@@ -136,7 +136,7 @@ operator >> ( istream& in, FGILS& i )
     Point3D geod, cart;
 
     geod = Point3D( i.loclon * DEG_TO_RAD, i.loclat * DEG_TO_RAD, i.gselev );
-    cart = fgGeodToCart( geod );
+    cart = sgGeodToCart( geod );
     i.x = cart.x();
     i.y = cart.y();
     i.z = cart.z();
@@ -147,7 +147,7 @@ operator >> ( istream& in, FGILS& i )
        i.has_gs = true;
 
        geod = Point3D( i.gslon * DEG_TO_RAD, i.gslat * DEG_TO_RAD, i.gselev );
-       cart = fgGeodToCart( geod );
+       cart = sgGeodToCart( geod );
        i.gs_x = cart.x();
        i.gs_y = cart.y();
        i.gs_z = cart.z();
@@ -160,7 +160,7 @@ operator >> ( istream& in, FGILS& i )
        i.has_dme = true;
 
        geod = Point3D( i.dmelon * DEG_TO_RAD, i.dmelat * DEG_TO_RAD, i.gselev);
-       cart = fgGeodToCart( geod );
+       cart = sgGeodToCart( geod );
        i.dme_x = cart.x();
        i.dme_y = cart.y();
        i.dme_z = cart.z();

diff --git a/src/Navaids/ilslist.cxx b/src/Navaids/ilslist.cxx
index 2b27f22e770c22de79b937c24da35d50bf3b879b..3bed2ed943f8597653e508a4ab5e0028b9b5ec00 100644 (file)
--- a/src/Navaids/ilslist.cxx
+++ b/src/Navaids/ilslist.cxx
@@ -23,7 +23,7 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/fgstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include "ilslist.hxx"
 
@@ -117,7 +117,7 @@ bool FGILSList::query( double lon, double lat, double elev, double freq,
     ils_list_iterator last = stations.end();
 
     // double az1, az2, s;
-    Point3D aircraft = fgGeodToCart( Point3D(lon, lat, elev) );
+    Point3D aircraft = sgGeodToCart( Point3D(lon, lat, elev) );
     Point3D station;
     double d;
     for ( ; current != last ; ++current ) {

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index 6f38b4ae8a6c0b31f9e30196719b96a4759818cb..57a0c00a911dc316d5c9ba10ea85fa83236fe002 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/fgstream.hxx>
 
 #ifdef FG_HAVE_STD_INCLUDES
@@ -102,7 +102,7 @@ operator >> ( istream& in, FGNav& n )
 
     // generate cartesian coordinates
     Point3D geod( n.lon * DEG_TO_RAD, n.lat * DEG_TO_RAD, n.elev );
-    Point3D cart = fgGeodToCart( geod );
+    Point3D cart = sgGeodToCart( geod );
     n.x = cart.x();
     n.y = cart.y();
     n.z = cart.z();

diff --git a/src/Navaids/navlist.cxx b/src/Navaids/navlist.cxx
index 75f15ee90a8c5c116b23b21b78e5cfbdd0c4d348..abf7e104cb1599b341513b10ec2bf66a30f915a2 100644 (file)
--- a/src/Navaids/navlist.cxx
+++ b/src/Navaids/navlist.cxx
@@ -23,7 +23,7 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/fgstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include "navlist.hxx"
 
@@ -119,7 +119,7 @@ bool FGNavList::query( double lon, double lat, double elev, double freq,
     nav_list_iterator last = stations.end();
 
     // double az1, az2, s;
-    Point3D aircraft = fgGeodToCart( Point3D(lon, lat, elev) );
+    Point3D aircraft = sgGeodToCart( Point3D(lon, lat, elev) );
     Point3D station;
     double d;
     for ( ; current != last ; ++current ) {

diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx
index 5fdeb81d58f72004c3aa7d56a9d40d2555a17571..ca00dd414f3d6accdac829e02cb07ec9fc76ad33 100644 (file)
--- a/src/Network/garmin.cxx
+++ b/src/Network/garmin.cxx
@@ -22,7 +22,7 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
 
 #include <FDM/flight.hxx>
@@ -269,7 +269,7 @@ bool FGGarmin::parse_message() {
            FG_LOG( FG_IO, FG_INFO, "  lon = " << lon );
 
            double sl_radius, lat_geoc;
-           fgGeodToGeoc( cur_fdm_state->get_Latitude(), 
+           sgGeodToGeoc( cur_fdm_state->get_Latitude(), 
                          cur_fdm_state->get_Altitude(), 
                          &sl_radius, &lat_geoc );
            cur_fdm_state->set_Geocentric_Position( lat_geoc, 

diff --git a/src/Network/native.cxx b/src/Network/native.cxx
index 83682604fdc11e45eefd6368f11e8c025fbbbdd3..07da1e73cb739c66d811f4dc77b77eee95d674e3 100644 (file)
--- a/src/Network/native.cxx
+++ b/src/Network/native.cxx
@@ -22,7 +22,6 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
 
 #include "native.hxx"

diff --git a/src/Network/nmea.cxx b/src/Network/nmea.cxx
index 7f9b47184751a2b2c4e2c233f92347fd8ae72a72..6467c28545a1455ccb8aed2908aa7cbcdd9afe92 100644 (file)
--- a/src/Network/nmea.cxx
+++ b/src/Network/nmea.cxx
@@ -22,7 +22,7 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
 
 #include <FDM/flight.hxx>
@@ -274,7 +274,7 @@ bool FGNMEA::parse_message() {
            FG_LOG( FG_IO, FG_INFO, "  lon = " << lon );
 
            double sl_radius, lat_geoc;
-           fgGeodToGeoc( cur_fdm_state->get_Latitude(), 
+           sgGeodToGeoc( cur_fdm_state->get_Latitude(), 
                          cur_fdm_state->get_Altitude(), 
                          &sl_radius, &lat_geoc );
            cur_fdm_state->set_Geocentric_Position( lat_geoc, 

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index aaa4d159c984a38e180bbb2a38feeb289c95ec89..25c304fd51221814af1aec9d18b53c6a7fb4a1c3 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -60,6 +60,7 @@ bool FGProps::open() {
 
 
 bool FGProps::process_command( const char *cmd ) {
+    cout << "processing command = " << cmd << endl;
     string_list tokens;
     tokens.clear();
 
@@ -76,6 +77,8 @@ bool FGProps::process_command( const char *cmd ) {
     if ( command == "ls" ) {
        
     }
+
+    return true;
 }
 
 
@@ -83,11 +86,17 @@ bool FGProps::process_command( const char *cmd ) {
 bool FGProps::process() {
     SGIOChannel *io = get_io_channel();
 
+    cout << "processing incoming props command" << endl;
+
     if ( get_direction() == SG_IO_BI ) {
+       cout << "  (bi directional)" << endl;
        while ( io->read( buf, max_cmd_len ) > 0 ) {
            FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
            process_command( buf );
        }
+    } else {
+       FG_LOG( FG_IO, FG_ALERT, 
+               "in or out direction not supported for FGProps." );
     }
 
     return true;

diff --git a/src/Network/pve.cxx b/src/Network/pve.cxx
index d52f1a6be3d17785fcd02f059f08204989d87bb0..f8defdf1a785990fabd5400977e0498bb789da06 100644 (file)
--- a/src/Network/pve.cxx
+++ b/src/Network/pve.cxx
@@ -22,8 +22,9 @@
 
 
 #include <stdio.h>             // sprintf()
+
+#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/io/iochannel.hxx>
 
 #include <FDM/flight.hxx>

diff --git a/src/Network/ray.cxx b/src/Network/ray.cxx
index 1d471972d39239dd642eec264a4412d67aea9bf9..4f8d1c473a0e33a91183d648573998841833b472 100644 (file)
--- a/src/Network/ray.cxx
+++ b/src/Network/ray.cxx
@@ -24,7 +24,6 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 
 #include <FDM/flight.hxx>
 

diff --git a/src/Network/rul.cxx b/src/Network/rul.cxx
index c9554956be048a5a49c859eccaf7e6099b438607..73f5c45417f5fcd4b30865059e1a54a7bba24832 100644 (file)
--- a/src/Network/rul.cxx
+++ b/src/Network/rul.cxx
@@ -24,9 +24,9 @@
 
 #include <stdio.h>             // sprintf()
 
+#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 
 #include <FDM/flight.hxx>
 

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index 8db9e1e828b8fe4599cad802ee9188d56676efb6..74c7e2f99c530edabaee52851beeaefe513a7191 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -46,10 +46,10 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/fg_random.h>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/fgstream.hxx>
 #include <simgear/misc/stopwatch.hxx>
 #include <simgear/misc/texcoord.hxx>
@@ -107,7 +107,7 @@ static Point3D local_calc_tex_coords(const Point3D& node, const Point3D& ref) {
                  node[1] + ref.y(),
                  node[2] + ref.z() );
 
-    pp = fgCartToPolar3d(cp);
+    pp = sgCartToPolar3d(cp);
 
     // tmplon = pp.lon() * RAD_TO_DEG;
     // tmplat = pp.lat() * RAD_TO_DEG;
@@ -165,7 +165,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) {
     double height = b.get_height();
     double width = b.get_width();
 
-    Point3D center = fgGeodToCart(Point3D(clon*DEG_TO_RAD,clat*DEG_TO_RAD,0.0));
+    Point3D center = sgGeodToCart(Point3D(clon*DEG_TO_RAD,clat*DEG_TO_RAD,0.0));
     t->center = center;
     // cout << "center = " << center << endl;;
     
@@ -186,7 +186,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) {
     Point3D cart[4], rel[4];
     t->nodes.clear();
     for ( i = 0; i < 4; ++i ) {
-       cart[i] = fgGeodToCart(rad[i]);
+       cart[i] = sgGeodToCart(rad[i]);
        rel[i] = cart[i] - center;
        t->nodes.push_back( rel[i] );
        // cout << "corner " << i << " = " << cart[i] << endl;

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 77f6c745ef284a7823b95f0cfe3d3ff444b22995..6a9e1fd62cd97f6a53e44b236f6f9880bb009dd9 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -34,9 +34,9 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/vector.hxx>
 
 // #include <Aircraft/aircraft.hxx>
@@ -177,9 +177,9 @@ FGTileMgr::current_elev_ssg( const Point3D& abs_view_pos,
 
     int hitcount = hit_list.num_hits();
     for ( int i = 0; i < hitcount; ++i ) {
-       geoc = fgCartToPolar3d( scenery.center + hit_list.get_point(i) );      
+       geoc = sgCartToPolar3d( scenery.center + hit_list.get_point(i) );      
        double lat_geod, alt, sea_level_r;
-       fgGeocToGeod(geoc.lat(), geoc.radius(), &lat_geod, 
+       sgGeocToGeod(geoc.lat(), geoc.radius(), &lat_geod, 
                     &alt, &sea_level_r);
        if ( alt > result && alt < 10000 ) {
            result = alt;
@@ -464,7 +464,7 @@ int FGTileMgr::update( double lon, double lat ) {
        Point3D geod_pos = Point3D( longitude * DEG_TO_RAD,
                                    latitude * DEG_TO_RAD,
                                    0.0);
-       Point3D tmp_abs_view_pos = fgGeodToCart( geod_pos );
+       Point3D tmp_abs_view_pos = sgGeodToCart( geod_pos );
        scenery.center = tmp_abs_view_pos;
        // cout << "abs_view_pos = " << tmp_abs_view_pos << endl;
        prep_ssg_nodes();

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 05cd0370b24ed3af41f4893bc3ce0a351c83bcfa..ce92e9d42b8e661f5c4274fc8c33dbeec3f44734 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -50,7 +50,6 @@ FG_USING_STD(string);
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/interpolater.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/misc/fgpath.hxx>

diff --git a/src/Time/moonpos.cxx b/src/Time/moonpos.cxx
index e3b30b34d7c8fc5fd9f93fb3fbf32009a7d48a51..62274e91523b49ad4c23cb8c682c951ecc1099aa 100644 (file)
--- a/src/Time/moonpos.cxx
+++ b/src/Time/moonpos.cxx
@@ -54,9 +54,9 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/vector.hxx>
 
 #include <Main/globals.hxx>
@@ -350,10 +350,10 @@ void fgUpdateMoonPos( void ) {
     // fgMoonPosition(t->cur_time, &l->moon_lon, &moon_gd_lat);
     fgMoonPositionGST(t->getGst(), &l->moon_lon, &moon_gd_lat);
 
-    fgGeodToGeoc(moon_gd_lat, 0.0, &sl_radius, &l->moon_gc_lat);
+    sgGeodToGeoc(moon_gd_lat, 0.0, &sl_radius, &l->moon_gc_lat);
 
     p = Point3D( l->moon_lon, l->moon_gc_lat, sl_radius );
-    l->fg_moonpos = fgPolarToCart3d(p);
+    l->fg_moonpos = sgPolarToCart3d(p);
 
     FG_LOG( FG_EVENT, FG_INFO, "    t->cur_time = " << t->get_cur_time() );
     FG_LOG( FG_EVENT, FG_INFO, 

diff --git a/src/Time/sunpos.cxx b/src/Time/sunpos.cxx
index f7939095767c1a2f64eb43cf1e732b7e88b25c4e..0d5ca70669f78f98a716061a43036c2c9f814ab6 100644 (file)
--- a/src/Time/sunpos.cxx
+++ b/src/Time/sunpos.cxx
@@ -56,9 +56,9 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
-#include <simgear/math/fg_geodesy.hxx>
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/vector.hxx>
 
 #include <Main/globals.hxx>
@@ -67,7 +67,7 @@
 
 #include "sunpos.hxx"
 
-#undef E
+// #undef E // should no longer be needed
 #define MeanObliquity (23.440592*(FG_2PI/360))
 
 static void   ecliptic_to_equatorial(double, double, double *, double *);
@@ -258,10 +258,10 @@ void fgUpdateSunPos( void ) {
 
     fgSunPositionGST(t->getGst(), &l->sun_lon, &sun_gd_lat);
 
-    fgGeodToGeoc(sun_gd_lat, 0.0, &sl_radius, &l->sun_gc_lat);
+    sgGeodToGeoc(sun_gd_lat, 0.0, &sl_radius, &l->sun_gc_lat);
 
     p = Point3D( l->sun_lon, l->sun_gc_lat, sl_radius );
-    l->fg_sunpos = fgPolarToCart3d(p);
+    l->fg_sunpos = sgPolarToCart3d(p);
 
     FG_LOG( FG_EVENT, FG_INFO, "    t->cur_time = " << t->get_cur_time() );
     FG_LOG( FG_EVENT, FG_INFO,