Changeset 144 for osgVisual/src/core

Timestamp:

Nov 1, 2010, 6:24:56 PM (14 years ago)

Author:

Torben Dannhauer

Message:

start to move osgVisual from argument based configuratiobn to xml file based configuration

File:

• osgVisual/src/core/visual_core.cpp (modified) (7 diffs)

osgVisual/src/core/visual_core.cpp

@@ -34 +34 @@
         OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_core..." << std::endl;
 
+        // Check for config file to provide it to all modules during initialization.
+        if( arguments.read("-c", configFilename) || arguments.read("--config", configFilename) )
+        {
+                if( !osgDB::fileExists(configFilename) )
+                        configFilename = "";
+                else
+                        OSG_ALWAYS << "Using configuration file: " << configFilename << std::endl;
+        }
+
+xmlDoc* tmpDoc;
+util::getModuleXMLConfig( configFilename, "core", tmpDoc );
+if(tmpDoc)
+{
+        xmlFreeDoc(tmpDoc); xmlCleanupParser();
+}
+
+
         // Configure osg to use KdTrees
         osgDB::Registry::instance()->setBuildKdTreesHint(osgDB::ReaderWriter::Options::BUILD_KDTREES);
@@ -63 +80 @@
         // Initialize distortion
         OSG_NOTIFY( osg::ALWAYS ) << "Using distortion." << std::endl;
-        distortion = new visual_distortion( viewer, arguments );
+        distortion = new visual_distortion( viewer, arguments, configFilename );
         distortion->initialize( rootNode, viewer->getCamera()->getClearColor() );
         distortedSceneGraph = distortion->getDistortedSceneGraph();
@@ -70 +87 @@
 #ifdef USE_SKY_SILVERLINING
         // Initialize sky
-        sky = new visual_skySilverLining( viewer );
-        sky->init(distortedSceneGraph, rootNode);       // Without distortedSceneGraph=NULL
+        sky = new visual_skySilverLining( viewer, configFilename );
+        sky->init(distortedSceneGraph, rootNode);       // Without distortion: distortedSceneGraph=NULL
 #endif
 
         // Initialize DataIO interface
-        visual_dataIO::getInstance()->init(viewer, arguments);
-
-        // Add manipulators for user interaction - after dataIO to be able to skip it in slaves.
+        visual_dataIO::getInstance()->init(viewer, arguments, configFilename);
+
+        // Add manipulators for user interaction - after dataIO to be able to skip it in slaves rendering machines.
         addManipulators();
 
@@ -258 +275 @@
 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) )
+        if( configFilename != "" )
+        {
+                xmlDoc *doc = NULL;
+                xmlNode *root_element = NULL;
+                
+                doc = xmlReadFile(configFilename.c_str(), NULL, 0);
+                if (doc == NULL)
                 {
-                        configFileValid = false;
-                        xmlDoc *doc = NULL;
-                        xmlNode *root_element = NULL;
-                        
-                        doc = xmlReadFile(filename.c_str(), NULL, 0);
-                        if (doc == NULL)
-                        {
-                                configFileValid = false;
-                                OSG_ALWAYS << "visual_core::parseConfigFile() - ERROR: could not parse osgVisual config file" << filename  << std::endl;
-                        }
-                        else
-                        {
-                                //  Get the root element node
-                                root_element = xmlDocGetRootElement(doc);
-
-                                // Parse the XML document.
-                                checkXMLNode(root_element);
-
-                                // free the document
-                                xmlFreeDoc(doc);;
-                        }
-                        // Free the global variables that may have been allocated by the parser.
-                        xmlCleanupParser();
-
-                        if(!configFileValid)
-                                OSG_ALWAYS << "visual_core::parseConfigFile() - ERROR: XML file seems not to be a valid osgVisual configuration file!" << std::endl;
-
-                }       // IF configfile exists
-        }       // IF -c END
+                        OSG_ALWAYS << "visual_core::parseConfigFile() - ERROR: could not parse osgVisual config file" << configFilename  << std::endl;
+                }
+                else
+                {
+                        //  Get the root element node
+                        root_element = xmlDocGetRootElement(doc);
+
+                        // Parse the XML document.
+                        checkXMLNode(root_element);
+
+                        // free the document
+                        xmlFreeDoc(doc);;
+                }
+                // Free the global variables that may have been allocated by the parser.
+                xmlCleanupParser();
+
+        }       // IF configfile exists
 }
 
@@ -305 +310 @@
                 {
                         OSG_DEBUG << "XML node osgvisualconfiguration found" << std::endl;
-                        configFileValid = true;
+
                         // Iterate to the next nodes to configure modules and scenery.
                         checkXMLNode(cur_node->children);               
@@ -352 +357 @@
                         enabled = false;
 
-                OSG_ALWAYS << "Module '" << name << "' found. Enabled = " << enabled << std::endl;
-
                 attr = attr->next; 
         } 
+        OSG_ALWAYS << "Module '" << name << "' found. Enabled = " << enabled << std::endl;
 
         // Pass the nodes to the corresponding modules...
@@ -412 +416 @@
 
         // Sky settings:        
-        sky->setTime(12,00,23);
+        sky->setTime(15,30,00);
         sky->setVisibility(50000);
-        sky->addWindVolume( 0.0, 15000.0, 50.0, 90.0 );
+        sky->addWindVolume( 0.0, 15000.0, 25.0, 90.0 );
         
         //sky->addCloudLayer( 0, 20000, 20000, 600.0, 1000.0, 0.5, CUMULONIMBUS_CAPPILATUS );
         //sky->addCloudLayer( 1, 5000000, 5000000, 600.0, 7351.0, 0.2, CIRRUS_FIBRATUS );
         //sky->addCloudLayer( 2, 50000, 50000, 600.0, 7351.0, 0.2, CIRROCUMULUS );
-        //sky->addCloudLayer( 3, 50000, 50000, 1300.0, 700.0, 0.07, CUMULUS_CONGESTUS );
-        sky->addCloudLayer( 1, 100000, 100000, 3500.0, 2000.0, 0.60, STRATOCUMULUS );
+        ///sky->addCloudLayer( 2, 100000, 100000, 600.0, 2351.0, 0.75, STRATUS );
+        sky->addCloudLayer( 3, 50000, 50000, 1300.0, 700.0, 0.07, CUMULUS_CONGESTUS );
+        //sky->addCloudLayer( 1, 100000, 100000, 3500.0, 2000.0, 0.50, STRATOCUMULUS );
 
         //sky->setSlotPrecipitation( 1, 0.0, 0.0, 0.0, 25.0 );