Changeset 183 for osgVisual/trunk/include/cluster

Timestamp:

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

Author:

Torben Dannhauer

Message:

XML configuration now works also with dataIO cluster

Location:

osgVisual/trunk/include/cluster

Files:

• dataIO_cluster.h (modified) (4 diffs)
• dataIO_clusterDummy.h (modified) (1 diff)
• dataIO_clusterENet.h (modified) (1 diff)

osgVisual/trunk/include/cluster/dataIO_cluster.h

@@ -22 +22 @@
 
 #include "dataIO_transportContainer.h"
+
+// XML Parser
+#include <stdio.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 
@@ -48 +53 @@
          * 
          */ 
-        dataIO_cluster() {}
+        dataIO_cluster():hardSync(false) {}
 
         /**
@@ -61 +66 @@
          * 
          */ 
-        virtual void init( osg::ArgumentParser& arguments_, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ ) = 0;
+        virtual bool init( xmlNode* configurationNode, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool asAscii_) = 0;
 
-        void enableHardSync(bool hardSync_){hardSync=hardSync_;};
+        virtual bool processXMLConfiguration(xmlNode* clusterConfig_) = 0;
         
         bool isHardSyncEnabled(){return hardSync;};
@@ -127 +132 @@
         int port;
         bool hardSync;
+        bool compressionEnabled; // to indicate if OSGs compression alorithm should be used.
 
         /**

osgVisual/trunk/include/cluster/dataIO_clusterDummy.h

@@ -38 +38 @@
         virtual ~dataIO_clusterDummy(void);
 
-        void init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
+        bool init(xmlNode* configurationNode, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool asAscii_);
+        bool processXMLConfiguration(xmlNode* clusterConfig_);
         void shutdown();
 
         void init();
-        bool sendTO_OBJvaluesToSlaves();
+        bool sendTO_OBJvaluesToSlaves(osg::Matrixd viewMatrix_);
         bool readTO_OBJvaluesFromMaster();
         void reportAsReadyToSwap();

osgVisual/trunk/include/cluster/dataIO_clusterENet.h

@@ -44 +44 @@
         virtual ~dataIO_clusterENet(void);
 
-        void init( osg::ArgumentParser& arguments_, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
+        bool init(xmlNode* configurationNode, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool asAscii_);
+        bool processXMLConfiguration(xmlNode* clusterConfig_);
         void shutdown();