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 ece3d5076f0a4d0dcff43bb8a191e5d122bcc2a8..9e9dd6dc0fc745c1164c2b143bbe80073e3409f0 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -20,11 +20,10 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
-#include "acmodel.hxx"
-
-extern ssgRoot * cockpit;              // FIXME: from main.cxx
+#include <Scenery/scenery.hxx>
 
-FGAircraftModel current_model; // FIXME: add to globals
+#include "acmodel.hxx"
+#include "model.hxx"
 
 
 \f
@@ -33,21 +32,37 @@ FGAircraftModel current_model;      // FIXME: add to globals
 ////////////////////////////////////////////////////////////////////////
 
 FGAircraftModel::FGAircraftModel ()
-  : _aircraft(0)
+  : _aircraft(0),
+    _selector(new ssgSelector),
+    _scene(new ssgRoot),
+    _nearplane(0.01f),
+    _farplane(100.0f)
 {
 }
 
 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"));
-  cockpit->addKid(_aircraft->getSceneGraph());
+  _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,17 +78,16 @@ FGAircraftModel::unbind ()
 }
 
 void
-FGAircraftModel::update (int dt)
+FGAircraftModel::update (double dt)
 {
   int view_number = globals->get_viewmgr()->get_current();
 
   if (view_number == 0 && !fgGetBool("/sim/view/internal")) {
     _aircraft->setVisible(false);
-    return;
+  } else {
+    _aircraft->setVisible(true);
   }
 
-  _aircraft->setVisible(true);
-
   _aircraft->setPosition(fgGetDouble("/position/longitude-deg"),
                         fgGetDouble("/position/latitude-deg"),
                         fgGetDouble("/position/altitude-ft"));
@@ -81,7 +95,26 @@ FGAircraftModel::update (int dt)
                            fgGetDouble("/orientation/pitch-deg"),
                            fgGetDouble("/orientation/heading-deg"));
   _aircraft->update(dt);
+
 }
 
+void
+FGAircraftModel::draw ()
+{
+                               // OK, now adjust the clip planes and draw
+                               // FIXME: view number shouldn't be 
+                               // hard-coded.
+  int view_number = globals->get_viewmgr()->get_current();
+  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);
+  }
+
+}
 
 // end of model.cxx