Changeset 185


Ignore:
Timestamp:
Jan 7, 2011, 6:01:08 PM (14 years ago)
Author:
Torben Dannhauer
Message:
 
Location:
osgVisual/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • osgVisual/trunk/include/cluster/dataIO_cluster.h

    r183 r185  
    6868        virtual bool init( xmlNode* configurationNode, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool asAscii_) = 0;
    6969
     70        /**
     71         * \brief Pure virtual function for initialization. Must be implemented in derived class.
     72         *
     73         */
    7074        virtual bool processXMLConfiguration(xmlNode* clusterConfig_) = 0;
    7175       
     76        /**
     77         * \brief Acess function to retrieve whether hardSync is enabled.
     78         *
     79         * @return : True if hardsync is enabled
     80         */
    7281        bool isHardSyncEnabled(){return hardSync;};
    7382
     83        /**
     84         * \brief Pure virtual function for initialization. Must be implemented in derived class.
     85         *
     86         */
    7487        virtual void shutdown() = 0;
    7588
     
    128141
    129142protected:
    130         osgVisual::dataIO_cluster::clustermode clusterMode;     // This variable only mirrors the variable of dataIO. will be set during initialize.
     143        /**
     144         * This variable only mirrors the variable of dataIO. will be set during initialize.
     145         */
     146        osgVisual::dataIO_cluster::clustermode clusterMode;
     147
     148        /**
     149         * Flag to indicate the cluster's initialization status
     150         */
    131151        bool initialized;
     152
     153        /**
     154         * Port to use for the cluster network traffic
     155         */
    132156        int port;
     157
     158        /**
     159         * Flag if hardSync is enabled
     160         */
    133161        bool hardSync;
    134         bool compressionEnabled; // to indicate if OSGs compression alorithm should be used.
     162
     163        /**
     164         * // Flag if OSGs compression alorithm should be used.
     165         */
     166        bool compressionEnabled;
    135167
    136168        /**
     
    139171        osg::ref_ptr<osgViewer::Viewer> viewer;
    140172
    141         osg::ref_ptr<osgVisual::dataIO_transportContainer> sendContainer;       // Points to the send container of dataIO.
     173        /**
     174         * Pointerto the send container of dataIO.
     175         */
     176        osg::ref_ptr<osgVisual::dataIO_transportContainer> sendContainer;
     177
     178        /**
     179         * Temporary buffer to store the data into which was recieved via cluster.
     180         */
    142181        std::string receivedTransportContainer;
    143182};
  • osgVisual/trunk/include/dataIO/visual_dataIO.h

    r183 r185  
    208208        static visual_dataIO* getInstance();
    209209
    210         void init(osgViewer::Viewer* viewer_,osg::ArgumentParser& arguments_, std::string configFileName);
     210        void init(osgViewer::Viewer* viewer_, std::string configFileName);
    211211        void shutdown();
    212212        bool isMaster(){if (clusterMode==osgVisual::dataIO_cluster::MASTER) return true; else return false;};
  • osgVisual/trunk/src/cluster/dataIO_clusterENet.cpp

    r183 r185  
    119119                                                if(attr_value != "enet")
    120120                                                {
    121                                                         OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration does not match the 'enet' implementation, falling back to clusterDummy" << std::endl;
     121                                                        OSG_NOTIFY( osg::ALWAYS ) << "WARNING: Cluster configuration does not match the currently used 'enet' implementation, falling back to clusterDummy" << std::endl;
    122122                                                        return false;
    123123                                                }
  • osgVisual/trunk/src/core/visual_core.cpp

    r184 r185  
    8686
    8787        // Initialize DataIO interface
    88         visual_dataIO::getInstance()->init(viewer, arguments, configFilename);
     88        visual_dataIO::getInstance()->init(viewer, configFilename);
    8989
    9090        // Add manipulators for user interaction - after dataIO to be able to skip it in slaves rendering machines.
  • osgVisual/trunk/src/dataIO/visual_dataIO.cpp

    r183 r185  
    4747};
    4848
    49 void visual_dataIO::init(osgViewer::Viewer* viewer_, osg::ArgumentParser& arguments_, std::string configFileName)
     49void visual_dataIO::init(osgViewer::Viewer* viewer_, std::string configFileName)
    5050{
    5151        OSG_NOTIFY( osg::ALWAYS ) << "visual_dataIO initialize..";
Note: See TracChangeset for help on using the changeset viewer.