Expose a radio function (receiveBeacon) to the Nasal subsystem

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

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index f54e4721ecdaa50046d1c705d1328cdff055cb95..3b0658b0a7173f82051da959778c729358c30a89 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.
@@ -36,6 +36,7 @@
 
 FGAircraftModel::FGAircraftModel ()
   : _aircraft(0),
+    _velocity(SGVec3d::zeros()),
     _fx(0),
     _lon(0),
     _lat(0),
@@ -43,22 +44,18 @@ FGAircraftModel::FGAircraftModel ()
     _pitch(0),
     _roll(0),
     _heading(0),
-    _speed_north(0),
-    _speed_east(0),
-    _speed_up(0)
+    _speed_n(0),
+    _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;
+  deinit();
 }
 
 void 
@@ -83,6 +80,31 @@ FGAircraftModel::init ()
   globals->get_scenery()->get_aircraft_branch()->addChild(node);
 }
 
+void
+FGAircraftModel::reinit()
+{
+  deinit();
+  _fx->reinit();
+  init();
+}
+
+void
+FGAircraftModel::deinit()
+{
+  // drop reference
+  _fx = 0;
+
+  if (!_aircraft) {
+    return;
+  }
+  
+  osg::Node* node = _aircraft->getSceneGraph();
+  globals->get_scenery()->get_aircraft_branch()->removeChild(node);
+
+  delete _aircraft;
+  _aircraft = NULL;
+}
+
 void
 FGAircraftModel::bind ()
 {
@@ -92,9 +114,9 @@ FGAircraftModel::bind ()
    _pitch = fgGetNode("orientation/pitch-deg", true);
    _roll = fgGetNode("orientation/roll-deg", true);
    _heading = fgGetNode("orientation/heading-deg", true);
-   _speed_north = fgGetNode("/velocities/speed-north-fps", true);
-   _speed_east = fgGetNode("/velocities/speed-east-fps", true);
-   _speed_up = fgGetNode("/velocities/vertical-speed-fps", true);
+   _speed_n = fgGetNode("velocities/speed-north-fps", true);
+   _speed_e = fgGetNode("velocities/speed-east-fps", true);
+   _speed_d = fgGetNode("velocities/speed-down-fps", true);
 }
 
 void
@@ -123,24 +145,19 @@ FGAircraftModel::update (double dt)
                            _heading->getDoubleValue());
   _aircraft->update();
 
-  // update model's sample group values
-  // Get the Cartesian coordinates in meters
-  SGVec3d pos = SGVec3d::fromGeod(_aircraft->getPosition());
-  _fx->set_position( pos );
-
-  SGQuatd orient_m = SGQuatd::fromLonLat(_aircraft->getPosition());
-  orient_m *= SGQuatd::fromYawPitchRollDeg(_heading->getDoubleValue(),
-                                           _pitch->getDoubleValue(),
-                                           _roll->getDoubleValue());
-  SGVec3d orient = orient_m.rotateBack(SGVec3d::e1());
-  _fx->set_orientation( toVec3f(orient) );
- 
-  SGVec3f vel = SGVec3f( _speed_north->getFloatValue(),
-                         _speed_east->getFloatValue(),
-                         _speed_up->getFloatValue());
-// TODO: rotate to properly align with the model orientation
+  // update model's audio sample values
+  SGGeod position = _aircraft->getPosition();
+  _fx->set_position_geod( position );
 
-  _fx->set_velocity( vel*SG_FEET_TO_METER );
+  SGQuatd orient = SGQuatd::fromYawPitchRollDeg(_heading->getDoubleValue(),
+                                                _pitch->getDoubleValue(),
+                                                _roll->getDoubleValue());
+  _fx->set_orientation( orient );
+ 
+  _velocity = SGVec3d( _speed_n->getDoubleValue(),
+                       _speed_e->getDoubleValue(),
+                       _speed_d->getDoubleValue() );
+  _fx->set_velocity( _velocity );
 }