Modified Files:

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

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 4b0a87841251bbec8e29d8e438708b77c74acc84..a322f66c6ea2a312c68d130abe682a9a56ce281f 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -35,7 +35,6 @@
 FGAircraftModel::FGAircraftModel ()
   : _aircraft(0),
     _selector(new osg::Switch),
-    _scene(new osg::Group),
     _nearplane(0.10f),
     _farplane(1000.0f)
 {
@@ -43,10 +42,6 @@ FGAircraftModel::FGAircraftModel ()
 
 FGAircraftModel::~FGAircraftModel ()
 {
-  // Unregister that one at the scenery manager
-  if (_aircraft)
-    globals->get_scenery()->unregister_placement_transform(_aircraft->getTransform());
-
   delete _aircraft;
                                // SSG will delete it
   globals->get_scenery()->get_aircraft_branch()->removeChild(_selector.get());
@@ -86,14 +81,10 @@ FGAircraftModel::init ()
                                            liveryPath);
     _aircraft->init( model );
   }
-  _scene->addChild(_aircraft->getSceneGraph());
-  _selector->addChild(_aircraft->getSceneGraph());
+  _selector->addChild(_aircraft->getSceneGraph(), true);
   // Do not do altitude computations with that model
   _selector->setNodeMask(~SG_NODEMASK_TERRAIN_BIT);
   globals->get_scenery()->get_aircraft_branch()->addChild(_selector.get());
-
-  // Register that one at the scenery manager
-  globals->get_scenery()->register_placement_transform(_aircraft->getTransform());
 }
 
 void