Changeset 5920 for OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp

Timestamp:

01/05/07 22:19:01 (6 years ago)

Author:

robert

Message:

Ported osgcluster to osgViewer.

Files:

• OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/examples/osgcluster/osgcluster.cpp

@@ -9 +9 @@
 #include <osgDB/ReadFile>
 
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 
 #include <osg/Quat>
 #include <osg/io_utils>
+
+#include <iostream>
 
 #if defined (WIN32) && !defined(__CYGWIN__)
@@ -48 +50 @@
         }
         
-        void readEventQueue(osgProducer::Viewer& viewer);
-        
-        void writeEventQueue(osgProducer::Viewer& viewer);
+        void readEventQueue(osgViewer::Viewer& viewer);
+        
+        void writeEventQueue(osgViewer::Viewer& viewer);
 
         void setMasterKilled(const bool flag) { _masterKilled = flag; }
@@ -380 +382 @@
 };
 
-void CameraPacket::readEventQueue(osgProducer::Viewer& viewer)
+void CameraPacket::readEventQueue(osgViewer::Viewer& viewer)
 {
     _events.clear();
 
-    viewer.getKeyboardMouseCallback()->copyEventQueue(_events);
+    viewer.getEventQueue()->copyEvents(_events);
 
     osg::notify(osg::INFO)<<"written events = "<<_events.size()<<std::endl;
 }
 
-void CameraPacket::writeEventQueue(osgProducer::Viewer& viewer)
+void CameraPacket::writeEventQueue(osgViewer::Viewer& viewer)
 {
     osg::notify(osg::INFO)<<"recieved events = "<<_events.size()<<std::endl;
 
-    // copy the events to osgProducer style events.
-    viewer.getKeyboardMouseCallback()->appendEventQueue(_events);
+    viewer.getEventQueue()->appendEvents(_events);
 }
 
@@ -422 +423 @@
     
     // construct the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
-
-    // get details on keyboard and mouse bindings used by the viewer.
-    viewer.getUsage(*arguments.getApplicationUsage());
+    osgViewer::Viewer viewer;
 
 
@@ -470 +465 @@
         return 1;
     }
-    
-    
+
     // load model.
     osg::ref_ptr<osg::Node> rootnode = osgDB::readNodeFiles(arguments);
 
-    
     // set the scene to render
     viewer.setSceneData(rootnode.get());
 
+    if (camera_fov>0.0f)
+    {
+        double fovy, aspectRatio, zNear, zFar;
+        viewer.getCamera()->getProjectionMatrixAsPerspective(fovy, aspectRatio,zNear, zFar);
+        
+        double original_fov = atan(tan(osg::DegreesToRadians(fovy)*0.5)*aspectRatio)*2.0;
+        std::cout << "setting lens perspective : original "<<original_fov<<"  "<<fovy<<std::endl;
+        
+        fovy = atan(tan(osg::DegreesToRadians(camera_fov)*0.5)/aspectRatio)*2.0;
+        viewer.getCamera()->setProjectionMatrixAsPerspective(fovy, aspectRatio,zNear, zFar);
+    
+        viewer.getCamera()->getProjectionMatrixAsPerspective(fovy, aspectRatio,zNear, zFar);
+        original_fov = atan(tan(osg::DegreesToRadians(fovy)*0.5)*aspectRatio)*2.0;
+        std::cout << "setting lens perspective : new "<<original_fov<<"  "<<fovy<<std::endl;
+    }
+
+
     // create the windows and run the threads.
     viewer.realize();
-
-
-    // set up the lens after realize as the Producer lens is not set up properly before this.... will need to inveestigate this at a later date.
-    if (camera_fov>0.0f)
-    {
-        float aspectRatio = tan( osg::DegreesToRadians(viewer.getLensVerticalFov()*0.5)) / tan(osg::DegreesToRadians(viewer.getLensHorizontalFov()*0.5));
-        float new_fovy = osg::RadiansToDegrees(atan( aspectRatio * tan( osg::DegreesToRadians(camera_fov*0.5))))*2.0f;
-        std::cout << "setting lens perspective : original "<<viewer.getLensHorizontalFov()<<"  "<<viewer.getLensVerticalFov()<<std::endl;
-        viewer.setLensPerspective(camera_fov,new_fovy,1.0f,1000.0f);
-        std::cout << "setting lens perspective : new "<<viewer.getLensHorizontalFov()<<"  "<<viewer.getLensVerticalFov()<<std::endl;
-    }
 
 
@@ -509 +508 @@
     while( !viewer.done() && !masterKilled )
     {
-        // wait for all cull and draw threads to complete.
-        viewer.sync();
-
         osg::Timer_t startTick = osg::Timer::instance()->tick();
                  
+        viewer.advance();
+
         // special handling for working as a cluster.
         switch (viewerMode)
@@ -521 +519 @@
                 
                 // take camera zero as the guide.
-                osg::Matrix modelview(viewer.getCamera(0)->getViewMatrix());
+                osg::Matrix modelview(viewer.getCamera()->getViewMatrix());
                 
                 cp->setPacket(modelview,viewer.getFrameStamp());
@@ -572 +570 @@
         // update the scene by traversing it with the the update visitor which will
         // call all node update callbacks and animations.
-        viewer.update();
+        viewer.eventTraversal();
+        viewer.updateTraversal();
 
         if (viewerMode==SLAVE)
@@ -579 +578 @@
             cp->getModelView(modelview,camera_offset);
         
-            viewer.setView(modelview);
+            viewer.getCamera()->setViewMatrix(modelview);
         }
 
         // fire off the cull and draw traversals of the scene.
         if(!masterKilled)
-            viewer.frame();
+            viewer.renderingTraversals();
         
     }
-
-    // wait for all cull and draw threads to complete.
-    viewer.sync();
-
-    // run a clean up frame to delete all OpenGL objects.
-    viewer.cleanup_frame();
-
-    // wait for all the clean up frame to complete.
-    viewer.sync();
 
     // if we are master clean up by telling all slaves that we're going down.