ignore resets for now because every z/Z key press would trigger a call to NOAA. We...

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

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index a39b76a3f8c74d9f7d6b3846e3ca5aeaec45a096..e209416c90940f80080746ebd43ec1d9d81545e3 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -14,16 +14,19 @@
 
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/scene/model/placement.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
+#include <Main/viewer.hxx>
 #include <Scenery/scenery.hxx>
 
+#include "model_panel.hxx"
+
 #include "acmodel.hxx"
-#include "model.hxx"
 
 
 \f
@@ -36,7 +39,7 @@ FGAircraftModel::FGAircraftModel ()
     _selector(new ssgSelector),
     _scene(new ssgRoot),
     _nearplane(0.01f),
-    _farplane(100.0f)
+    _farplane(1000.0f)
 {
 }
 
@@ -51,20 +54,22 @@ FGAircraftModel::~FGAircraftModel ()
 void 
 FGAircraftModel::init ()
 {
-  _aircraft = new FGModelPlacement;
+  _aircraft = new SGModelPlacement;
   string path = fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
   try {
-    _aircraft->init( globals->get_fg_root(),
-                     path,
-                     globals->get_props(),
-                     globals->get_sim_time_sec() );
+    ssgBranch *model = fgLoad3DModelPanel( globals->get_fg_root(),
+                                           path,
+                                           globals->get_props(),
+                                           globals->get_sim_time_sec() );
+    _aircraft->init( model );
   } 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( globals->get_fg_root(),
-                     "Models/Geometry/glider.ac",
-                     globals->get_props(),
-                     globals->get_sim_time_sec() );
+    ssgBranch *model = fgLoad3DModelPanel( globals->get_fg_root(),
+                                           "Models/Geometry/glider.ac",
+                                           globals->get_props(),
+                                           globals->get_sim_time_sec() );
+    _aircraft->init( model );
   }
   _scene->addKid(_aircraft->getSceneGraph());
   _selector->addKid(_aircraft->getSceneGraph());
@@ -87,8 +92,9 @@ void
 FGAircraftModel::update (double dt)
 {
   int view_number = globals->get_viewmgr()->get_current();
+  int is_internal = globals->get_current_view()->getInternal();
 
-  if (view_number == 0 && !fgGetBool("/sim/view/internal")) {
+  if (view_number == 0 && !is_internal) {
     _aircraft->setVisible(false);
   } else {
     _aircraft->setVisible(true);
@@ -110,8 +116,8 @@ 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) {
+  bool is_internal = globals->get_current_view()->getInternal();
+  if (_aircraft->getVisible() && is_internal) {
     glClearDepth(1);
     glClear(GL_DEPTH_BUFFER_BIT);
     ssgSetNearFar(_nearplane, _farplane);