X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FModel%2Fmodelmgr.cxx;h=2e6ad72bcdaf19b498301a6f7503859cd14c1d7f;hb=edfc06119afc178c34f738565555e6aac599b6c1;hp=561f3df8a3db27083cf504953b668542fcdeb24d;hpb=b0f9d24f9dbab9eb2de07c48e8bfe48f3851d7e4;p=flightgear.git

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 561f3df8a..2e6ad72bc 100644
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -3,13 +3,22 @@
 //
 // This file is in the Public Domain, and comes with no warranty.
 
+#ifdef _MSC_VER
+#  pragma warning( disable: 4355 )
+#endif
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
 #include <simgear/compiler.h>
 
+#include <algorithm>
+#include <functional>
 #include <vector>
+#include <cstring>
+
+#include <osg/Math>
 
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/scene/model/modellib.hxx>
@@ -21,12 +30,13 @@
 
 #include "modelmgr.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
+
+using namespace simgear;
 
 // OSGFIXME
 // extern SGShadowVolume *shadows;
 
-
 FGModelMgr::FGModelMgr ()
   : _models(fgGetNode("/models", true)),
     _listener(new Listener(this))
@@ -51,13 +61,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
@@ -65,17 +70,22 @@ FGModelMgr::add_model (SGPropertyNode * node)
 {
   SG_LOG(SG_GENERAL, SG_INFO,
          "Adding model " << node->getStringValue("name", "[unnamed]"));
+
+  const char *path = node->getStringValue("path", "Models/Geometry/glider.ac");
+  osg::Node *object;
+
+  try {
+    object = SGModelLib::loadPagedModel(path, globals->get_props());
+  } catch (const sg_throwable& t) {
+    SG_LOG(SG_GENERAL, SG_ALERT, "Error loading " << path << ":\n  "
+        << t.getFormattedMessage() << t.getOrigin());
+    return;
+  }
+  
   Instance * instance = new Instance;
   SGModelPlacement *model = new SGModelPlacement;
   instance->model = model;
   instance->node = node;
-  SGModelLib *model_lib = globals->get_model_lib();
-  osg::Node *object = model_lib->load_model(
-      globals->get_fg_root(),
-      node->getStringValue("path",
-                           "Models/Geometry/glider.ac"),
-      globals->get_props(),
-      globals->get_sim_time_sec(), /*cache_object=*/false);
 
   model->init( object );
 
@@ -121,9 +131,6 @@ FGModelMgr::add_model (SGPropertyNode * node)
       			// Add this model to the global scene graph
   globals->get_scenery()->get_scene_graph()->addChild(model->getSceneGraph());
 
-  // Register that one at the scenery manager
-  globals->get_scenery()->register_placement_transform(model->getTransform());
-
 
       			// Save this instance for updating
   add_instance(instance);
@@ -139,38 +146,70 @@ FGModelMgr::unbind ()
 {
 }
 
+namespace
+{
+double testNan(double val) throw (sg_range_exception)
+{
+    if (osg::isNaN(val))
+        throw sg_range_exception("value is nan");
+    return val;
+}
+
+struct UpdateFunctor : public std::unary_function<FGModelMgr::Instance*, void>
+{
+    void operator()(FGModelMgr::Instance* instance) const
+    {
+        SGModelPlacement* model = instance->model;
+        double lon, lat, elev, roll, pitch, heading;
+
+        try {
+            // Optionally set position from properties
+            if (instance->lon_deg_node != 0)
+                lon = testNan(instance->lon_deg_node->getDoubleValue());
+            if (instance->lat_deg_node != 0)
+                lat = testNan(instance->lat_deg_node->getDoubleValue());
+            if (instance->elev_ft_node != 0)
+                elev = testNan(instance->elev_ft_node->getDoubleValue());
+
+            // Optionally set orientation from properties
+            if (instance->roll_deg_node != 0)
+                roll = testNan(instance->roll_deg_node->getDoubleValue());
+            if (instance->pitch_deg_node != 0)
+                pitch = testNan(instance->pitch_deg_node->getDoubleValue());
+            if (instance->heading_deg_node != 0)
+                heading = testNan(instance->heading_deg_node->getDoubleValue());
+        } catch (const sg_range_exception&) {
+            const char *path = instance->node->getStringValue("path",
+                                                              "unknown");
+            SG_LOG(SG_GENERAL, SG_INFO, "Instance of model " << path
+                   << " has invalid values");
+            return;
+        }
+        // Optionally set position from properties
+        if (instance->lon_deg_node != 0)
+            model->setLongitudeDeg(lon);
+        if (instance->lat_deg_node != 0)
+            model->setLatitudeDeg(lat);
+        if (instance->elev_ft_node != 0)
+            model->setElevationFt(elev);
+
+        // Optionally set orientation from properties
+        if (instance->roll_deg_node != 0)
+            model->setRollDeg(roll);
+        if (instance->pitch_deg_node != 0)
+            model->setPitchDeg(pitch);
+        if (instance->heading_deg_node != 0)
+            model->setHeadingDeg(heading);
+
+        instance->model->update();
+    }
+};
+}
+
 void
 FGModelMgr::update (double dt)
 {
-  for (unsigned int i = 0; i < _instances.size(); i++) {
-    Instance * instance = _instances[i];
-    SGModelPlacement * model = instance->model;
-
-				// Optionally set position from properties
-    if (instance->lon_deg_node != 0)
-      model->setLongitudeDeg(instance->lon_deg_node->getDoubleValue());
-    if (instance->lat_deg_node != 0)
-      model->setLatitudeDeg(instance->lat_deg_node->getDoubleValue());
-    if (instance->elev_ft_node != 0)
-      model->setElevationFt(instance->elev_ft_node->getDoubleValue());
-
-				// Optionally set orientation from properties
-    if (instance->roll_deg_node != 0)
-      model->setRollDeg(instance->roll_deg_node->getDoubleValue());
-    if (instance->pitch_deg_node != 0)
-      model->setPitchDeg(instance->pitch_deg_node->getDoubleValue());
-    if (instance->heading_deg_node != 0)
-      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;
-//     }
-  }
+    std::for_each(_instances.begin(), _instances.end(), UpdateFunctor());
 }
 
 void
@@ -212,9 +251,6 @@ FGModelMgr::Instance::Instance ()
 
 FGModelMgr::Instance::~Instance ()
 {
-  // Unregister that one at the scenery manager
-  globals->get_scenery()->unregister_placement_transform(model->getTransform());
-
   delete model;
 }
 
@@ -230,11 +266,7 @@ FGModelMgr::Listener::childAdded(SGPropertyNode * parent, SGPropertyNode * child
   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