- Timestamp:
- 06/08/07 14:13:33 (6 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp
r6858 r6908 31 31 #include <osgViewer/ViewerEventHandlers> 32 32 33 #include <iostream> 34 33 35 using namespace osg; 34 36 … … 645 647 // construct the viewer. 646 648 osgViewer::Viewer viewer; 649 650 // load the nodes from the commandline arguments. 651 osg::Node* loadedModel = osgDB::readNodeFiles(arguments); 652 653 // if not loaded assume no arguments passed in, try use default mode instead. 654 if (!loadedModel) loadedModel = osgDB::readNodeFile("cessnafire.osg"); 655 656 if (!loadedModel) 657 { 658 std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl; 659 return 1; 660 } 647 661 648 662 … … 652 666 setDomeCorrection(viewer, arguments); 653 667 654 viewer.setSceneData( osgDB::readNodeFiles(arguments));668 viewer.setSceneData( loadedModel ); 655 669 } 656 670 else if (arguments.read("--faces")) … … 659 673 setDomeFaces(viewer, arguments); 660 674 661 viewer.setSceneData( osgDB::readNodeFiles(arguments));675 viewer.setSceneData( loadedModel ); 662 676 } 663 677 else 664 678 { 665 osg::Node* distortionNode = createDistortionSubgraph( osgDB::readNodeFiles(arguments), viewer.getCamera()->getClearColor());679 osg::Node* distortionNode = createDistortionSubgraph( loadedModel, viewer.getCamera()->getClearColor()); 666 680 viewer.setSceneData( distortionNode ); 667 681 }
