Changeset 127

Timestamp:

Sep 5, 2010, 8:56:56 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• include/core/visual_core.h (modified) (1 diff)
• src/core/visual_core.cpp (modified) (4 diffs)

osgVisual/include/core/visual_core.h

@@ -108 +108 @@
         void parseConfigFile(osg::ArgumentParser& arguments_);
         void checkXMLNode(xmlNode * a_node);
+        void parseModule(xmlNode * a_node);
         void parseScenery(xmlNode * a_node);
         bool loadTerrain(osg::ArgumentParser& arguments_);

osgVisual/src/core/visual_core.cpp

@@ -82 +82 @@
         loadTerrain(arguments);
 
+        // create the windows and run the threads.
+        viewer->realize();
+
+        // setup scenery
+        setupScenery();
+
+        // parse Configuration file
+        parseConfigFile(arguments);
+
         // All modules are initialized - now check arguments for any unused parameter.
         checkCommandlineArgumentsForFinalErrors();
-
-        // create the windows and run the threads.
-        viewer->realize();
-
-        // setup scenery
-        setupScenery();
 
         // Run visual main loop
@@ -253 +256 @@
 void visual_core::parseConfigFile(osg::ArgumentParser& arguments_)
 {
+        configFileValid = false;
+
         std::string filename;
         if( arguments.read("-c", filename) || arguments.read("--config", filename) )
         {
+                OSG_ALWAYS << "Using configuration file.." << std::endl;
                 if( osgDB::fileExists(filename) )
                 {
@@ -274 +280 @@
 
                                 // Parse the XML document.
-
+                                checkXMLNode(root_element);
 
                                 // free the document
@@ -291 +297 @@
 void visual_core::checkXMLNode(xmlNode * a_node)
 {
-
+  for (xmlNode *cur_node = a_node; cur_node; cur_node = cur_node->next)
+        {
+                std::string node_name=reinterpret_cast<const char*>(cur_node->name);
+                if(cur_node->type == XML_ELEMENT_NODE && node_name == "osgvisualconfiguration")
+                {
+                        OSG_DEBUG << "XML node osgvisualconfiguration found" << std::endl;
+                        configFileValid = true;
+                        // Iterate to the next nodes to configure modules and scenery.
+                        checkXMLNode(cur_node->children);               
+                }
+
+        if (cur_node->type == XML_ELEMENT_NODE && node_name == "module")
+                {
+                        OSG_DEBUG << "XML node module found" << std::endl;
+
+                        parseModule(cur_node);
+        
+            //OSG_DEBUG << "node type=Element, name:" << cur_node->name << std::endl;
+                        //OSG_DEBUG << "Processing children at " << cur_node->children << std::endl;
+        }       // IF(module) END
+
+                if (cur_node->type == XML_ELEMENT_NODE && node_name == "scenery")
+                {
+                        OSG_DEBUG << "XML node scenery found" << std::endl;
+
+                        parseScenery(cur_node);
+        
+            //OSG_DEBUG << "node type=Element, name:" << cur_node->name << std::endl;
+                        //OSG_DEBUG << "Processing children at " << cur_node->children << std::endl;
+        }       // IF(scenery) END
+    }   // FOR END
+}
+
+void visual_core::parseModule(xmlNode * a_node)
+{
+OSG_ALWAYS << "parseModule()" << std::endl;
 }
 
 void visual_core::parseScenery(xmlNode * a_node)
 {
-
+OSG_ALWAYS << "parseScenery()" << std::endl;
 }