Changeset 183 for osgVisual/trunk/src/dataIO

Timestamp:

Jan 7, 2011, 5:41:45 PM (14 years ago)

Author:

Torben Dannhauer

Message:

XML configuration now works also with dataIO cluster

File:

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

osgVisual/trunk/src/dataIO/visual_dataIO.cpp

@@ -49 +49 @@
 void visual_dataIO::init(osgViewer::Viewer* viewer_, osg::ArgumentParser& arguments_, std::string configFileName)
 {
-        OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO initialize.." << std::endl;
+        OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO initialize..";
 
         // Init variables
@@ -56 +56 @@
         // Process XML configuration
         this->configFileName = configFileName;
-        if(!processXMLConfiguration())
+        xmlNode *extLinkConfig=NULL;
+        if(!processXMLConfiguration(extLinkConfig))
                 OSG_FATAL << "ERROR: visual_dataIO::init() - Failed to initialize dataIO via XML configuration!";
-
-
-        // Create Cluster.
-        #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
-                cluster = new dataIO_clusterAsioTcpIostream();
-        #endif 
-        #ifdef USE_CLUSTER_ENET
-                cluster = new dataIO_clusterENet();
-                cluster->enableHardSync( false );       /** \todo : rebuild this structure in cluster.h and move it this way to a general implementation. */
-        #endif
-        #ifdef USE_CLUSTER_DUMMY
-                cluster = new dataIO_clusterDummy();
-        #endif
-        if(cluster.valid())
-                //cluster->init(arguments_, clusterMode, slotContainer, true, false);
-                cluster->init(arguments_, viewer_, clusterMode, slotContainer, false, false);
 
         // Create extLink.
@@ -85 +70 @@
 
         
-
         // Install callbacks to perform DataIO activities every frame:
         //// EventCallback at the absolute beginning of the frame
@@ -97 +81 @@
 }
 
-bool visual_dataIO::processXMLConfiguration()
+bool visual_dataIO::processXMLConfiguration(xmlNode* extLinkConfig_)
 {
         // Init XML
@@ -103 +87 @@
         bool disabled;
         xmlNode* config = util::getModuleXMLConfig( configFileName, "dataio", tmpDoc, disabled );
+        xmlNode* clusterConfig = NULL;
 
         if( disabled)
                 OSG_NOTIFY( osg::ALWAYS ) << "..disabled by XML configuration file. dataIO can't be disabled. Ignoring." << std::endl;
+        else
+                OSG_NOTIFY( osg::ALWAYS ) << std::endl;
 
         // extract configuration values
@@ -152 +139 @@
                         if(cur_node->type == XML_ELEMENT_NODE && node_name == "cluster")
                         {
-                                // Check Attributes to determine if the dummy implementation or any other implementation must be instantiated
-
-                                // Pass XML attributes to cluster to analyse and configure it by cluster itself
+                                // Pass cluster configuration to the used cluster implementation. 
+                                // The implementation will use the configuration if it matches, otherwise falls back to dummy cluster
+                                clusterConfig = cur_node;
                         }
 
@@ -166 +153 @@
 
                 }       // FOR all nodes END
+
+
+
+                // Create Cluster.
+                #ifdef USE_CLUSTER_ASIO_TCP_IOSTREAM
+                        cluster = new dataIO_clusterAsioTcpIostream();
+                #endif 
+                #ifdef USE_CLUSTER_ENET
+                        cluster = new dataIO_clusterENet();
+                #endif
+                if( !cluster.valid() || !clusterConfig || !cluster->init(clusterConfig, viewer, clusterMode, slotContainer, false) )
+                {
+                        cluster = new dataIO_clusterDummy();
+                        cluster->init(clusterConfig, viewer, clusterMode, slotContainer, false);
+                }
+
+
 
                 // clean up
@@ -176 +180 @@
                 return false;
         }
-
         return true;
 }