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 4d299fbabe8fc150e8c1ceb237d62df03c1ec9fb..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,11 +26,12 @@
 
 SG_USING_STD(vector);
 
+extern SGShadowVolume *shadows;
+
 
 FGModelMgr::FGModelMgr ()
   : _models(fgGetNode("/models", true)),
-    _listener(new Listener(this)),
-    _selector(new ssgSelector)
+    _listener(new Listener(this))
 
 {
   _models->addChangeListener(_listener);
@@ -41,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 +71,17 @@ FGModelMgr::add_model (SGPropertyNode * node)
   Instance * instance = new Instance;
   SGModelPlacement *model = new SGModelPlacement;
   instance->model = model;
-  ssgBranch *object
-      = sgLoad3DModel( globals->get_fg_root(),
-                       node->getStringValue("path",
-                                            "Models/Geometry/glider.ac"),
-                       globals->get_props(),
-                       globals->get_sim_time_sec() );
+  instance->node = node;
+  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
@@ -198,6 +204,7 @@ FGModelMgr::draw ()
 
 FGModelMgr::Instance::Instance ()
   : model(0),
+    node(0),
     lon_deg_node(0),
     lat_deg_node(0),
     elev_ft_node(0),
@@ -224,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 {
@@ -234,4 +241,29 @@ FGModelMgr::Listener::childAdded(SGPropertyNode * parent, SGPropertyNode * child
   }
 }
 
+void
+FGModelMgr::Listener::childRemoved(SGPropertyNode * parent, SGPropertyNode * child)
+{
+  if (strcmp(parent->getName(), "models") || strcmp(child->getName(), "model"))
+    return;
+
+  // search instance by node and remove it from scenegraph
+  vector<Instance *>::iterator it = _mgr->_instances.begin();
+  vector<Instance *>::iterator end = _mgr->_instances.end();
+
+  for (; it != end; ++it) {
+    Instance *instance = *it;
+    if (instance->node != child)
+      continue;
+
+    _mgr->_instances.erase(it);
+    ssgBranch *branch = (ssgBranch *)instance->model->getSceneGraph();
+    shadows->deleteOccluder(branch);
+    globals->get_scenery()->get_scene_graph()->removeKid(branch);
+
+    delete instance;
+    break;
+  }
+}
+
 // end of modelmgr.cxx