- move exception handling from init() and childAdded() to add_model()

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

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 0928b2c64d113252b69ba2deb73acaa34d084222..0ec617b0b4b9486976681f82292b7346613c50d8 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -11,10 +11,8 @@
 
 #include <vector>
 
-#include <plib/ssg.h>
-
 #include <simgear/scene/model/placement.hxx>
-#include <simgear/scene/model/model.hxx>
+#include <simgear/scene/model/modellib.hxx>
 #include <simgear/structure/exception.hxx>
 
 #include <Main/fg_props.hxx>
@@ -25,11 +23,13 @@
 
 SG_USING_STD(vector);
 
+// OSGFIXME
+// extern SGShadowVolume *shadows;
+
 
 FGModelMgr::FGModelMgr ()
   : _models(fgGetNode("/models", true)),
     _listener(new Listener(this))
-
 {
   _models->addChangeListener(_listener);
 }
@@ -41,7 +41,7 @@ FGModelMgr::~FGModelMgr ()
 
   for (unsigned int i = 0; i < _instances.size(); i++) {
     globals->get_scenery()->get_scene_graph()
-      ->removeKid(_instances[i]->model->getSceneGraph());
+      ->removeChild(_instances[i]->model->getSceneGraph());
     delete _instances[i];
   }
 }
@@ -51,13 +51,8 @@ FGModelMgr::init ()
 {
   vector<SGPropertyNode_ptr> model_nodes = _models->getChildren("model");
 
-  for (unsigned int i = 0; i < model_nodes.size(); i++) {
-    try {
+  for (unsigned int i = 0; i < model_nodes.size(); i++)
       add_model(model_nodes[i]);
-    } catch (const sg_throwable& t) {
-      SG_LOG(SG_GENERAL, SG_ALERT, t.getFormattedMessage() << t.getOrigin());
-    }
-  }
 }
 
 void
@@ -69,12 +64,23 @@ FGModelMgr::add_model (SGPropertyNode * node)
   SGModelPlacement *model = new SGModelPlacement;
   instance->model = model;
   instance->node = node;
-  ssgBranch *object
-      = sgLoad3DModel( globals->get_fg_root(),
-                       node->getStringValue("path",
-                                            "Models/Geometry/glider.ac"),
-                       globals->get_props(),
-                       globals->get_sim_time_sec() );
+  SGModelLib *model_lib = globals->get_model_lib();
+
+  const char *path = node->getStringValue("path", "Models/Geometry/glider.ac");
+  osg::Node *object;
+
+  try {
+    object = model_lib->load_model(
+        globals->get_fg_root(),
+        path,
+        globals->get_props(),
+        globals->get_sim_time_sec(), /*cache_object=*/false);
+  } catch (const sg_throwable& t) {
+    SG_LOG(SG_GENERAL, SG_ALERT, "Error loading " << path << ":\n  "
+        << t.getFormattedMessage() << t.getOrigin());
+    return;
+  }
+
   model->init( object );
 
                                // Set position and orientation either
@@ -117,10 +123,7 @@ FGModelMgr::add_model (SGPropertyNode * node)
     model->setHeadingDeg(node->getDoubleValue("heading-deg"));
 
                        // Add this model to the global scene graph
-  globals->get_scenery()->get_scene_graph()->addKid(model->getSceneGraph());
-
-  // Register that one at the scenery manager
-  globals->get_scenery()->register_placement_transform(model->getTransform());
+  globals->get_scenery()->get_scene_graph()->addChild(model->getSceneGraph());
 
 
                        // Save this instance for updating
@@ -161,6 +164,13 @@ FGModelMgr::update (double dt)
       model->setHeadingDeg(instance->heading_deg_node->getDoubleValue());
 
     instance->model->update();
+
+    // OSGFIXME
+//     if (shadows && !instance->shadow) {
+//       osg::Node *branch = instance->model->getSceneGraph();
+//       shadows->addOccluder(branch, SGShadowVolume::occluderTypeTileObject);
+//       instance->shadow = true;
+//     }
   }
 }
 
@@ -183,14 +193,6 @@ FGModelMgr::remove_instance (Instance * instance)
     }
 }
 
-void
-FGModelMgr::draw ()
-{
-//   ssgSetNearFar(_nearplane, _farplane);
-//   ssgCullAndDraw(_scene);
-}
-
-
 \f
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGModelMgr::Instance
@@ -204,15 +206,13 @@ FGModelMgr::Instance::Instance ()
     elev_ft_node(0),
     roll_deg_node(0),
     pitch_deg_node(0),
-    heading_deg_node(0)
+    heading_deg_node(0),
+    shadow(false)
 {
 }
 
 FGModelMgr::Instance::~Instance ()
 {
-  // Unregister that one at the scenery manager
-  globals->get_scenery()->unregister_placement_transform(model->getTransform());
-
   delete model;
 }
 
@@ -225,14 +225,10 @@ FGModelMgr::Instance::~Instance ()
 void
 FGModelMgr::Listener::childAdded(SGPropertyNode * parent, SGPropertyNode * child)
 {
-  if (strcmp(parent->getName(), "model") || strcmp(child->getName(), "add"))
+  if (strcmp(parent->getName(), "model") || strcmp(child->getName(), "load"))
     return;
 
-  try {
-    _mgr->add_model(parent);
-  } catch (const sg_throwable& t) {
-    SG_LOG(SG_GENERAL, SG_ALERT, t.getFormattedMessage() << t.getOrigin());
-  }
+  _mgr->add_model(parent);
 }
 
 void
@@ -251,8 +247,11 @@ FGModelMgr::Listener::childRemoved(SGPropertyNode * parent, SGPropertyNode * chi
       continue;
 
     _mgr->_instances.erase(it);
-    globals->get_scenery()->get_scene_graph()
-        ->removeKid(instance->model->getSceneGraph());
+    osg::Node *branch = instance->model->getSceneGraph();
+    // OSGFIXME
+//     if (shadows && instance->shadow)
+//         shadows->deleteOccluder(branch);
+    globals->get_scenery()->get_scene_graph()->removeChild(branch);
 
     delete instance;
     break;