X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2Fmodelmgr.cxx;h=46ed240f4c8d2f17c7e3d17a4e099bc8d484ad0c;hb=e600cd3d000723b7b7fd4557ad72cfe971daf423;hp=2e6ad72bcdaf19b498301a6f7503859cd14c1d7f;hpb=9c98258ab08b48420c86cf09c0f6ba9d1ff82700;p=flightgear.git

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 2e6ad72bc..46ed240f4 100644
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -18,8 +18,6 @@
 #include <vector>
 #include <cstring>
 
-#include <osg/Math>
-
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/structure/exception.hxx>
@@ -68,47 +66,46 @@ FGModelMgr::init ()
 void
 FGModelMgr::add_model (SGPropertyNode * node)
 {
-  SG_LOG(SG_GENERAL, SG_INFO,
+  SG_LOG(SG_AIRCRAFT, SG_INFO,
          "Adding model " << node->getStringValue("name", "[unnamed]"));
 
-  const char *path = node->getStringValue("path", "Models/Geometry/glider.ac");
+  const char *model_path = node->getStringValue("path", "Models/Geometry/glider.ac");
   osg::Node *object;
 
   try {
-    object = SGModelLib::loadPagedModel(path, globals->get_props());
+      std::string fullPath = simgear::SGModelLib::findDataFile(model_path);
+      object = SGModelLib::loadDeferredModel(fullPath, globals->get_props());
   } catch (const sg_throwable& t) {
-    SG_LOG(SG_GENERAL, SG_ALERT, "Error loading " << path << ":\n  "
+    SG_LOG(SG_AIRCRAFT, SG_ALERT, "Error loading " << model_path << ":\n  "
         << t.getFormattedMessage() << t.getOrigin());
     return;
   }
-  
+
   Instance * instance = new Instance;
   SGModelPlacement *model = new SGModelPlacement;
   instance->model = model;
   instance->node = node;
 
   model->init( object );
-
-				// Set position and orientation either
-				// indirectly through property refs
-				// or directly with static values.
+    double lon = node->getDoubleValue("longitude-deg"),
+        lat = node->getDoubleValue("latitude-deg"),
+        elevFt = node->getDoubleValue("elevation-ft");
+
+    model->setPosition(SGGeod::fromDegFt(lon, lat, elevFt));
+// Set position and orientation either
+// indirectly through property refs
+// or directly with static values.
   SGPropertyNode * child = node->getChild("longitude-deg-prop");
   if (child != 0)
     instance->lon_deg_node = fgGetNode(child->getStringValue(), true);
-  else
-    model->setLongitudeDeg(node->getDoubleValue("longitude-deg"));
 
   child = node->getChild("latitude-deg-prop");
   if (child != 0)
     instance->lat_deg_node = fgGetNode(child->getStringValue(), true);
-  else
-    model->setLatitudeDeg(node->getDoubleValue("latitude-deg"));
 
   child = node->getChild("elevation-ft-prop");
   if (child != 0)
     instance->elev_ft_node = fgGetNode(child->getStringValue(), true);
-  else
-    model->setElevationFt(node->getDoubleValue("elevation-ft"));
 
   child = node->getChild("roll-deg-prop");
   if (child != 0)
@@ -150,7 +147,7 @@ namespace
 {
 double testNan(double val) throw (sg_range_exception)
 {
-    if (osg::isNaN(val))
+    if (SGMisc<double>::isNaN(val))
         throw sg_range_exception("value is nan");
     return val;
 }
@@ -160,17 +157,19 @@ 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;
-
+        double roll, pitch, heading;
+        roll = pitch = heading = 0.0;
+        SGGeod pos = model->getPosition();
+        
         try {
             // Optionally set position from properties
             if (instance->lon_deg_node != 0)
-                lon = testNan(instance->lon_deg_node->getDoubleValue());
+                pos.setLongitudeDeg(testNan(instance->lon_deg_node->getDoubleValue()));
             if (instance->lat_deg_node != 0)
-                lat = testNan(instance->lat_deg_node->getDoubleValue());
+                pos.setLatitudeDeg(testNan(instance->lat_deg_node->getDoubleValue()));
             if (instance->elev_ft_node != 0)
-                elev = testNan(instance->elev_ft_node->getDoubleValue());
-
+                pos.setElevationFt(testNan(instance->elev_ft_node->getDoubleValue()));
+            
             // Optionally set orientation from properties
             if (instance->roll_deg_node != 0)
                 roll = testNan(instance->roll_deg_node->getDoubleValue());
@@ -181,18 +180,12 @@ struct UpdateFunctor : public std::unary_function<FGModelMgr::Instance*, void>
         } catch (const sg_range_exception&) {
             const char *path = instance->node->getStringValue("path",
                                                               "unknown");
-            SG_LOG(SG_GENERAL, SG_INFO, "Instance of model " << path
+            SG_LOG(SG_AIRCRAFT, 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);
 
+        model->setPosition(pos);
         // Optionally set orientation from properties
         if (instance->roll_deg_node != 0)
             model->setRollDeg(roll);