Changeset 192

Timestamp:

Jan 11, 2011, 8:32:13 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk/src

Files:

• core/visual_core.cpp (modified) (1 diff)
• util/visual_util.cpp (modified) (3 diffs)

osgVisual/trunk/src/core/visual_core.cpp

@@ -187 +187 @@
 bool visual_core::loadTerrain(osg::ArgumentParser& arguments_)
 {
-        osg::ref_ptr<osg::Node> model = osgDB::readNodeFiles(arguments_);
+        osg::ref_ptr<osg::Node> model = osgDB::readNodeFiles(util::getTerrainFromXMLConfig(configFilename));
         if( model.valid() )
         {

osgVisual/trunk/src/util/visual_util.cpp

@@ -464 +464 @@
 }
 
-std::string util::getTerrainFromXMLConfig(std::string configFilename)
+std::vector<std::string> util::getTerrainFromXMLConfig(std::string configFilename)
 {
         xmlDoc* tmpDoc;
         xmlNode* sceneryNode = util::getSceneryXMLConfig(configFilename, tmpDoc);
-        std::string filename = "";
+        std::vector<std::string> filenames;
 
         // Iterate through nodes and search for terrian entry
@@ -482 +482 @@
                                 std::string attr_name=reinterpret_cast<const char*>(attr->name);
                                 std::string attr_value=reinterpret_cast<const char*>(attr->children->content);
-                                if( attr_name == "filename" )
+                                if( attr_name.find("filename") != std::string::npos )
                                 {
-                                        filename = attr_value;
+                                        filenames.push_back(attr_value);
                                 }
                                 attr = attr->next; 
@@ -502 +502 @@
         }
 
-        return filename;
+        return filenames;
 }