Changeset 12528 for OpenSceneGraph/trunk/examples/osgocclusionquery/osgocclusionquery.cpp

Timestamp:

06/14/11 18:50:40 (2 years ago)

Author:

robert

Message:

Improved the handling of command line parameters

Files:

• OpenSceneGraph/trunk/examples/osgocclusionquery/osgocclusionquery.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgocclusionquery/osgocclusionquery.cpp

@@ -538 +538 @@
                 else if (ea.getKey()=='o')
                 {
-                    if (osgDB::writeNodeFile( _node, "saved_model.osg" ))
-                        osg::notify( osg::ALWAYS ) << "osgOQ: Wrote scene graph to \"saved_model.osg\"" << std::endl;
+                    if (osgDB::writeNodeFile( _node, "saved_model.osgt" ))
+                        osg::notify( osg::ALWAYS ) << "osgOQ: Wrote scene graph to \"saved_model.osgt\"" << std::endl;
                     else
-                        osg::notify( osg::ALWAYS ) << "osgOQ: Wrote failed for \"saved_model.osg\"" << std::endl;
+                        osg::notify( osg::ALWAYS ) << "osgOQ: Wrote failed for \"saved_model.osgt\"" << std::endl;
                     return true;
                 }
@@ -745 +745 @@
     viewer.addEventHandler(new osgViewer::HelpHandler(arguments.getApplicationUsage()));
 
+    bool optimize = arguments.read( "--opt" );
 
     // load the specified model
-    osg::ref_ptr<osg::Node> root = osgDB::readNodeFiles( arguments );
-    if (!root)
-    {
-        std::cout << arguments.getApplicationName() <<": No files specified, or can't load them." << std::endl;
+    osg::ref_ptr<osg::Node> root = 0;
+
+    if (arguments.argc()>1)
+    {
+        root = osgDB::readNodeFiles( arguments );
+        if (root.valid())
+        {
+            // Run a NodeVisitor to insert OcclusionQueryNodes in the scene graph.
+            OcclusionQueryVisitor oqv;
+            root->accept( oqv );
+        }
+        else
+        {
+            std::cout << arguments.getApplicationName() <<": unable to load specified data." << std::endl;
+            return 1;
+        }
+    }
+    else
+    {
         root = createStockScene().get();
         if (!root)
@@ -757 +773 @@
             return 1;
         }
-        std::cout << "Using stock scene instead." << std::endl;
-    }
-    else
-    {
-        // Run a NodeVisitor to insert OcclusionQueryNodes in the scene graph.
-        OcclusionQueryVisitor oqv;
-        root->accept( oqv );
-    }
-
-    bool optimize = arguments.read( "--opt" );
+    }
 
     // any option left unread are converted into errors to write out later.