Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index f178b26e9c29f2bdf371c7ab7c4ea1314b250df8..432b3186251deb94d66a968889c6b2d9a6e40443 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -10,11 +10,11 @@
 #include <plib/ssg.h>
 
 #include <simgear/scene/model/placement.hxx>
+#include <simgear/scene/model/model.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Scenery/scenery.hxx>
 
-#include "model.hxx"
 
 #include "modelmgr.hxx"
 
@@ -45,10 +45,10 @@ FGModelMgr::init ()
     SG_LOG(SG_GENERAL, SG_INFO,
           "Adding model " << node->getStringValue("name", "[unnamed]"));
     Instance * instance = new Instance;
-    FGModelPlacement *model = new FGModelPlacement;
+    SGModelPlacement *model = new SGModelPlacement;
     instance->model = model;
     ssgBranch *object
-        = fgLoad3DModel( globals->get_fg_root(),
+        = sgLoad3DModel( globals->get_fg_root(),
                          node->getStringValue("path",
                                               "Models/Geometry/glider.ac"),
                          globals->get_props(),
@@ -117,7 +117,7 @@ FGModelMgr::update (double dt)
 {
   for (unsigned int i = 0; i < _instances.size(); i++) {
     Instance * instance = _instances[i];
-    FGModelPlacement * model = instance->model;
+    SGModelPlacement * model = instance->model;
 
                                // Optionally set position from properties
     if (instance->lon_deg_node != 0)