Changeset 152 for osgVisual/src/distortion/visual_distortion.cpp

Timestamp:

Nov 9, 2010, 10:56:41 PM (13 years ago)

Author:

Torben Dannhauer

Message:

Silverlining, Distortion now uses XMl configuration file for configuration.

Todo: vista2D and the whole dataIO tree.

File:

• osgVisual/src/distortion/visual_distortion.cpp (modified) (3 diffs)

osgVisual/src/distortion/visual_distortion.cpp

@@ -44 +44 @@
         // Init XML
         xmlDoc* tmpDoc;
-        xmlNode* config = util::getModuleXMLConfig( configFileName, "distortion", tmpDoc );
+        bool disabled;
+        xmlNode* config = util::getModuleXMLConfig( configFileName, "distortion", tmpDoc, disabled );
+
+        if( disabled)
+        {
+                OSG_NOTIFY( osg::ALWAYS ) << "..disabled by XML configuration file." << std::endl;
+                return false;
+        }
         
         // extract configuration values
         if(config)
         {
-                OSG_NOTIFY( osg::ALWAYS ) << "Using distortion." << std::endl;
+                OSG_NOTIFY( osg::ALWAYS ) << "..using distortion." << std::endl;
 
                 xmlNode* a_node = config->children;
@@ -164 +171 @@
         else
         {
-                OSG_WARN << "WARNING: visual_distortion::processXMLConfiguration() - Module configuration not found or module disabled!" << std::endl;
+                OSG_WARN << "ERROR: visual_distortion::processXMLConfiguration() - Module configuration not found" << std::endl;
                 return false;
         }
@@ -175 +182 @@
 osg::Group* visual_distortion::initialize(osg::Group* subgraph, const osg::Vec4& clearColor )
 {
-        OSG_NOTIFY (osg::ALWAYS ) << "visual_distortion initialize..." << std::endl;
+        OSG_NOTIFY (osg::ALWAYS ) << "visual_distortion initialize..";  // The sentence is finished by the init result...
 
         // Initialize variables: