Fix shared library build for metar executable

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

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 187e27042e356768a256a11a79d9e9a72f6dd84f..3c9faaf23d44456970714636869dbd9b1acf3222 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.
@@ -55,10 +55,7 @@ FGAircraftModel::FGAircraftModel ()
 
 FGAircraftModel::~FGAircraftModel ()
 {
-  osg::Node* node = _aircraft->getSceneGraph();
-  globals->get_scenery()->get_aircraft_branch()->removeChild(node);
-
-  delete _aircraft;
+  deinit();
 }
 
 void 
@@ -83,6 +80,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 ()
 {
@@ -132,15 +151,9 @@ FGAircraftModel::update (double dt)
                                                 _roll->getDoubleValue());
   _fx->set_orientation( orient );
  
-  SGVec3d vel = SGVec3d( _speed_n->getFloatValue(),
-                         _speed_e->getFloatValue(),
-                         _speed_d->getFloatValue() );
-  if ( vel[0] || vel[1] || vel[2] ) {
-    SGQuatd hlOr = SGQuatd::fromLonLat(position);
-    _velocity = toVec3f( hlOr.backTransform( vel * SG_FEET_TO_METER ) );
-  }
-  else
-      _velocity = SGVec3f::zeros();
+  _velocity = SGVec3d( _speed_n->getDoubleValue(),
+                       _speed_e->getDoubleValue(),
+                       _speed_d->getDoubleValue() );
   _fx->set_velocity( _velocity );
 }