Changeset 5962 for OpenSceneGraph/trunk/examples/osgtessellate/osgtessellate.cpp

Timestamp:

01/11/07 16:19:59 (6 years ago)

Author:

robert

Message:

Ported following examples to osgViewer:

osgteapot
osgtessellate
osgtext
osgtexture1D
osgtexture2D
osgtexture3D
osgtexturerectangle
osgvertexprogram
osgvolume
osgwindows
osgsimple
osgkeyboardmouse

Files:

• OpenSceneGraph/trunk/examples/osgtessellate/osgtessellate.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgtessellate/osgtessellate.cpp

@@ -23 +23 @@
 #include <osgDB/ReadFile>
 #include <osgUtil/Optimizer>
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 #include <osg/Projection>
 #include <osg/MatrixTransform>
@@ -741 +741 @@
 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()->setApplicationName(arguments.getApplicationName());
-    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is provides an example of doing tesseleation..");
-    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
-    arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
-    
 
     // 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());
-
-    // if user request help write it out to cout.
-    if (arguments.read("-h") || arguments.read("--help"))
-    {
-        arguments.getApplicationUsage()->write(std::cout);
-        return 1;
-    }
-
-    // report any errors if they have occured when parsing the program aguments.
-    if (arguments.errors())
-    {
-        arguments.writeErrorMessages(std::cout);
-        return 1;
-    }
-    
-    osg::Timer timer;
-    osg::Timer_t start_tick = timer.tick();
+    osgViewer::Viewer viewer;
 
     // read the scene from the list of file specified commandline args.
@@ -785 +754 @@
     {
         loadedModel=makeTessellateExample();
+
     } else { // if there is a loaded model:
+
         // tessellate by searching for geode called tessellate & tessellate it
         setTessellateVisitor tsv;
         loadedModel->accept(tsv);
+
     }
 
@@ -795 +767 @@
     gload->addChild(createHUD());
 
-    
-    // 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);
-    }
-
-    osg::Timer_t end_tick = timer.tick();
-
-    std::cout << "Time to load = "<<timer.delta_s(start_tick,end_tick)<<std::endl;
-
 
     osgUtil::Optimizer optimizer;
@@ -817 +775 @@
 
     // add event handler for keyboard 'n' to retessellate
-    viewer.getEventHandlerList().push_front(new KeyboardEventHandler(loadedModel.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();
-
-    // do OpenGL clean up
-    viewer.cleanup_frame();
-
-    // wait for all cull and draw threads to complete before exit.
-    viewer.sync();
-
-    return 0;
+    viewer.addEventHandler(new KeyboardEventHandler(loadedModel.get()));
+
+    return viewer.run();
 }