Changeset 5962 for OpenSceneGraph/trunk/examples/osgtexture1D/osgtexture1D.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/osgtexture1D/osgtexture1D.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgtexture1D/osgtexture1D.cpp

@@ -7 +7 @@
 #include <osgDB/ReadFile>
 
-#include <osgProducer/Viewer>
+#include <osgViewer/Viewer>
 
+#include <iostream>
 
 // Creates a stateset which contains a 1D texture which is populated by contour banded color
@@ -143 +144 @@
     // 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 use of 1D textures.");
-    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;
-    }
-
-    // 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;
-    }
-    
-    if (arguments.argc()<=1)
-    {
-        arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
-        return 1;
-    }
+    osgViewer::Viewer viewer;
 
     // load the images specified on command line
     osg::Node* loadedModel = osgDB::readNodeFiles(arguments);
-
     
-    if (loadedModel)
-    {
-
-        osg::StateSet* stateset = create1DTextureStateToDecorate(loadedModel);
-        if (!stateset)
-        {
-            std::cout<<"Error: failed to create 1D texture state."<<std::endl;
-            return 1;
-        }
-
-
-        loadedModel->setStateSet(stateset);
-        loadedModel->setUpdateCallback(new AnimateStateCallback());
-
-        // add model to viewer.
-        viewer.setSceneData( loadedModel );
-
-        // 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();
-    }
-    else
+    if (!loadedModel)
     {
         osg::notify(osg::NOTICE)<<arguments.getApplicationUsage()->getCommandLineUsage()<<std::endl;
         return 0;
     }
-    
-    
-    
-    return 0;
+
+    osg::StateSet* stateset = create1DTextureStateToDecorate(loadedModel);
+    if (!stateset)
+    {
+        std::cout<<"Error: failed to create 1D texture state."<<std::endl;
+        return 1;
+    }
+
+
+    loadedModel->setStateSet(stateset);
+    loadedModel->setUpdateCallback(new AnimateStateCallback());
+
+    // add model to viewer.
+    viewer.setSceneData( loadedModel );
+
+    return viewer.run();
 }