From f3cdd7d44a4a02a16f73a6c5b55b4984fcff015d Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Mon, 20 Mar 2006 16:38:31 +0000
Subject: [PATCH] allow to add models at runtime
---
src/Model/modelmgr.cxx | 31 ++++++++++++++++++++++++++++---
src/Model/modelmgr.hxx | 17 +++++++++++++++++
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 3e2b08638..4d299fbab 100644
--- 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;
}
+
+
+////////////////////////////////////////////////////////////////////////
+// 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 073598fb1..0bb286b5d 100644
--- 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;