NavDisplay: fix update lag when switching range or centre.

[flightgear.git] / src / Model / acmodel.cxx

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 1dcf2bd2297e63cb0dba19065aa231a1f166e0bc..d4e8c0f48ac1a9dc444c121f760aa5ade5724cab 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -1,4 +1,4 @@
-// model.cxx - manage a 3D aircraft model.
+// acmodel.cxx - manage a 3D aircraft model.
 // Written by David Megginson, started 2002.
 //
 // This file is in the Public Domain, and comes with no warranty.
@@ -48,18 +48,16 @@ FGAircraftModel::FGAircraftModel ()
     _speed_e(0),
     _speed_d(0)
 {
-    SGSoundMgr *smgr;
-    smgr = (SGSoundMgr *)globals->get_subsystem("soundmgr");
+    SGSoundMgr *smgr = globals->get_soundmgr();
     _fx = new FGFX(smgr, "fx");
     _fx->init();
 }
 
 FGAircraftModel::~FGAircraftModel ()
 {
-  osg::Node* node = _aircraft->getSceneGraph();
-  globals->get_scenery()->get_aircraft_branch()->removeChild(node);
-
-  delete _aircraft;
+  // drop reference
+  _fx = 0;
+  deinit();
 }
 
 void 
@@ -71,9 +69,9 @@ FGAircraftModel::init ()
     osg::Node *model = fgLoad3DModelPanel( path, globals->get_props());
     _aircraft->init( model );
   } catch (const sg_exception &ex) {
-    SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load aircraft from " << path << ':');
-    SG_LOG(SG_GENERAL, SG_ALERT, "  " << ex.getFormattedMessage());
-    SG_LOG(SG_GENERAL, SG_ALERT, "(Falling back to glider.ac.)");
+    SG_LOG(SG_AIRCRAFT, SG_ALERT, "Failed to load aircraft from " << path << ':');
+    SG_LOG(SG_AIRCRAFT, SG_ALERT, "  " << ex.getFormattedMessage());
+    SG_LOG(SG_AIRCRAFT, SG_ALERT, "(Falling back to glider.ac.)");
     osg::Node *model = fgLoad3DModelPanel( "Models/Geometry/glider.ac",
                                            globals->get_props());
     _aircraft->init( model );
@@ -84,6 +82,28 @@ FGAircraftModel::init ()
   globals->get_scenery()->get_aircraft_branch()->addChild(node);
 }
 
+void
+FGAircraftModel::reinit()
+{
+  deinit();
+  _fx->reinit();
+  init();
+}
+
+void
+FGAircraftModel::deinit()
+{
+  if (!_aircraft) {
+    return;
+  }
+  
+  osg::Node* node = _aircraft->getSceneGraph();
+  globals->get_scenery()->get_aircraft_branch()->removeChild(node);
+
+  delete _aircraft;
+  _aircraft = NULL;
+}
+
 void
 FGAircraftModel::bind ()
 {
@@ -125,16 +145,17 @@ FGAircraftModel::update (double dt)
   _aircraft->update();
 
   // update model's audio sample values
-  _fx->set_position( _aircraft->getPosition() );
+  SGGeod position = _aircraft->getPosition();
+  _fx->set_position_geod( position );
 
   SGQuatd orient = SGQuatd::fromYawPitchRollDeg(_heading->getDoubleValue(),
                                                 _pitch->getDoubleValue(),
                                                 _roll->getDoubleValue());
   _fx->set_orientation( orient );
  
-  _velocity = SGVec3d( -_speed_n->getDoubleValue(),
+  _velocity = SGVec3d( _speed_n->getDoubleValue(),
                        _speed_e->getDoubleValue(),
-                       _speed_d->getDoubleValue());
+                       _speed_d->getDoubleValue() );
   _fx->set_velocity( _velocity );
 }