Don't restore initial screen geometry because there is nothing in fg_os* to resize...

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

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 86ae8c23baa340ae7835b775cd1867ae1b825c45..bc69ad7a0e0034ed23c9dfd78d8e706153272410 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -14,7 +14,8 @@
 #include <plib/ssg.h>
 
 #include <simgear/scene/model/placement.hxx>
-#include <simgear/scene/model/model.hxx>
+#include <simgear/scene/model/modellib.hxx>
+#include <simgear/scene/model/shadowvolume.hxx>
 #include <simgear/structure/exception.hxx>
 
 #include <Main/fg_props.hxx>
@@ -25,6 +26,8 @@
 
 SG_USING_STD(vector);
 
+extern SGShadowVolume *shadows;
+
 
 FGModelMgr::FGModelMgr ()
   : _models(fgGetNode("/models", true)),
@@ -40,7 +43,7 @@ FGModelMgr::~FGModelMgr ()
   delete _listener;
 
   for (unsigned int i = 0; i < _instances.size(); i++) {
-    globals->get_scenery()->get_models_branch()
+    globals->get_scenery()->get_scene_graph()
       ->removeKid(_instances[i]->model->getSceneGraph());
     delete _instances[i];
   }
@@ -69,13 +72,16 @@ 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();
+  ssgBranch *object = (ssgBranch *)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 );
+  shadows->addOccluder((ssgBranch *)object, SGShadowVolume::occluderTypeTileObject);
 
                                // Set position and orientation either
                                // indirectly through property refs
@@ -225,7 +231,7 @@ 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 {
@@ -251,8 +257,9 @@ FGModelMgr::Listener::childRemoved(SGPropertyNode * parent, SGPropertyNode * chi
       continue;
 
     _mgr->_instances.erase(it);
-    globals->get_scenery()->get_scene_graph()
-        ->removeKid(instance->model->getSceneGraph());
+    ssgBranch *branch = (ssgBranch *)instance->model->getSceneGraph();
+    shadows->deleteOccluder(branch);
+    globals->get_scenery()->get_scene_graph()->removeKid(branch);
 
     delete instance;
     break;