Changeset 5927 for OpenSceneGraph/trunk/examples/osglogo/osglogo.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/osglogo/osglogo.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osglogo/osglogo.cpp

@@ -16 +16 @@
 #include <osgGA/TrackballManipulator>
 
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 
 #include <osgDB/ReadFile>
+
+#include <iostream>
 
 static bool s_ProfessionalServices = false;
@@ -443 +445 @@
 int main( int argc, char **argv )
 {
-
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
-
-    // set up the usage document, in case we need to print out how to use this program.
-    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates both text, animation and billboard via custom transform to create the OpenSceneGraph logo..");
-   
-    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+"[options] [filename] ...");
-    arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
-    arguments.getApplicationUsage()->addCommandLineOption("ps","Render the Professional Services logo");
-   
    
     osg::DisplaySettings::instance()->setMinimumNumAlphaBits(8);
    
     // construct the viewer.
-    osgProducer::Viewer viewer(arguments);
-
-    viewer.setWriteImageFileName("logo.rgb");
-    
-    // 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.
@@ -476 +461 @@
     
     while (arguments.read("ps")) s_ProfessionalServices = true;
-
-        // 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;
-    }
     
     osg::Node* node = 0;
@@ -495 +470 @@
     viewer.setSceneData( node );
 
-    // 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();
+}