Changeset 75

Timestamp:

Jul 25, 2010, 1:46:29 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

osgVisual

Files:

• bin/visual_slave.bat (modified) (1 diff)
• include/cluster/dataIO_clusterENet.h (modified) (1 diff)
• include/dataIO/dataIO_transportContainer.h (modified) (4 diffs)
• src/cluster/dataIO_clusterENet.cpp (modified) (2 diffs)
• src/core/visual_core.cpp (modified) (1 diff)
• src/dataIO/dataIO_transportContainer.cpp (modified) (1 diff)
• src/dataIO/visual_dataIO.cpp (modified) (1 diff)

osgVisual/bin/visual_slave.bat

@@ -1 @@
-osgVisual.exe --SingleThreaded -C center -s --server localhost 12345 --window 950 450 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path
+osgVisual.exe -C center -s --server 192.168.0.101 12345 --window 950 450 600 350 D:/OpenSceneGraph/VPB-Testdatensatz/DB_Small/database.ive -p salzburg.path

osgVisual/include/cluster/dataIO_clusterENet.h

@@ -21 +21 @@
 #include <osgDB/ReaderWriter>
 #include <iostream>
+#include <cstdlib>      // Clearscrean console
 
 #include <dataIO_cluster.h>

osgVisual/include/dataIO/dataIO_transportContainer.h

@@ -35 +35 @@
                         frameID(tC_.frameID),
                         viewMatrix(tC_.viewMatrix),
-                        eye(tC_.eye),
-                        center(tC_.center),
-                        up(tC_.up),
                         executer(tC_.executer),
                         ioSlots(tC_.ioSlots){}
         dataIO_transportContainer(){}
         virtual ~dataIO_transportContainer(){}
-
-
 
 
@@ -52 +47 @@
         int frameID;
         osg::Matrixd viewMatrix;
-        osg::Vec3d eye, center, up;
         executerList executer;
         slotList ioSlots;
@@ -64 +58 @@
         const osg::Matrixd& getViewMatrix() const {return viewMatrix;}
 
-        void setEye(const osg::Vec3d& eye_) { eye = eye_; }
-    const osg::Vec3d& getEye() const { return eye; }
-
-        void setCenter(const osg::Vec3d& center_) { center = center_; }
-    const osg::Vec3d& getCenter() const { return center; }
-
-        void setUp(const osg::Vec3d& up_) { up = up_; }
-    const osg::Vec3d& getUp() const { return up; }
-
         void setExecuter(const executerList& executer_) {executer=executer_;}
         const executerList& getExecuter() const {return executer;}
@@ -78 +63 @@
         void setIOSlots(const slotList& ioSlots_) {ioSlots=ioSlots_;}
         const slotList& getIOSlots() const {return ioSlots;}
-
 
 

osgVisual/src/cluster/dataIO_clusterENet.cpp

@@ -125 +125 @@
                 sendContainer->setFrameID(viewer->getFrameStamp()->getFrameNumber());
                 sendContainer->setViewMatrix(viewer->getCamera()->getViewMatrix());
-                osg::Vec3d eye, center, up;
-                viewer->getCamera()->getViewMatrixAsLookAt(eye,center,up);
-                sendContainer->setEye(eye);
-                sendContainer->setCenter(center);
-                sendContainer->setUp(up);
-                //std::cout << "sending lookat: eye:"<<eye<<", center:"<<center<<", up:" << up << std::endl;
 
                 // Writing node to stream
@@ -188 +182 @@
                                         // Restore Viewmatrix 
                                         viewer->getCamera()->setViewMatrix(sendContainer->getViewMatrix());
-                                        //viewer->getCamera()->setViewMatrixAsLookAt(sendContainer->getEye(),sendContainer->getCenter(),sendContainer->getUp());
-                                        //std::cout << "receiving lookat: eye:"<<eye.x()<<", center:"<<center<<", up:" << up << std::endl;
                                 }
                                 else

osgVisual/src/core/visual_core.cpp

@@ -106 +106 @@
                 // next frame please....
         viewer->advance();
-                std::cout << "New frame----------------------------" << std::endl;
 
                 /*double hat, hot, lat, lon, height;

osgVisual/src/dataIO/dataIO_transportContainer.cpp

@@ -27 +27 @@
         ADD_INT_SERIALIZER( FrameID, 0 );
         ADD_MATRIXD_SERIALIZER( ViewMatrix, osg::Matrixd() );
-        ADD_VEC3D_SERIALIZER( Eye, osg::Vec3d(-1.0, -1.0, -1.0) );
-        ADD_VEC3D_SERIALIZER( Center, osg::Vec3d(-1.0,-1.0,-1.0) );
-        ADD_VEC3D_SERIALIZER( Up, osg::Vec3d(-1.0,-1.0,-1.0) );
         ADD_LIST_SERIALIZER( Executer, osgVisual::dataIO_transportContainer::executerList );
         ADD_LIST_SERIALIZER( IOSlots, osgVisual::dataIO_transportContainer::slotList );

osgVisual/src/dataIO/visual_dataIO.cpp

@@ -82 +82 @@
         if(cluster.valid())
                 //cluster->init(arguments_, clusterMode, slotContainer, true, false);
-                cluster->init(arguments_, viewer_, clusterMode, slotContainer, false, true);
+                cluster->init(arguments_, viewer_, clusterMode, slotContainer, false, false);
 
         // Create extLink.