Changeset 73 for osgVisual/src/core

Timestamp:

Jul 24, 2010, 10:48:02 AM (14 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• osgVisual/src/core/visual_core.cpp (modified) (7 diffs)

osgVisual/src/core/visual_core.cpp

@@ -56 +56 @@
         OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_core..." << std::endl;
 
-        // Add manipulators for user interaction
-        addManipulators();
-
         // Load terrain
         //loadTerrain(arguments);
@@ -84 +81 @@
         visual_dataIO::getInstance()->init(viewer, arguments);
 
+        // Add manipulators for user interaction - after dataIO to be able to skip it in slaves.
+        addManipulators();
+
         loadTerrain(arguments);
 
@@ -118 +118 @@
                 // update the scene by traversing it with the the update visitor which will
         // call all node update callbacks and animations.
-        
         viewer->updateTraversal();
                 
@@ -179 +178 @@
 void visual_core::addManipulators()
 {
-        // set up the camera manipulators.
+        if(!visual_dataIO::getInstance()->isSlave()) // set up the camera manipulators if not slave.
     {
         osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
@@ -221 +220 @@
 
         viewer->setCameraManipulator( keyswitchManipulator.get() );
-    }
+    }   // If not Slave END
 
     // add the state manipulator
@@ -328 +327 @@
 #endif
 
-        osgGA::NodeTrackerManipulator::TrackerMode trackerMode = osgGA::NodeTrackerManipulator::NODE_CENTER;
-        osgGA::NodeTrackerManipulator::RotationMode rotationMode = osgGA::NodeTrackerManipulator::ELEVATION_AZIM;
-        nt->setTrackerMode(trackerMode);
-    nt->setRotationMode(rotationMode);
-        //nt->setAutoComputeHomePosition( true );
-        nt->setMinimumDistance( 100 );
-        nt->setTrackNode(testObj4->getGeometry());
-        //nt->computeHomePosition();
-        nt->setAutoComputeHomePosition( true );
-        nt->setDistance( 250 );
+        if(nt.valid())
+        {
+                osgGA::NodeTrackerManipulator::TrackerMode trackerMode = osgGA::NodeTrackerManipulator::NODE_CENTER;
+                osgGA::NodeTrackerManipulator::RotationMode rotationMode = osgGA::NodeTrackerManipulator::ELEVATION_AZIM;
+                nt->setTrackerMode(trackerMode);
+                nt->setRotationMode(rotationMode);
+                //nt->setAutoComputeHomePosition( true );
+                nt->setMinimumDistance( 100 );
+                nt->setTrackNode(testObj4->getGeometry());
+                //nt->computeHomePosition();
+                nt->setAutoComputeHomePosition( true );
+                nt->setDistance( 250 );
+        }
 
 
@@ -376 +378 @@
 
         visual_dataIO::getInstance()->setSlotData("TestSlot1", osgVisual::dataIO_slot::TO_OBJ, 0.12345);
-
-
-        //// Writing object to stream
-        ////std::ofstream myOstream("test.txt" );
-        //std::stringstream myOstream;
-        //std::string extension = "osgb";
-        //bool compressed = false;
-        //osgDB::ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension(extension.c_str());
-        //if ( rw )
-        //{
-        //      osgDB::ReaderWriter::WriteResult wr;
-
-        //      if (extension == "osgb")
-        //      {
-        //              if (compressed)
-        //                      wr = rw->writeObject( *test, myOstream, new osgDB::Options("Compressor=zlib") );
-        //              else
-        //                      wr = rw->writeObject( *test, myOstream );
-        //      }
-
-        //      if (extension == "osgt")
-        //      {
-        //              if (compressed)
-        //                      wr = rw->writeObject( *test, myOstream, new osgDB::Options("Ascii Compressor=zlib") );
-        //              else
-        //                      wr = rw->writeObject( *test, myOstream, new osgDB::Options("Ascii") );
-        //      }
-
-        //      if (extension == "osgx")
-        //      {
-        //              if (compressed)
-        //                      wr = rw->writeObject( *test, myOstream, new osgDB::Options("XML Compressor=zlib") );
-        //              else
-        //                      wr = rw->writeObject( *test, myOstream, new osgDB::Options("XML") );
-        //      }
-
-
-        //      if (!wr.success() )     OSG_NOTIFY( osg::WARN ) << "ERROR: Save failed: " << wr.message() << std::endl;
-        //}
-        //else
-        //      OSG_NOTIFY( osg::WARN ) << "error getting readerWriter for osgt" << std::endl;
-
-        //// Size ermitteln.
-        //std::stringbuf *pbuf;
-        //pbuf = myOstream.rdbuf();
-        //OSG_NOTIFY( osg::WARN ) << "PBUF Bytes available: " << pbuf->in_avail() << std::endl;
-        //OSG_NOTIFY( osg::ALWAYS ) << "STRING Bytes available: " << myOstream.str().length() << std::endl;
-        //OSG_NOTIFY( osg::ALWAYS ) << "STRING content: " << myOstream.str() << std::endl;
-
-        ////Reading Stream to node
-        //if ( rw )
-        //{
-        //      osgDB::ReaderWriter::ReadResult rr = rw->readObject( myOstream );
-        //      osg::ref_ptr<osgVisual::dataIO_transportContainer> test2 = dynamic_cast<osgVisual::dataIO_transportContainer*>(rr.takeObject());
-        //      if (test2)
-        //      {
-        //              OSG_NOTIFY( osg::WARN ) << "TEST::FrameID is: " << test->getFrameID() << std::endl;
-        //      }
-        //      else
-        //              OSG_NOTIFY( osg::WARN ) << "Error converting stream to Node" << std::endl;
-        //}
-}
+}