Changeset 185 for osgVisual/trunk

Timestamp:

Jan 7, 2011, 6:01:08 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual/trunk

Files:

• include/cluster/dataIO_cluster.h (modified) (3 diffs)
• include/dataIO/visual_dataIO.h (modified) (1 diff)
• src/cluster/dataIO_clusterENet.cpp (modified) (1 diff)
• src/core/visual_core.cpp (modified) (1 diff)
• src/dataIO/visual_dataIO.cpp (modified) (1 diff)

osgVisual/trunk/include/cluster/dataIO_cluster.h

@@ -68 +68 @@
         virtual bool init( xmlNode* configurationNode, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool asAscii_) = 0;
 
+        /**
+         * \brief Pure virtual function for initialization. Must be implemented in derived class.
+         * 
+         */ 
         virtual bool processXMLConfiguration(xmlNode* clusterConfig_) = 0;
         
+        /**
+         * \brief Acess function to retrieve whether hardSync is enabled.
+         * 
+         * @return : True if hardsync is enabled
+         */ 
         bool isHardSyncEnabled(){return hardSync;};
 
+        /**
+         * \brief Pure virtual function for initialization. Must be implemented in derived class.
+         * 
+         */ 
         virtual void shutdown() = 0;
 
@@ -128 +141 @@
 
 protected:
-        osgVisual::dataIO_cluster::clustermode clusterMode;     // This variable only mirrors the variable of dataIO. will be set during initialize.
+        /**
+         * This variable only mirrors the variable of dataIO. will be set during initialize.
+         */ 
+        osgVisual::dataIO_cluster::clustermode clusterMode;
+
+        /**
+         * Flag to indicate the cluster's initialization status
+         */ 
         bool initialized;
+
+        /**
+         * Port to use for the cluster network traffic
+         */ 
         int port;
+
+        /**
+         * Flag if hardSync is enabled
+         */ 
         bool hardSync;
-        bool compressionEnabled; // to indicate if OSGs compression alorithm should be used.
+
+        /**
+         * // Flag if OSGs compression alorithm should be used.
+         */ 
+        bool compressionEnabled; 
 
         /**
@@ -139 +171 @@
         osg::ref_ptr<osgViewer::Viewer> viewer;
 
-        osg::ref_ptr<osgVisual::dataIO_transportContainer> sendContainer;       // Points to the send container of dataIO.
+        /**
+         * Pointerto the send container of dataIO.
+         */ 
+        osg::ref_ptr<osgVisual::dataIO_transportContainer> sendContainer;
+
+        /**
+         * Temporary buffer to store the data into which was recieved via cluster.
+         */ 
         std::string receivedTransportContainer;
 };

osgVisual/trunk/include/dataIO/visual_dataIO.h

@@ -208 +208 @@
         static visual_dataIO* getInstance();
 
-        void init(osgViewer::Viewer* viewer_,osg::ArgumentParser& arguments_, std::string configFileName);
+        void init(osgViewer::Viewer* viewer_, std::string configFileName);
         void shutdown();
         bool isMaster(){if (clusterMode==osgVisual::dataIO_cluster::MASTER) return true; else return false;};

osgVisual/trunk/src/cluster/dataIO_clusterENet.cpp

@@ -119 +119 @@
                                                 if(attr_value != "enet")
                                                 {
-                                                        OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration does not match the 'enet' implementation, falling back to clusterDummy" << std::endl;
+                                                        OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration does not match the currently used 'enet' implementation, falling back to clusterDummy" << std::endl;
                                                         return false;
                                                 }

osgVisual/trunk/src/core/visual_core.cpp

@@ -86 +86 @@
 
         // Initialize DataIO interface
-        visual_dataIO::getInstance()->init(viewer, arguments, configFilename);
+        visual_dataIO::getInstance()->init(viewer, configFilename);
 
         // Add manipulators for user interaction - after dataIO to be able to skip it in slaves rendering machines.

osgVisual/trunk/src/dataIO/visual_dataIO.cpp

@@ -47 +47 @@
 };
 
-void visual_dataIO::init(osgViewer::Viewer* viewer_, osg::ArgumentParser& arguments_, std::string configFileName)
+void visual_dataIO::init(osgViewer::Viewer* viewer_, std::string configFileName)
 {
         OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO initialize..";