Change FGSteam into a proper subsystem rather than a collection of

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

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 16c1f1c56a9a8dc73f4ffc3b36bd339512a6a83d..9e9dd6dc0fc745c1164c2b143bbe80073e3409f0 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -20,7 +20,10 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
+#include <Scenery/scenery.hxx>
+
 #include "acmodel.hxx"
+#include "model.hxx"
 
 
 \f
@@ -30,6 +33,7 @@
 
 FGAircraftModel::FGAircraftModel ()
   : _aircraft(0),
+    _selector(new ssgSelector),
     _scene(new ssgRoot),
     _nearplane(0.01f),
     _farplane(100.0f)
@@ -40,14 +44,25 @@ FGAircraftModel::~FGAircraftModel ()
 {
   delete _aircraft;
   delete _scene;
+                               // SSG will delete it
+  globals->get_scenery()->get_aircraft_branch()->removeKid(_selector);
 }
 
 void 
 FGAircraftModel::init ()
 {
-  _aircraft = new FG3DModel;
-  _aircraft->init(fgGetString("/sim/model/path", "Models/Geometry/glider.ac"));
+  _aircraft = new FGModelPlacement;
+  string path = fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
+  try {
+    _aircraft->init(path);
+  } catch (const sg_exception &ex) {
+    SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load aircraft from " << path);
+    SG_LOG(SG_GENERAL, SG_ALERT, "(Falling back to glider.ac.)");
+    _aircraft->init("Models/Geometry/glider.ac");
+  }
   _scene->addKid(_aircraft->getSceneGraph());
+  _selector->addKid(_aircraft->getSceneGraph());
+  globals->get_scenery()->get_aircraft_branch()->addKid(_selector);
 }
 
 void 
@@ -63,7 +78,7 @@ FGAircraftModel::unbind ()
 }
 
 void
-FGAircraftModel::update (int dt)
+FGAircraftModel::update (double dt)
 {
   int view_number = globals->get_viewmgr()->get_current();
 
@@ -90,13 +105,14 @@ FGAircraftModel::draw ()
                                // FIXME: view number shouldn't be 
                                // hard-coded.
   int view_number = globals->get_viewmgr()->get_current();
-  if (_aircraft->getVisible()) {
-    if (view_number == 0) {
-      glClearDepth(1);
-      glClear(GL_DEPTH_BUFFER_BIT);
-      ssgSetNearFar(_nearplane, _farplane);
-    }
+  if (_aircraft->getVisible() && view_number == 0) {
+    glClearDepth(1);
+    glClear(GL_DEPTH_BUFFER_BIT);
+    ssgSetNearFar(_nearplane, _farplane);
     ssgCullAndDraw(_scene);
+    _selector->select(0);
+  } else {
+    _selector->select(1);
   }
 
 }