diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx index d0c58074..cbbae7e8 100644 --- a/src/Airports/GenAirports/build.cxx +++ b/src/Airports/GenAirports/build.cxx @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include @@ -1851,7 +1851,7 @@ void build_airport( string airport_raw, string_list& runways_raw, FGBucket b( apt_lon, apt_lat ); Point3D center_geod( b.get_center_lon() * DEG_TO_RAD, b.get_center_lat() * DEG_TO_RAD, 0 ); - Point3D gbs_center = fgGeodToCart( center_geod ); + Point3D gbs_center = sgGeodToCart( center_geod ); cout << b.gen_base_path() << "/" << b.gen_index_str() << endl; // Ignore any seaplane bases @@ -2184,7 +2184,7 @@ void build_airport( string airport_raw, string_list& runways_raw, p.setx( geod_nodes[i].x() * DEG_TO_RAD ); p.sety( geod_nodes[i].y() * DEG_TO_RAD ); p.setz( geod_nodes[i].z() ); - wgs84_nodes.push_back( fgGeodToCart( p ) ); + wgs84_nodes.push_back( sgGeodToCart( p ) ); } double gbs_radius = calc_bounding_radius( gbs_center, wgs84_nodes ); cout << "Done with wgs84 node mapping" << endl; @@ -2193,7 +2193,7 @@ void build_airport( string airport_raw, string_list& runways_raw, p.setx( base_tris.get_pt(0, 0).x() * DEG_TO_RAD ); p.sety( base_tris.get_pt(0, 0).y() * DEG_TO_RAD ); p.setz( 0 ); - Point3D tmp = fgGeodToCart( p ); + Point3D tmp = sgGeodToCart( p ); // cout << "geod = " << p << endl; // cout << "cart = " << tmp << endl; diff --git a/src/Airports/GenAirports/convex_hull.hxx b/src/Airports/GenAirports/convex_hull.hxx index 0cf51c91..8cfb3509 100644 --- a/src/Airports/GenAirports/convex_hull.hxx +++ b/src/Airports/GenAirports/convex_hull.hxx @@ -32,7 +32,7 @@ using namespace std; #endif -#include +#include #include diff --git a/src/Airports/GenAirports/output.hxx b/src/Airports/GenAirports/output.hxx index 877477a4..774aac13 100644 --- a/src/Airports/GenAirports/output.hxx +++ b/src/Airports/GenAirports/output.hxx @@ -37,7 +37,7 @@ #include #include STL_STRING -#include +#include #include diff --git a/src/Airports/GenAirports/point2d.hxx b/src/Airports/GenAirports/point2d.hxx index 049c8807..bc1aace1 100644 --- a/src/Airports/GenAirports/point2d.hxx +++ b/src/Airports/GenAirports/point2d.hxx @@ -26,7 +26,7 @@ #define _POINT2D_HXX -#include +#include #include diff --git a/src/Airports/GenAirports/runway.cxx b/src/Airports/GenAirports/runway.cxx index ea53a995..baef13bc 100644 --- a/src/Airports/GenAirports/runway.cxx +++ b/src/Airports/GenAirports/runway.cxx @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include "runway.hxx" #include "point2d.hxx" diff --git a/src/Airports/GenAirports/texparams.hxx b/src/Airports/GenAirports/texparams.hxx index ea4a1fb1..0de2ae2e 100644 --- a/src/Airports/GenAirports/texparams.hxx +++ b/src/Airports/GenAirports/texparams.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include diff --git a/src/BuildTiles/Clipper/clipper.hxx b/src/BuildTiles/Clipper/clipper.hxx index 9c159c9c..ad81d8dd 100644 --- a/src/BuildTiles/Clipper/clipper.hxx +++ b/src/BuildTiles/Clipper/clipper.hxx @@ -34,7 +34,7 @@ #include -#include +#include #include diff --git a/src/BuildTiles/GenOutput/genobj.cxx b/src/BuildTiles/GenOutput/genobj.cxx index 04ddb26a..15616073 100644 --- a/src/BuildTiles/GenOutput/genobj.cxx +++ b/src/BuildTiles/GenOutput/genobj.cxx @@ -51,7 +51,7 @@ void FGGenOutput::calc_gbs( FGConstruct& c ) { b.get_center_lat() * DEG_TO_RAD, 0 ); - gbs_center = fgGeodToCart(p); + gbs_center = sgGeodToCart(p); point_list wgs84_nodes = c.get_wgs84_nodes(); const_point_list_iterator current = wgs84_nodes.begin(); diff --git a/src/BuildTiles/GenOutput/genobj.hxx b/src/BuildTiles/GenOutput/genobj.hxx index 75e34fc1..018d4fdc 100644 --- a/src/BuildTiles/GenOutput/genobj.hxx +++ b/src/BuildTiles/GenOutput/genobj.hxx @@ -36,9 +36,9 @@ #include STL_STRING #include -#include -#include #include +#include +#include #include #include
diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx index 364b3615..9125ee2a 100644 --- a/src/BuildTiles/Main/main.cxx +++ b/src/BuildTiles/Main/main.cxx @@ -335,7 +335,7 @@ static void build_wgs_84_point_list( FGConstruct& c, const FGArray& array ) { geod.y() * DEG_TO_RAD, geod.z() ); - cart = fgGeodToCart(radians); + cart = sgGeodToCart(radians); // cout << cart << endl; geod_nodes.push_back(geod); diff --git a/src/BuildTiles/Match/match.cxx b/src/BuildTiles/Match/match.cxx index 898b68e0..b6fa0e7f 100644 --- a/src/BuildTiles/Match/match.cxx +++ b/src/BuildTiles/Match/match.cxx @@ -25,8 +25,8 @@ # include #endif -#include #include +#include #include #ifdef _MSC_VER @@ -590,7 +590,7 @@ static Point3D fake_normal( const Point3D& p ) { Point3D radians = Point3D( p.x() * DEG_TO_RAD, p.y() * DEG_TO_RAD, p.z() ); - Point3D cart = fgGeodToCart(radians); + Point3D cart = sgGeodToCart(radians); double len = Point3D(0.0).distance3D(cart); cout << "len = " << len << endl; cart /= len; diff --git a/src/BuildTiles/Match/match.hxx b/src/BuildTiles/Match/match.hxx index 4a34f2c9..aeaac5d4 100644 --- a/src/BuildTiles/Match/match.hxx +++ b/src/BuildTiles/Match/match.hxx @@ -31,7 +31,7 @@ #include -#include +#include #include #include
diff --git a/src/Lib/Array/array.hxx b/src/Lib/Array/array.hxx index b9b57f16..2406af88 100644 --- a/src/Lib/Array/array.hxx +++ b/src/Lib/Array/array.hxx @@ -35,8 +35,8 @@ #include #include -#include #include +#include #include diff --git a/src/Lib/Geometry/poly_support.cxx b/src/Lib/Geometry/poly_support.cxx index 2bbab4ca..a3c695de 100644 --- a/src/Lib/Geometry/poly_support.cxx +++ b/src/Lib/Geometry/poly_support.cxx @@ -24,8 +24,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/Lib/Geometry/poly_support.hxx b/src/Lib/Geometry/poly_support.hxx index d5342548..5f5cf72e 100644 --- a/src/Lib/Geometry/poly_support.hxx +++ b/src/Lib/Geometry/poly_support.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include #include diff --git a/src/Lib/Geometry/trinodes.hxx b/src/Lib/Geometry/trinodes.hxx index 0db4f6c6..814ef00b 100644 --- a/src/Lib/Geometry/trinodes.hxx +++ b/src/Lib/Geometry/trinodes.hxx @@ -31,9 +31,8 @@ #include -#include #include - +#include #define FG_PROXIMITY_EPSILON 0.000001 diff --git a/src/Lib/Optimize/genfans.hxx b/src/Lib/Optimize/genfans.hxx index 5354ebad..8df52403 100644 --- a/src/Lib/Optimize/genfans.hxx +++ b/src/Lib/Optimize/genfans.hxx @@ -34,7 +34,7 @@ #include -#include +#include #include diff --git a/src/Lib/Optimize/genstrips.hxx b/src/Lib/Optimize/genstrips.hxx index 73806c1c..8f362bba 100644 --- a/src/Lib/Optimize/genstrips.hxx +++ b/src/Lib/Optimize/genstrips.hxx @@ -35,7 +35,7 @@ #include -#include +#include #include diff --git a/src/Lib/Polygon/polygon.hxx b/src/Lib/Polygon/polygon.hxx index 28de0732..f42437e5 100644 --- a/src/Lib/Polygon/polygon.hxx +++ b/src/Lib/Polygon/polygon.hxx @@ -31,7 +31,7 @@ #include -#include +#include #include #include diff --git a/src/Lib/Polygon/superpoly.hxx b/src/Lib/Polygon/superpoly.hxx index 8a15e5f0..d9f34b79 100644 --- a/src/Lib/Polygon/superpoly.hxx +++ b/src/Lib/Polygon/superpoly.hxx @@ -31,7 +31,7 @@ #include -#include +#include #include #include diff --git a/src/Prep/MergerClipper/merger.hxx b/src/Prep/MergerClipper/merger.hxx index 654d7f14..577f1a73 100644 --- a/src/Prep/MergerClipper/merger.hxx +++ b/src/Prep/MergerClipper/merger.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include #include