From ce0f30cfcb5e7557984450bf5f8c0a4d24c56fb8 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 8 Jun 2007 15:37:20 +0000 Subject: [PATCH] From Martin Lavery and Robert Osfield, added fallbacks for when now command line args are provided. --- examples/osgdistortion/osgdistortion.cpp | 2 +- examples/osghud/osghud.cpp | 4 ++++ examples/osglight/osglight.cpp | 5 ++++- examples/osglogicop/osglogicop.cpp | 4 ++++ examples/osgmotionblur/osgmotionblur.cpp | 3 +++ examples/osgmultitexture/osgmultitexture.cpp | 4 ++++ examples/osgoccluder/osgoccluder.cpp | 4 ++++ examples/osgpick/osgpick.cpp | 3 +++ examples/osgprerender/osgprerender.cpp | 4 ++++ examples/osgreflect/osgreflect.cpp | 3 +++ examples/osgscribe/osgscribe.cpp | 4 ++++ examples/osgsimplifier/osgsimplifier.cpp | 5 ++++- examples/osgtexture1D/osgtexture1D.cpp | 3 +++ examples/osgwindows/osgwindows.cpp | 3 +++ 14 files changed, 48 insertions(+), 3 deletions(-) diff --git a/examples/osgdistortion/osgdistortion.cpp b/examples/osgdistortion/osgdistortion.cpp index 8f8897cc3..f5d6b91f4 100644 --- a/examples/osgdistortion/osgdistortion.cpp +++ b/examples/osgdistortion/osgdistortion.cpp @@ -651,7 +651,7 @@ int main(int argc, char** argv) osg::Node* loadedModel = osgDB::readNodeFiles(arguments); // if not loaded assume no arguments passed in, try use default mode instead. - if (!loadedModel) loadedModel = osgDB::readNodeFile("cessnafire.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg"); if (!loadedModel) { diff --git a/examples/osghud/osghud.cpp b/examples/osghud/osghud.cpp index 327c94be1..682d92c7c 100644 --- a/examples/osghud/osghud.cpp +++ b/examples/osghud/osghud.cpp @@ -191,6 +191,10 @@ int main( int argc, char **argv ) // read the scene from the list of file specified commandline args. osg::ref_ptr scene = osgDB::readNodeFiles(arguments); + // if not loaded assume no arguments passed in, try use default mode instead. + if (!scene) scene = osgDB::readNodeFile("dumptruck.osg"); + + if (!scene) { osg::notify(osg::NOTICE)<<"No model loaded"< loadedModel = osgDB::readNodeFiles(arguments); + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg"); // if no model has been successfully loaded report failure. if (!loadedModel) diff --git a/examples/osgmultitexture/osgmultitexture.cpp b/examples/osgmultitexture/osgmultitexture.cpp index ee051e280..a10e30c23 100644 --- a/examples/osgmultitexture/osgmultitexture.cpp +++ b/examples/osgmultitexture/osgmultitexture.cpp @@ -27,6 +27,10 @@ int main( int argc, char **argv ) // load the nodes from the commandline arguments. osg::Node* rootnode = osgDB::readNodeFiles(arguments); + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!rootnode) rootnode = osgDB::readNodeFile("cessnafire.osg"); + if (!rootnode) { osg::notify(osg::NOTICE)<<"Please specify and model filename on the command line."< scene = osgDB::readNodeFiles(arguments); + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!scene) scene = osgDB::readNodeFile("fountain.osg"); osg::ref_ptr group = dynamic_cast(scene.get()); if (!group) diff --git a/examples/osgprerender/osgprerender.cpp b/examples/osgprerender/osgprerender.cpp index d574fce56..d36131c61 100644 --- a/examples/osgprerender/osgprerender.cpp +++ b/examples/osgprerender/osgprerender.cpp @@ -420,6 +420,10 @@ int main( int argc, char **argv ) // load the nodes from the commandline arguments. osg::Node* loadedModel = osgDB::readNodeFiles(arguments); + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osg"); + if (!loadedModel) { return 1; diff --git a/examples/osgreflect/osgreflect.cpp b/examples/osgreflect/osgreflect.cpp index c734db21f..6ca016b77 100644 --- a/examples/osgreflect/osgreflect.cpp +++ b/examples/osgreflect/osgreflect.cpp @@ -331,6 +331,9 @@ int main( int argc, char **argv ) // read the scene from the list of file specified commandline args. osg::ref_ptr loadedModel = osgDB::readNodeFiles(arguments); + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osg"); // if no model has been successfully loaded report failure. if (!loadedModel) diff --git a/examples/osgscribe/osgscribe.cpp b/examples/osgscribe/osgscribe.cpp index a333883aa..41fba8b52 100644 --- a/examples/osgscribe/osgscribe.cpp +++ b/examples/osgscribe/osgscribe.cpp @@ -23,6 +23,10 @@ int main( int argc, char **argv ) // load the nodes from the commandline arguments. osg::Node* loadedModel = osgDB::readNodeFiles(arguments); + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg"); + if (!loadedModel) { osg::notify(osg::NOTICE)<<"Please specifiy a model filename on the command line."< loadedModel = osgDB::readNodeFiles(arguments); - + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osg"); + // if no model has been successfully loaded report failure. if (!loadedModel) { diff --git a/examples/osgtexture1D/osgtexture1D.cpp b/examples/osgtexture1D/osgtexture1D.cpp index 55e550b20..378f577db 100644 --- a/examples/osgtexture1D/osgtexture1D.cpp +++ b/examples/osgtexture1D/osgtexture1D.cpp @@ -149,6 +149,9 @@ int main( int argc, char **argv ) // load the images specified on command line osg::Node* loadedModel = osgDB::readNodeFiles(arguments); + + // if not loaded assume no arguments passed in, try use default mode instead. + if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osg"); if (!loadedModel) { diff --git a/examples/osgwindows/osgwindows.cpp b/examples/osgwindows/osgwindows.cpp index be2ad3aa1..5e5909314 100644 --- a/examples/osgwindows/osgwindows.cpp +++ b/examples/osgwindows/osgwindows.cpp @@ -22,6 +22,9 @@ int main( int argc, char **argv ) // read the scene from the list of file specified commandline args. osg::ref_ptr loadedModel = osgDB::readNodeFiles(arguments); + // if not loaded assume no arguments passed in, try use default mode instead. + if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg"); + // if no model has been successfully loaded report failure. if (!loadedModel) {