Changeset 186 for osgVisual/trunk/src/dataIO

Timestamp:

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

Author:

Torben Dannhauer

Message:

XML configuration now works also with dataIO extLink

File:

• osgVisual/trunk/src/dataIO/visual_dataIO.cpp (modified) (5 diffs)

osgVisual/trunk/src/dataIO/visual_dataIO.cpp

@@ -54 +54 @@
         viewer = viewer_;
 
-        // Process XML configuration
+        // Process XML configuration - all XML dependen initializations are performed in processXMLConfiguration()
         this->configFileName = configFileName;
-        xmlNode *extLinkConfig=NULL;
-        if(!processXMLConfiguration(extLinkConfig))
+        if(!processXMLConfiguration())
                 OSG_FATAL << "ERROR: visual_dataIO::init() - Failed to initialize dataIO via XML configuration!";
 
-        // Create extLink.
-        #ifdef USE_EXTLINK_DUMMY
-                extLink = new dataIO_extLinkDummy( dataSlots );
-        #endif
-        #ifdef USE_EXTLINK_VCL
-                extLink = new dataIO_extLinkVCL( dataSlots );
-        #endif
-        extLink->init();
-
-        
         // Install callbacks to perform DataIO activities every frame:
         //// EventCallback at the absolute beginning of the frame
@@ -81 +70 @@
 }
 
-bool visual_dataIO::processXMLConfiguration(xmlNode* extLinkConfig_)
+bool visual_dataIO::processXMLConfiguration()
 {
         // Init XML
@@ -87 +76 @@
         bool disabled;
         xmlNode* config = util::getModuleXMLConfig( configFileName, "dataio", tmpDoc, disabled );
-        xmlNode* clusterConfig = NULL;
+        xmlNode* clusterConfig = NULL, *extLinkConfig = NULL;
 
         if( disabled)
@@ -147 +136 @@
                         if(cur_node->type == XML_ELEMENT_NODE && node_name == "extlink")
                         {
-                                // Check Attributes to determine if the dummy implementation or any other implementation must be instantiated
-
-                                // Pass XML attributes to extlink to analyse and configure it by extLink itself
+                                // Pass extLink configuration to the used extLink implementation. 
+                                // The implementation will use the configuration if it matches, otherwise falls back to dummy extLink
+                                extLinkConfig = cur_node;
                         }
 
                 }       // FOR all nodes END
-
 
 
@@ -169 +157 @@
                 }
 
+                // Create extLink.
+                #ifdef USE_EXTLINK_VCL
+                        extLink = new dataIO_extLinkVCL( dataSlots );
+                #endif
+                if( !extLink.valid() || !extLinkConfig || !extLink->init(extLinkConfig) )
+                {
+                        extLink = new dataIO_extLinkDummy( dataSlots );
+                        extLink->init(extLinkConfig);
+                }