Solve for the elevator control input during approach. It turns out that

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

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 2a0ecc5708e63bd55fede784bf3577fe9ecec222..5d7f2afd44e18de53812bce3a278c63ef3509a1c 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -6,6 +6,7 @@
 #include <plib/ssg.h>
 
 #include <Main/fg_props.hxx>
+#include <Scenery/scenery.hxx>
 
 #include "modelmgr.hxx"
 #include "model.hxx"
@@ -18,8 +19,8 @@ FGModelMgr::FGModelMgr ()
 
 FGModelMgr::~FGModelMgr ()
 {
-  for (int i = 0; i < _instances.size(); i++) {
-    globals->get_models_branch()
+  for (unsigned int i = 0; i < _instances.size(); i++) {
+    globals->get_scenery()->get_models_branch()
       ->removeKid(_instances[i]->model->getSceneGraph());
     delete _instances[i];
   }
@@ -28,9 +29,9 @@ FGModelMgr::~FGModelMgr ()
 void
 FGModelMgr::init ()
 {
-  vector<SGPropertyNode *> model_nodes =
+  vector<SGPropertyNode_ptr> model_nodes =
     fgGetNode("/models", true)->getChildren("model");
-  for (int i = 0; i < model_nodes.size(); i++) {
+  for (unsigned int i = 0; i < model_nodes.size(); i++) {
     SGPropertyNode * node = model_nodes[i];
     SG_LOG(SG_GENERAL, SG_INFO,
           "Adding model " << node->getStringValue("name", "[unnamed]"));
@@ -79,7 +80,7 @@ FGModelMgr::init ()
       model->setHeadingDeg(node->getDoubleValue("heading-deg"));
 
                                // Add this model to the global scene graph
-    globals->get_scene_graph()->addKid(model->getSceneGraph());
+    globals->get_scenery()->get_scene_graph()->addKid(model->getSceneGraph());
 
                                // Save this instance for updating
     _instances.push_back(instance);
@@ -97,9 +98,9 @@ FGModelMgr::unbind ()
 }
 
 void
-FGModelMgr::update (int dt)
+FGModelMgr::update (double dt)
 {
-  for (int i = 0; i < _instances.size(); i++) {
+  for (unsigned int i = 0; i < _instances.size(); i++) {
     Instance * instance = _instances[i];
     FG3DModel * model = instance->model;