Changeset 69 for osgVisual/include

Timestamp:

Jul 20, 2010, 10:44:13 AM (14 years ago)

Author:

Torben Dannhauer

Message:

Network sync:
now works:

• serialization of transport container
• transport via ENet UDP
• de-serialization of the transport container.
• transport of viewmatrix and framenumber to the slave.

ToDo?: apply viewmatrix on slave still do not work.

Location:

osgVisual/include/cluster

Files:

• dataIO_cluster.h (modified) (3 diffs)
• dataIO_clusterENet.h (modified) (3 diffs)
• dataIO_clusterENet_implementation.h (modified) (2 diffs)

osgVisual/include/cluster/dataIO_cluster.h

@@ -16 +16 @@
 */
 
-#include "osg/referenced"
+#include <osg/referenced>
+#include <osgViewer/Viewer>
 
 #include "dataIO_slot.h"
@@ -59 +60 @@
          * 
          */ 
-        virtual void init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ ) = 0;
+        virtual void init( osg::ArgumentParser& arguments_, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ ) = 0;
 
+        void enableHardSync(bool hardSync_){hardSync=hardSync_;};
+        
+        bool isHardSyncEnabled(){return hardSync;};
 
         virtual void shutdown() = 0;
@@ -117 +121 @@
 
 protected:
-        osgVisual::dataIO_cluster::clustermode clusterMode;     // This variable only mirrors the variable of dataIO. willbe set during initialize.
+        osgVisual::dataIO_cluster::clustermode clusterMode;     // This variable only mirrors the variable of dataIO. will be set during initialize.
         bool initialized;
         int port;
+        bool hardSync;
 
-        osg::ref_ptr<osgVisual::dataIO_transportContainer> sendContainer;
+        /**
+         * Referenced Pointer to the applications viewer.
+         */ 
+        osg::ref_ptr<osgViewer::Viewer> viewer;
+
+        osg::ref_ptr<osgVisual::dataIO_transportContainer> sendContainer;       // Points to the send container of dataIO.
+        std::string receivedTransportContainer;
 };
 

osgVisual/include/cluster/dataIO_clusterENet.h

@@ -18 +18 @@
 #include <osg/notify>
 #include <osg/ArgumentParser>
+#include <osgDB/Registry>
+#include <osgDB/ReaderWriter>
+#include <iostream>
 
 #include <dataIO_cluster.h>
@@ -39 +42 @@
         virtual ~dataIO_clusterENet(void);
 
-        void init( osg::ArgumentParser& arguments_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
+        void init( osg::ArgumentParser& arguments_, osgViewer::Viewer* viewer_, clustermode clusterMode_, osgVisual::dataIO_transportContainer* sendContainer_, bool compressionEnabled_, bool asAscii_ );
         void shutdown();
 
@@ -54 +57 @@
         std::string serverToConnect;
         osgVisual::dataIO_cluster::clustermode clusterMode;
+        std::string receivedTransportContainer;
+
+        osg::ref_ptr<osgDB::Options> readOptions;
+        osg::ref_ptr<osgDB::Options> writeOptions;
+        osg::ref_ptr<osgDB::ReaderWriter> rw;
 };
 

osgVisual/include/cluster/dataIO_clusterENet_implementation.h

@@ -29 +29 @@
 {
 public:
-        dataIO_clusterENet_implementation();
+        dataIO_clusterENet_implementation(std::string& receivedTransportContainer_);
         ~dataIO_clusterENet_implementation();
 
@@ -54 +54 @@
         std::vector<ENetPeer*> peerList;        // client: only one peer to server,    Server: multiple peers for all clients
         ENetEvent event;
+        std::string& receivedTransportContainer;
 };