Changeset 59 for osgVisual/include

Timestamp:

May 30, 2010, 7:50:59 PM (14 years ago)

Author:

Torben Dannhauer

Message:

updated cluster functionality to allow build with any cluster module selected.

Location:

osgVisual/include/cluster

Files:

• dataIO_cluster.h (modified) (3 diffs)
• dataIO_clusterAsioTcpIostream.h (modified) (1 diff)
• dataIO_clusterDummy.h (modified) (1 diff)
• dataIO_clusterUDP.h (modified) (1 diff)

osgVisual/include/cluster/dataIO_cluster.h

@@ -38 +38 @@
 public:
         /**
+         * This enum defines the three modi of the cluster engine.
+         */ 
+        enum clustermode {MASTER, SLAVE, STANDALONE};
+
+        /**
          * \brief Empty constructor.
          * 
@@ -54 +59 @@
          * 
          */ 
-        virtual void init( osg::ArgumentParser& arguments_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ ) = 0;
+        virtual void init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ ) = 0;
 
 
@@ -109 +114 @@
         virtual bool sendSwapCommand() = 0;
 
-        /**
-         * This enum defines the three modi of the cluster engine.
-         */ 
-        enum clustermode {MASTER, SLAVE, STANDALONE};
-
 
 

osgVisual/include/cluster/dataIO_clusterAsioTcpIostream.h

@@ -27 +27 @@
         virtual ~dataIO_clusterAsioTcpIostream(void);
 
-        virtual void init( osg::ArgumentParser& arguments_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
+        virtual void init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
         virtual void shutdown();
         virtual bool sendTO_OBJvaluesToSlaves() ;

osgVisual/include/cluster/dataIO_clusterDummy.h

@@ -38 +38 @@
         virtual ~dataIO_clusterDummy(void);
 
-        void init( osg::ArgumentParser& arguments_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
+        void init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
         void shutdown();
 

osgVisual/include/cluster/dataIO_clusterUDP.h

@@ -48 +48 @@
         virtual ~dataIO_clusterUDP(void);
 
-        void init( osg::ArgumentParser& arguments_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
+        void init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
         void shutdown();