Changeset 5954 for OpenSceneGraph/trunk/examples/osgplanets/osgplanets.cpp

Timestamp:

01/10/07 14:52:22 (6 years ago)

Author:

robert

Message:

Ported following examples to osgViewer:

osgparticleeffects
osgphotoalbum
osgpick
osgpoints
osgpointsprite
osgprecipitation
osgprerender
osgprerendercubemap
osgreflect
osgscalarbar
osgscribe
osgsequence
osgplanets

Files:

• OpenSceneGraph/trunk/examples/osgplanets/osgplanets.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osgplanets/osgplanets.cpp

@@ -32 +32 @@
 #include <osgGA/FlightManipulator>
 #include <osgGA/DriveManipulator>
-
-#include <osgProducer/Viewer>
+#include <osgGA/KeySwitchMatrixManipulator>
+
+#include <osgViewer/Viewer>
 
 
@@ -583 +584 @@
 
     // initialize the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::ESCAPE_SETS_DONE | osgProducer::Viewer::VIEWER_MANIPULATOR | osgProducer::Viewer::STATE_MANIPULATOR);
-
-    // get details on keyboard and mouse bindings used by the viewer.
-    viewer.getUsage(*arguments.getApplicationUsage());
+    osgViewer::Viewer viewer;
+
+    osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
+    viewer.setCameraManipulator( keyswitchManipulator.get() );
 
     SolarSystem solarSystem;
@@ -898 +896 @@
 
     // set up tracker manipulators, once for each astral body
-    
     {
         FindNamedNodeVisitor fnnv("Moon");
@@ -911 +908 @@
             tm->setTrackNode( fnnv._foundNodes.front().get() );
 
-            unsigned int num = viewer.addCameraManipulator( tm );
-            viewer.selectCameraManipulator( num );
+            unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
+            keyswitchManipulator->addMatrixManipulator( 'm', "moon", tm );
+            keyswitchManipulator->selectMatrixManipulator( num );
         }
     }    
@@ -928 +926 @@
             tm->setTrackNode( fnnv._foundNodes.front().get() );
 
-            unsigned int num = viewer.addCameraManipulator( tm );
-            viewer.selectCameraManipulator( num );
+            unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
+            keyswitchManipulator->addMatrixManipulator( 'e', "earth", tm);
+            keyswitchManipulator->selectMatrixManipulator( num );
         }
     }    
@@ -945 +944 @@
             tm->setTrackNode( fnnv._foundNodes.front().get() );
 
-            unsigned int num = viewer.addCameraManipulator( tm );
-            viewer.selectCameraManipulator( num );
+            unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
+            keyswitchManipulator->addMatrixManipulator( 's', "sun", tm);
+            keyswitchManipulator->selectMatrixManipulator( num );
         }
     }    
-    
-    // create the windows and run the threads.
-    viewer.realize();
-    
-    while( !viewer.done() )
-    {
-        // wait for all cull and draw threads to complete.
-        viewer.sync();
-
-        // update the scene by traversing it with the the update visitor which will
-        // call all node update callbacks and animations.
-        viewer.update();
-         
-        // fire off the cull and draw traversals of the scene.
-        viewer.frame();
-        
-    }
-    
-    
-    // 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();
-
-    return 0;
+
+    return viewer.run();
+
 }// end main