Avoid SGLocation usage.

Modified Files:
	configure.ac src/AIModel/AIBase.cxx
	src/ATCDCL/AILocalTraffic.cxx src/FDM/Makefile.am
	src/FDM/flight.hxx src/FDM/LaRCsim/LaRCsim.cxx
	src/Main/Makefile.am src/Main/fg_init.cxx src/Main/main.cxx
	src/Main/viewer.cxx src/Main/viewer.hxx
	src/Scenery/tilemgr.cxx src/Scenery/tilemgr.hxx

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 74ce8fa895624e93dacf84534b8fdaa1d0542e6e..5988ac8f6baae90256b6b4bde6d1614ed8e4e048 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -36,7 +36,6 @@
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/scene/model/location.hxx>
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/scene/util/SGNodeMasks.hxx>
 #include <simgear/debug/logstream.hxx>

diff --git a/src/ATCDCL/AILocalTraffic.cxx b/src/ATCDCL/AILocalTraffic.cxx
index e99b60936ebda638365699a35a59c815086a8bf5..091709e61340a12e66855663d0c23d9f5d158828 100644 (file)
--- a/src/ATCDCL/AILocalTraffic.cxx
+++ b/src/ATCDCL/AILocalTraffic.cxx
@@ -34,8 +34,6 @@ during descent to avoid occasionally landing short or long.
 #  include <config.h>
 #endif
 
-#include <simgear/scene/model/location.hxx>
-
 #include <Airports/runways.hxx>
 #include <Main/globals.hxx>
 #include <Main/viewer.hxx>

diff --git a/src/FDM/LaRCsim/LaRCsim.cxx b/src/FDM/LaRCsim/LaRCsim.cxx
index 719d90daaa7adbe6ea2b89f787fb53c7ba261f2e..611849dff2d2379ce7053f20fad48b0b886b2a76 100644 (file)
--- a/src/FDM/LaRCsim/LaRCsim.cxx
+++ b/src/FDM/LaRCsim/LaRCsim.cxx
@@ -29,7 +29,6 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/scene/model/location.hxx>
 #include <simgear/scene/model/placement.hxx>
 
 #include <Aircraft/aircraft.hxx>

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 6ea60f1a91bbd0df344414c168212d198880248a..e5be03776fed07f9efe45437d9a17f55036b8d06 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -505,9 +505,8 @@ static void fgMainLoop( void ) {
 
     globals->get_tile_mgr()->prep_ssg_nodes( visibility_meters );
     // update tile manager for view...
-    SGLocation *view_location = globals->get_current_view()->getSGLocation();
-    SGGeod geodViewPos = SGGeod::fromDeg(view_location->getLongitude_deg(),
-                                         view_location->getLatitude_deg());
+    SGVec3d viewPos = globals->get_current_view()->get_view_pos();
+    SGGeod geodViewPos = SGGeod::fromCart(viewPos);
     globals->get_tile_mgr()->update(geodViewPos, visibility_meters);
 
     // run Nasal's settimer() loops right before the view manager