Avoid SGLocation usage.

Again, the previous commit did not complete for some reason.

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/Main/viewer.cxx b/src/Main/viewer.cxx
index 7e243c05d8e452a376f083b8055d1c59fcaf45e5..af9fe455ee859d9a2a5e92159e42d1abee5191db 100644 (file)
--- a/src/Main/viewer.cxx
+++ b/src/Main/viewer.cxx
@@ -39,7 +39,6 @@
 #include <simgear/constants.h>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/scene/model/location.hxx>
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/math/vector.hxx>
 
@@ -82,8 +81,6 @@ FGViewer::FGViewer( fgViewType Type, bool from_model, int from_model_index,
     _damp_pitch(0),
     _damp_heading(0),
     _scaling_type(FG_SCALING_MAX),
-    _location(0),
-    _target_location(0),
     _cameraGroup(CameraGroup::getDefault())
 {
     _absolute_view_pos = SGVec3d(0, 0, 0);
@@ -132,17 +129,6 @@ FGViewer::~FGViewer( void ) {
 void
 FGViewer::init ()
 {
-  if ( _from_model )
-    _location = (SGLocation *) globals->get_aircraft_model()->get3DModel()->getSGLocation();
-  else
-    _location = new SGLocation;
-
-  if ( _type == FG_LOOKAT ) {
-    if ( _at_model )
-      _target_location = (SGLocation *) globals->get_aircraft_model()->get3DModel()->getSGLocation();
-    else
-      _target_location = (SGLocation *) new SGLocation;
-  }
 }
 
 void
@@ -417,24 +403,6 @@ FGViewer::recalc ()
     recalcLookAt();
   }
 
-  // Update viewer's postion data for the eye location...
-  _lon_deg = _location->getLongitude_deg();
-  _lat_deg = _location->getLatitude_deg();
-  _alt_ft = _location->getAltitudeASL_ft();
-  _roll_deg = _location->getRoll_deg();
-  _pitch_deg = _location->getPitch_deg();
-  _heading_deg = _location->getHeading_deg();
-
-  // Update viewer's postion data for the target (at object) location
-  if (_type == FG_LOOKAT) {
-    _target_lon_deg = _target_location->getLongitude_deg();
-    _target_lat_deg = _target_location->getLatitude_deg();
-    _target_alt_ft = _target_location->getAltitudeASL_ft();
-    _target_roll_deg = _target_location->getRoll_deg();
-    _target_pitch_deg = _target_location->getPitch_deg();
-    _target_heading_deg = _target_location->getHeading_deg();
-  }
-
   set_clean();
 }
 
@@ -443,17 +411,24 @@ void
 FGViewer::recalcLookFrom ()
 {
   // Update location data ...
-  if ( !_from_model ) {
-    _location->setPosition( _lon_deg, _lat_deg, _alt_ft );
-    _location->setOrientation( _roll_deg, _pitch_deg, _heading_deg );
-    _location->getTransformMatrix();
+  double lat, lon, alt, head, pitch, roll;
+  if ( _from_model ) {
+    SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel();
+    lat = placement->getLatitudeDeg();
+    lon = placement->getLongitudeDeg();
+    alt = placement->getElevationFt();
+
+    head = placement->getHeadingDeg();
+    pitch = placement->getPitchDeg();
+    roll = placement->getRollDeg();
+  } else {
+    lat = _lat_deg;
+    lon = _lon_deg;
+    alt = _alt_ft;
+    head = _heading_deg;
+    pitch = _pitch_deg;
+    roll = _roll_deg;
   }
-  double lat = _location->getLatitude_deg();
-  double lon = _location->getLongitude_deg();
-  double alt = _location->getAltitudeASL_ft();
-  double head = _location->getHeading_deg();
-  double pitch = _location->getPitch_deg();
-  double roll = _location->getRoll_deg();
   if ( !_from_model ) {
     // update from our own data...
     dampEyeData(roll, pitch, head);
@@ -490,18 +465,18 @@ FGViewer::recalcLookAt ()
   SGGeod geodTargetPos;
   SGQuatd geodTargetOr;
   if ( _at_model ) {
-    geodTargetPos = SGGeod::fromDegFt(_target_location->getLongitude_deg(),
-                                      _target_location->getLatitude_deg(),
-                                      _target_location->getAltitudeASL_ft());
-    double head = _target_location->getHeading_deg();
-    double pitch = _target_location->getPitch_deg();
-    double roll = _target_location->getRoll_deg();
+    SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel();
+    double lat = placement->getLatitudeDeg();
+    double lon = placement->getLongitudeDeg();
+    double alt = placement->getElevationFt();
+    geodTargetPos = SGGeod::fromDegFt(lon, lat, alt);
+
+    double head = placement->getHeadingDeg();
+    double pitch = placement->getPitchDeg();
+    double roll = placement->getRollDeg();
     geodTargetOr = SGQuatd::fromYawPitchRollDeg(head, pitch, roll);
   } else {
     dampEyeData(_target_roll_deg, _target_pitch_deg, _target_heading_deg);
-    _target_location->setPosition( _target_lon_deg, _target_lat_deg, _target_alt_ft );
-    _target_location->setOrientation( _target_roll_deg, _target_pitch_deg, _target_heading_deg );
-    _target_location->getTransformMatrix();
 
     // if not model then calculate our own target position...
     geodTargetPos = SGGeod::fromDegFt(_target_lon_deg,
@@ -517,18 +492,18 @@ FGViewer::recalcLookAt ()
   SGGeod geodEyePos;
   SGQuatd geodEyeOr;
   if ( _from_model ) {
-    geodEyePos = SGGeod::fromDegFt(_location->getLongitude_deg(),
-                                   _location->getLatitude_deg(),
-                                   _location->getAltitudeASL_ft());
-    double head = _location->getHeading_deg();
-    double pitch = _location->getPitch_deg();
-    double roll = _location->getRoll_deg();
+    SGModelPlacement* placement = globals->get_aircraft_model()->get3DModel();
+    double lat = placement->getLatitudeDeg();
+    double lon = placement->getLongitudeDeg();
+    double alt = placement->getElevationFt();
+    geodEyePos = SGGeod::fromDegFt(lon, lat, alt);
+
+    double head = placement->getHeadingDeg();
+    double pitch = placement->getPitchDeg();
+    double roll = placement->getRollDeg();
     geodEyeOr = SGQuatd::fromYawPitchRollDeg(head, pitch, roll);
   } else {
     dampEyeData(_roll_deg, _pitch_deg, _heading_deg);
-    _location->setPosition( _lon_deg, _lat_deg, _alt_ft );
-    _location->setOrientation( _roll_deg, _pitch_deg, _heading_deg );
-    _location->getTransformMatrix();
 
     // update from our own data, just the rotation here...
     geodEyePos = SGGeod::fromDegFt(_lon_deg, _lat_deg, _alt_ft);

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index 709523d8127410c96e85bde375162cb115f477bf..6c89cf92bfceb04e0f574cfbcd5f523032c41f20 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -42,9 +42,7 @@ class CameraGroup;
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/scene/model/location.hxx>
-
-#include <plib/sg.h>           // plib include
+#include <simgear/math/SGMath.hxx>
 
 #define FG_FOV_MIN 0.1
 #define FG_FOV_MAX 179.9
@@ -255,10 +253,6 @@ public:
     inline void set_dirty() { _dirty = true; }
     inline void set_clean() { _dirty = false; }
     
-    // return eye location...
-    virtual SGLocation * getSGLocation () const { return _location; }
-
-
 private:
 
     //////////////////////////////////////////////////////////////////
@@ -330,9 +324,6 @@ private:
     bool _at_model;
     int _at_model_index;  // number of model (for multi model)
 
-    SGLocation * _location;
-    SGLocation * _target_location;
-
     // the nominal field of view (angle, in degrees)
     double _fov_deg;
 

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 0d6ef6c89f810ebd654c159a61f5571333b195ac..6066ebd0a8afa1a50b9ed628d86c5f8f7c42d8f5 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -315,10 +315,8 @@ void FGTileMgr::update_queues()
 // disk.
 int FGTileMgr::update( double visibility_meters )
 {
-    SGLocation *location = globals->get_current_view()->getSGLocation();
-    double lon = location->getLongitude_deg();
-    double lat = location->getLatitude_deg();
-    return update(SGGeod::fromDegM(lon, lat, 0), visibility_meters);
+    SGVec3d viewPos = globals->get_current_view()->get_view_pos();
+    return update(SGGeod::fromCart(viewPos), visibility_meters);
 }
 
 int FGTileMgr::update( const SGGeod& location, double visibility_meters)

diff --git a/src/Scenery/tilemgr.hxx b/src/Scenery/tilemgr.hxx
index 2b32b3786722be49596aa23dfd40ecb9994bdbee..e7ee8494429bf61ba4b88137e215fe286c503472 100644 (file)
--- a/src/Scenery/tilemgr.hxx
+++ b/src/Scenery/tilemgr.hxx
@@ -25,7 +25,6 @@
 #define _TILEMGR_HXX
 
 #include <simgear/compiler.h>
-#include <simgear/scene/model/location.hxx>
 
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/scene/tgdb/TileEntry.hxx>