Build fix for Windows, without it, Windows

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

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index d1dc1bed5ad1f77fbf85975c8b9352bd81d05907..90a70f8f6bc158d5912f7a72addc90e9d6cd9cb5 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -16,14 +16,16 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/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 <Scenery/scenery.hxx>
 
+#include "model_panel.hxx"
+
 #include "acmodel.hxx"
-#include "model.hxx"
 
 
 \f
@@ -51,8 +53,23 @@ FGAircraftModel::~FGAircraftModel ()
 void 
 FGAircraftModel::init ()
 {
-  _aircraft = new FG3DModel;
-  _aircraft->init(fgGetString("/sim/model/path", "Models/Geometry/glider.ac"));
+  _aircraft = new SGModelPlacement;
+  string path = fgGetString("/sim/model/path", "Models/Geometry/glider.ac");
+  try {
+    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.)");
+    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());
   globals->get_scenery()->get_aircraft_branch()->addKid(_selector);
@@ -87,7 +104,7 @@ FGAircraftModel::update (double dt)
   _aircraft->setOrientation(fgGetDouble("/orientation/roll-deg"),
                            fgGetDouble("/orientation/pitch-deg"),
                            fgGetDouble("/orientation/heading-deg"));
-  _aircraft->update(dt);
+  _aircraft->update( globals->get_scenery()->get_center() );
 
 }