Add writeLocalData functions for internal scenegraph classes

[simgear.git] / simgear / scene / model / SGReaderWriterXML.cxx

diff --git a/simgear/scene/model/SGReaderWriterXML.cxx b/simgear/scene/model/SGReaderWriterXML.cxx
index 00c113be0f8b2dfd4eae584ab8db99d789a80a7e..31c0c56dddaf42ad27e0589a78851e9a30cc2539 100644 (file)
--- a/simgear/scene/model/SGReaderWriterXML.cxx
+++ b/simgear/scene/model/SGReaderWriterXML.cxx
@@ -41,6 +41,7 @@
 #include "animation.hxx"
 #include "particles.hxx"
 #include "model.hxx"
+#include "SGText.hxx"
 
 using namespace simgear;
 
@@ -169,7 +170,9 @@ sgLoad3DModel_internal(const string &path,
     }
 
     osg::ref_ptr<SGReaderWriterXMLOptions> options
-    = new SGReaderWriterXMLOptions(*osgDB::Registry::instance()->getOptions());
+    = new SGReaderWriterXMLOptions(*options_);
+    options->setPropRoot(prop_root);
+    options->setLoadPanel(load_panel);
 
     // Assume that textures are in
     // the same location as the XML file.
@@ -230,6 +233,7 @@ sgLoad3DModel_internal(const string &path,
         osg::ref_ptr<SGReaderWriterXMLOptions> options;
         options = new SGReaderWriterXMLOptions(*options_);
         options->setPropRoot(prop_root);
+        options->setLoadPanel(load_panel);
         try {
             submodel = sgLoad3DModel_internal(submodelpath.str(), options.get(),
                                               sub_props->getNode("overlay"));
@@ -302,6 +306,14 @@ sgLoad3DModel_internal(const string &path,
                         options.get()));
     }
 
+    std::vector<SGPropertyNode_ptr> text_nodes;
+    text_nodes = props->getChildren("text");
+    for (unsigned i = 0; i < text_nodes.size(); ++i) {
+        group->addChild(SGText::appendText(text_nodes[i],
+                        prop_root,
+                        options.get()));
+    }
+
     std::vector<SGPropertyNode_ptr> animation_nodes;
     animation_nodes = props->getChildren("animation");
     for (unsigned i = 0; i < animation_nodes.size(); ++i)