Changeset 5927 for OpenSceneGraph/trunk/examples/osgparametric/osgparametric.cpp

Timestamp:

01/08/07 11:00:16 (6 years ago)

Author:

robert

Message:

Ported following examples to osgViewer:

osggeodemo
osggeometry
osghud
osgimpostor
osgkeyboard
osglauncher
osglight
osglightpoint
osglogicop
osglogo
osgmovie
osgmultiplecameras
osgmultitexture
osgoccluder
osgparametric
osgparticle

Files:

• OpenSceneGraph/trunk/examples/osgparametric/osgparametric.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgparametric/osgparametric.cpp

@@ -14 +14 @@
 #include <osgUtil/TriStripVisitor>
 
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
+
+#include <iostream>
 
 // for the grid data..
@@ -512 +514 @@
    
     // construct the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    // set up the value with sensible default event handlers.
-    viewer.setUpViewer(osgProducer::Viewer::STANDARD_SETTINGS);
-    
+    osgViewer::Viewer viewer;
+
     std::string shader("simple");
     while(arguments.read("-s",shader)) {}
@@ -541 +540 @@
     while(arguments.read("--join")) { joinStrips = true; }
 
-    // get details on keyboard and mouse bindings used by the viewer.
-    viewer.getUsage(*arguments.getApplicationUsage());
-
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
     {
         arguments.getApplicationUsage()->write(std::cout);
-        return 1;
-    }
-
-    // any option left unread are converted into errors to write out later.
-    arguments.reportRemainingOptionsAsUnrecognized();
-
-    // report any errors if they have occured when parsing the program aguments.
-    if (arguments.errors())
-    {
-        arguments.writeErrorMessages(std::cout);
         return 1;
     }
@@ -567 +553 @@
         return 1;
     }
-
-    // add a viewport to the viewer and attach the scene graph.
+    
     viewer.setSceneData(model);
-    
-    // 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();
 }