Changeset 5923 for OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp

Timestamp:

01/06/07 22:35:57 (6 years ago)

Author:

robert

Message:

Ported osgcopy, osgcubemap, osgdelaunay, osgdepthpartion, osgdistortion, osgfadetext, osgforest and osgfxbrowser to osgViewer

Files:

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

OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp

@@ -7 +7 @@
 #include <osg/LightSource>
 
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 
 #include <osgDB/ReadFile>
@@ -26 +26 @@
 #include <vector>
 #include <string>
+#include <iostream>
 
 class RotateCallback: public osg::NodeCallback {
@@ -260 +261 @@
 }
 
-void build_world(osg::Group* root, osg::Node* scene, osgProducer::Viewer& viewer)
+void build_world(osg::Group* root, osg::Node* scene, osgViewer::Viewer& viewer)
 {
     osg::ref_ptr<EffectPanel> effect_panel = build_gui(root);
@@ -266 +267 @@
     effect_panel->rebuild();
 
-    viewer.getEventHandlerList().push_front(new EffectPanel::KeyboardHandler(effect_panel.get()));
+    viewer.addEventHandler(new EffectPanel::KeyboardHandler(effect_panel.get()));
 
     root->addChild(effect_panel->getRoot());
@@ -289 +290 @@
 
     // 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;
 
     // if user request help write it out to cout.
@@ -359 +354 @@
     viewer.setSceneData(root.get());
 
-    // 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();
 }