allow to add models at runtime

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 3e2b08638fb5d8c5f723ab1d4c337a60df336e95..4d299fbabe8fc150e8c1ceb237d62df03c1ec9fb 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -27,12 +27,19 @@ SG_USING_STD(vector);
 
 
 FGModelMgr::FGModelMgr ()
-  : _selector(new ssgSelector)
+  : _models(fgGetNode("/models", true)),
+    _listener(new Listener(this)),
+    _selector(new ssgSelector)
+
 {
+  _models->addChangeListener(_listener);
 }
 
 FGModelMgr::~FGModelMgr ()
 {
+  _models->removeChangeListener(_listener);
+  delete _listener;
+
   for (unsigned int i = 0; i < _instances.size(); i++) {
     globals->get_scenery()->get_models_branch()
       ->removeKid(_instances[i]->model->getSceneGraph());
@@ -43,8 +50,7 @@ FGModelMgr::~FGModelMgr ()
 void
 FGModelMgr::init ()
 {
-  vector<SGPropertyNode_ptr> model_nodes =
-    fgGetNode("/models", true)->getChildren("model");
+  vector<SGPropertyNode_ptr> model_nodes = _models->getChildren("model");
 
   for (unsigned int i = 0; i < model_nodes.size(); i++) {
     try {
@@ -209,4 +215,23 @@ FGModelMgr::Instance::~Instance ()
   delete model;
 }
 
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Implementation of FGModelMgr::Listener
+////////////////////////////////////////////////////////////////////////
+
+void
+FGModelMgr::Listener::childAdded(SGPropertyNode * parent, SGPropertyNode * child)
+{
+  if (strcmp(parent->getName(), "model") || strcmp(child->getName(), "add"))
+    return;
+
+  try {
+    _mgr->add_model(parent);
+  } catch (const sg_throwable& t) {
+    SG_LOG(SG_GENERAL, SG_ALERT, t.getFormattedMessage() << t.getOrigin());
+  }
+}
+
 // end of modelmgr.cxx

diff --git a/src/Model/modelmgr.hxx b/src/Model/modelmgr.hxx
index 073598fb147bd2a7c8e10922cbda9d5f0016cfb3..0bb286b5de81a8c2cd929c33f4deb1a59974b8b7 100644 (file)
--- a/src/Model/modelmgr.hxx
+++ b/src/Model/modelmgr.hxx
@@ -88,7 +88,24 @@ public:
 
   virtual void draw ();
 
+
+
 private:
+  /**
+   * Listener class that adds models at runtime.
+   */
+  class Listener : public SGPropertyChangeListener
+  {
+  public:
+    Listener(FGModelMgr *mgr) : _mgr(mgr) {}
+    virtual void childAdded (SGPropertyNode * parent, SGPropertyNode * child);
+
+  private:
+    FGModelMgr * _mgr;
+  };
+
+  SGPropertyNode_ptr _models;
+  Listener * _listener;
 
   vector<Instance *> _instances;