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

Timestamp:

Nov 9, 2010, 10:37:40 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

File:

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

osgVisual/src/distortion/visual_distortion.cpp

@@ -49 +49 @@
         if(config)
         {
-        
+                OSG_NOTIFY( osg::ALWAYS ) << "Using distortion." << std::endl;
+
                 xmlNode* a_node = config->children;
 
@@ -55 +56 @@
                 {
                         std::string node_name=reinterpret_cast<const char*>(cur_node->name);
-                        OSG_ALWAYS << "----visual_distortion::processXMLConfiguration() - node type="<< cur_node->type <<", name=" << cur_node->name << std::endl;
+                        //OSG_ALWAYS << "----visual_distortion::processXMLConfiguration() - node type="<< cur_node->type <<", name=" << cur_node->name << std::endl;
 
                         // Check for distortion node
@@ -68 +69 @@
                                         {
                                                 std::string  channelname = attr_value;
-                                                OSG_NOTIFY(osg::ALWAYS) << "channelname:" << channelname << std::endl;
+                                                OSG_NOTIFY(osg::ALWAYS) << "visual_distortion: Channelname:" << channelname << std::endl;
 
                                                 std::string pre_cfg("..\\resources\\distortion\\view_");
@@ -136 +137 @@
                                                 distortMapFileName = attr_value;
                                         }
-
                                         attr = attr->next; 
                                 }
@@ -153 +153 @@
                                                 blendMapFileName = attr_value;
                                         }
-
                                         attr = attr->next; 
                                 }
@@ -159 +158 @@
                 }       // FOR all nodes END
 
-
+                // clean up
+                xmlFreeDoc(tmpDoc); xmlCleanupParser();
+                return true;
         }       // IF Config valid END
         else
-                OSG_WARN << "ERROR: visual_distortion::processXMLConfiguration() - Invalid module configuration!" << std::endl;
-
-
-
-        // clean up
-        if(tmpDoc)
-        {
-                xmlFreeDoc(tmpDoc); xmlCleanupParser();
-                return true;
+        {
+                OSG_WARN << "WARNING: visual_distortion::processXMLConfiguration() - Module configuration not found or module disabled!" << std::endl;
+                return false;
         }
+
+
 
         return true;
@@ -191 +188 @@
 
         // Process XML configuration
-        processXMLConfiguration();
+        if(!processXMLConfiguration())
+                return NULL;    // Abort distortion initialization.
 
         // Add this node to the scenegraph to get updated during update traversal.