Changeset 12529
- Timestamp:
- 06/14/11 18:54:20 (11 months ago)
- Location:
- OpenSceneGraph/trunk
- Files:
-
- 50 modified
-
examples/osganimate/osganimate.cpp (modified) (2 diffs)
-
examples/osgblendequation/osgblendequation.cpp (modified) (1 diff)
-
examples/osgcallback/osgcallback.cpp (modified) (1 diff)
-
examples/osgcamera/osgcamera.cpp (modified) (1 diff)
-
examples/osgcatch/osgcatch.cpp (modified) (1 diff)
-
examples/osgclip/osgclip.cpp (modified) (1 diff)
-
examples/osgcompositeviewer/osgcompositeviewer.cpp (modified) (2 diffs)
-
examples/osgcopy/osgcopy.cpp (modified) (1 diff)
-
examples/osgcubemap/osgcubemap.cpp (modified) (1 diff)
-
examples/osgdirectinput/osgdirectinput.cpp (modified) (1 diff)
-
examples/osgdistortion/osgdistortion.cpp (modified) (1 diff)
-
examples/osgdrawinstanced/osgdrawinstanced.cpp (modified) (1 diff)
-
examples/osgfxbrowser/osgfxbrowser.cpp (modified) (2 diffs)
-
examples/osggeometry/osggeometry.cpp (modified) (1 diff)
-
examples/osghud/osghud.cpp (modified) (1 diff)
-
examples/osgkeyboardmouse/osgkeyboardmouse.cpp (modified) (3 diffs)
-
examples/osglight/osglight.cpp (modified) (1 diff)
-
examples/osglogicop/osglogicop.cpp (modified) (1 diff)
-
examples/osgmotionblur/osgmotionblur.cpp (modified) (1 diff)
-
examples/osgmultitexture/osgmultitexture.cpp (modified) (1 diff)
-
examples/osgoccluder/osgoccluder.cpp (modified) (2 diffs)
-
examples/osgoutline/osgoutline.cpp (modified) (2 diffs)
-
examples/osgparticleeffects/osgparticleeffects.cpp (modified) (2 diffs)
-
examples/osgphotoalbum/osgphotoalbum.cpp (modified) (1 diff)
-
examples/osgpick/osgpick.cpp (modified) (1 diff)
-
examples/osgposter/osgposter.cpp (modified) (1 diff)
-
examples/osgprerender/osgprerender.cpp (modified) (2 diffs)
-
examples/osgreflect/osgreflect.cpp (modified) (2 diffs)
-
examples/osgscribe/osgscribe.cpp (modified) (1 diff)
-
examples/osgsequence/osgsequence.cpp (modified) (1 diff)
-
examples/osgshadow/osgshadow.cpp (modified) (3 diffs)
-
examples/osgsidebyside/osgsidebyside.cpp (modified) (2 diffs)
-
examples/osgsimplifier/osgsimplifier.cpp (modified) (1 diff)
-
examples/osgsimulation/osgsimulation.cpp (modified) (2 diffs)
-
examples/osgspheresegment/osgspheresegment.cpp (modified) (2 diffs)
-
examples/osgspotlight/osgspotlight.cpp (modified) (1 diff)
-
examples/osgstereoimage/osgstereoimage.cpp (modified) (1 diff)
-
examples/osgtexture1D/osgtexture1D.cpp (modified) (1 diff)
-
examples/osgthirdpersonview/osgthirdpersonview.cpp (modified) (2 diffs)
-
examples/osgunittests/FileNameUtils.cpp (modified) (1 diff)
-
examples/osgunittests/MultiThreadRead.cpp (modified) (1 diff)
-
examples/osgviewerFOX/FOX_OSG_MDIView.cpp (modified) (1 diff)
-
examples/osgviewerQt/osgviewerQt.cpp (modified) (1 diff)
-
examples/osgwidgetbox/osgwidgetbox.cpp (modified) (1 diff)
-
examples/osgwidgetmenu/osgwidgetmenu.cpp (modified) (1 diff)
-
examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp (modified) (2 diffs)
-
examples/osgwidgetprogress/osgwidgetprogress.cpp (modified) (1 diff)
-
examples/osgwidgetwindow/osgwidgetwindow.cpp (modified) (2 diffs)
-
examples/osgwindows/osgwindows.cpp (modified) (1 diff)
-
runexamples.bat (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/examples/osganimate/osganimate.cpp
r6941 r12529 148 148 osg::Group* model = new osg::Group; 149 149 150 osg::Node* glider = osgDB::readNodeFile("glider.osg ");150 osg::Node* glider = osgDB::readNodeFile("glider.osgt"); 151 151 if (glider) 152 152 { … … 169 169 } 170 170 171 osg::Node* cessna = osgDB::readNodeFile("cessna.osg ");171 osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); 172 172 if (cessna) 173 173 { -
OpenSceneGraph/trunk/examples/osgblendequation/osgblendequation.cpp
r6941 r12529 143 143 144 144 // if not loaded assume no arguments passed in, try use default mode instead. 145 if (!loadedModel) loadedModel = osgDB::readNodeFile("cessnafire.osg ");145 if (!loadedModel) loadedModel = osgDB::readNodeFile("cessnafire.osgt"); 146 146 147 147 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osgcallback/osgcallback.cpp
r11124 r12529 173 173 174 174 // if not loaded assume no arguments passed in, try use default mode instead. 175 if (!rootnode) rootnode = osgDB::readNodeFile("cow.osg ");175 if (!rootnode) rootnode = osgDB::readNodeFile("cow.osgt"); 176 176 177 177 if (!rootnode) -
OpenSceneGraph/trunk/examples/osgcamera/osgcamera.cpp
r10832 r12529 332 332 osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments); 333 333 334 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg ");334 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); 335 335 336 336 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osgcatch/osgcatch.cpp
r10643 r12529 1441 1441 rootNode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF); 1442 1442 1443 //osgDB::writeNodeFile(*rootNode,"test.osg ");1443 //osgDB::writeNodeFile(*rootNode,"test.osgt"); 1444 1444 1445 1445 // for some reason osgcatch is hanging on exit inside the new TextureObject clean up code when the it's -
OpenSceneGraph/trunk/examples/osgclip/osgclip.cpp
r6941 r12529 122 122 123 123 // if not loaded assume no arguments passed in, try use default mode instead. 124 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg ");124 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); 125 125 126 126 -
OpenSceneGraph/trunk/examples/osgcompositeviewer/osgcompositeviewer.cpp
r9705 r12529 151 151 osgViewer::View* view = new osgViewer::View; 152 152 view->setName("Single view"); 153 view->setSceneData(osgDB::readNodeFile("fountain.osg "));153 view->setSceneData(osgDB::readNodeFile("fountain.osgt")); 154 154 155 155 view->addEventHandler( new osgViewer::StatsHandler ); … … 285 285 viewer.addView(view); 286 286 287 view->setSceneData(osgDB::readNodeFile("cessnafire.osg "));287 view->setSceneData(osgDB::readNodeFile("cessnafire.osgt")); 288 288 289 289 view->getCamera()->setName("Cam three"); -
OpenSceneGraph/trunk/examples/osgcopy/osgcopy.cpp
r6941 r12529 235 235 // write out the various scene graphs so that they can be browsed, either 236 236 // in an editor or using a graphics diff tool gdiff/xdiff/xxdiff. 237 std::cout << std::endl << "Writing out the original scene graph as 'original.osg '"<<std::endl;238 osgDB::writeNodeFile(*rootnode,"original.osg ");239 240 std::cout << std::endl << "Writing out the graph preserving scene graph as 'graph_copy.osg '"<<std::endl;241 osgDB::writeNodeFile(*graph_copy,"graph_copy.osg ");242 243 std::cout << "Writing out the deep copied scene graph as 'deep_copy.osg '"<<std::endl;244 osgDB::writeNodeFile(*deep_copy,"deep_copy.osg ");245 246 std::cout << "Writing out the shallow copied scene graph as 'shallow_copy.osg '"<<std::endl;247 osgDB::writeNodeFile(*shallow_copy,"shallow_copy.osg ");237 std::cout << std::endl << "Writing out the original scene graph as 'original.osgt'"<<std::endl; 238 osgDB::writeNodeFile(*rootnode,"original.osgt"); 239 240 std::cout << std::endl << "Writing out the graph preserving scene graph as 'graph_copy.osgt'"<<std::endl; 241 osgDB::writeNodeFile(*graph_copy,"graph_copy.osgt"); 242 243 std::cout << "Writing out the deep copied scene graph as 'deep_copy.osgt'"<<std::endl; 244 osgDB::writeNodeFile(*deep_copy,"deep_copy.osgt"); 245 246 std::cout << "Writing out the shallow copied scene graph as 'shallow_copy.osgt'"<<std::endl; 247 osgDB::writeNodeFile(*shallow_copy,"shallow_copy.osgt"); 248 248 249 249 -
OpenSceneGraph/trunk/examples/osgcubemap/osgcubemap.cpp
r6941 r12529 99 99 100 100 // if not loaded assume no arguments passed in, try use default mode instead. 101 if (!rootnode) rootnode = osgDB::readNodeFile("cessna.osg ");101 if (!rootnode) rootnode = osgDB::readNodeFile("cessna.osgt"); 102 102 103 103 if (!rootnode) -
OpenSceneGraph/trunk/examples/osgdirectinput/osgdirectinput.cpp
r12292 r12529 98 98 osg::ArgumentParser arguments( &argc, argv ); 99 99 osg::Node* model = osgDB::readNodeFiles( arguments ); 100 if ( !model ) model = osgDB::readNodeFile( "cow.osg " );100 if ( !model ) model = osgDB::readNodeFile( "cow.osgt" ); 101 101 if ( !model ) 102 102 { -
OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp
r7098 r12529 670 670 671 671 // if not loaded assume no arguments passed in, try use default mode instead. 672 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg ");672 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); 673 673 674 674 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osgdrawinstanced/osgdrawinstanced.cpp
r12292 r12529 143 143 geode->setStateSet( ss.get() ); 144 144 145 // osgDB::writeNodeFile(*geode, "instanced.osg ");145 // osgDB::writeNodeFile(*geode, "instanced.osgt"); 146 146 147 147 osgViewer::Viewer viewer(arguments); -
OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp
r10869 r12529 95 95 } 96 96 if (ea.getKey() == 'x') { 97 osgDB::writeNodeFile(*ep_->getRoot(), "osgfx_model.osg ");98 std::cout << "written nodes to \"osgfx_model.osg \"\n";97 osgDB::writeNodeFile(*ep_->getRoot(), "osgfx_model.osgt"); 98 std::cout << "written nodes to \"osgfx_model.osgt\"\n"; 99 99 return true; 100 100 } … … 340 340 341 341 // if not loaded assume no arguments passed in, try use default mode instead. 342 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osg ");342 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); 343 343 344 344 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osggeometry/osggeometry.cpp
r11763 r12529 667 667 root->addChild( createBackground() ); 668 668 669 //osgDB::writeNodeFile(*root,"geoemtry.osg ");669 //osgDB::writeNodeFile(*root,"geoemtry.osgt"); 670 670 671 671 osgViewer::Viewer viewer; -
OpenSceneGraph/trunk/examples/osghud/osghud.cpp
r10248 r12529 276 276 277 277 // if not loaded assume no arguments passed in, try use default model instead. 278 if (!scene) scene = osgDB::readNodeFile("dumptruck.osg ");278 if (!scene) scene = osgDB::readNodeFile("dumptruck.osgt"); 279 279 280 280 -
OpenSceneGraph/trunk/examples/osgkeyboardmouse/osgkeyboardmouse.cpp
r7626 r12529 143 143 else if (ea.getKey()=='o') 144 144 { 145 osg::notify(osg::NOTICE)<<"Saved model to file 'saved_model.osg '"<<std::endl;146 osgDB::writeNodeFile(*(viewer->getSceneData()), "saved_model.osg ");145 osg::notify(osg::NOTICE)<<"Saved model to file 'saved_model.osgt'"<<std::endl; 146 osgDB::writeNodeFile(*(viewer->getSceneData()), "saved_model.osgt"); 147 147 } 148 148 else if (ea.getKey()=='p') … … 326 326 if (cmtsv._group->getNumChildren()>0) 327 327 { 328 std::cout<<"Writing selected compoents to 'selected_model.osg '"<<std::endl;329 osgDB::writeNodeFile(*cmtsv._group, "selected_model.osg ");328 std::cout<<"Writing selected compoents to 'selected_model.osgt'"<<std::endl; 329 osgDB::writeNodeFile(*cmtsv._group, "selected_model.osgt"); 330 330 } 331 331 } … … 346 346 347 347 // if not loaded assume no arguments passed in, try use default mode instead. 348 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osg ");348 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); 349 349 350 350 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osglight/osglight.cpp
r6941 r12529 328 328 329 329 // if not loaded assume no arguments passed in, try use default mode instead. 330 if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osg ");330 if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osgt"); 331 331 332 332 // create a room made of foor walls, a floor, a roof, and swinging light fitting. -
OpenSceneGraph/trunk/examples/osglogicop/osglogicop.cpp
r6941 r12529 146 146 147 147 // if not loaded assume no arguments passed in, try use default mode instead. 148 if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osg ");148 if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osgt"); 149 149 150 150 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osgmotionblur/osgmotionblur.cpp
r6941 r12529 99 99 100 100 // if not loaded assume no arguments passed in, try use default mode instead. 101 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg ");101 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); 102 102 103 103 // if no model has been successfully loaded report failure. -
OpenSceneGraph/trunk/examples/osgmultitexture/osgmultitexture.cpp
r9692 r12529 48 48 49 49 // if not loaded assume no arguments passed in, try use default mode instead. 50 if (!rootnode) rootnode = osgDB::readNodeFile("cessnafire.osg ");50 if (!rootnode) rootnode = osgDB::readNodeFile("cessnafire.osgt"); 51 51 52 52 if (!rootnode) -
OpenSceneGraph/trunk/examples/osgoccluder/osgoccluder.cpp
r11763 r12529 92 92 { 93 93 94 if (osgDB::writeNodeFile(*_occluders,"saved_occluders.osg "))95 std::cout<<"saved occluders to 'saved_occluders.osg '"<<std::endl;94 if (osgDB::writeNodeFile(*_occluders,"saved_occluders.osgt")) 95 std::cout<<"saved occluders to 'saved_occluders.osgt'"<<std::endl; 96 96 } 97 97 else … … 316 316 317 317 // if not loaded assume no arguments passed in, try using default mode instead. 318 if (!loadedmodel) loadedmodel = osgDB::readNodeFile("glider.osg ");318 if (!loadedmodel) loadedmodel = osgDB::readNodeFile("glider.osgt"); 319 319 320 320 if (!loadedmodel) -
OpenSceneGraph/trunk/examples/osgoutline/osgoutline.cpp
r12292 r12529 25 25 26 26 // load outlined object 27 std::string modelFilename = arguments.argc() > 1 ? arguments[1] : "dumptruck.osg ";27 std::string modelFilename = arguments.argc() > 1 ? arguments[1] : "dumptruck.osgt"; 28 28 osg::ref_ptr<osg::Node> outlineModel = osgDB::readNodeFile(modelFilename); 29 29 if (!outlineModel) … … 49 49 { 50 50 // load occluder 51 std::string occludedModelFilename = "cow.osg ";51 std::string occludedModelFilename = "cow.osgt"; 52 52 osg::ref_ptr<osg::Node> occludedModel = osgDB::readNodeFile(occludedModelFilename); 53 53 if (!occludedModel) -
OpenSceneGraph/trunk/examples/osgparticleeffects/osgparticleeffects.cpp
r8998 r12529 80 80 osg::Group* model = new osg::Group; 81 81 82 osg::Node* glider = osgDB::readNodeFile("glider.osg ");82 osg::Node* glider = osgDB::readNodeFile("glider.osgt"); 83 83 if (glider) 84 84 { … … 103 103 } 104 104 105 osg::Node* cessna = osgDB::readNodeFile("cessna.osg ");105 osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); 106 106 if (cessna) 107 107 { -
OpenSceneGraph/trunk/examples/osgphotoalbum/osgphotoalbum.cpp
r7648 r12529 761 761 762 762 763 //osgDB::writeNodeFile(*rootNode,"test.osg ");763 //osgDB::writeNodeFile(*rootNode,"test.osgt"); 764 764 765 765 // set the scene to render -
OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp
r9109 r12529 283 283 284 284 // if not loaded assume no arguments passed in, try use default mode instead. 285 if (!scene) scene = osgDB::readNodeFile("fountain.osg ");285 if (!scene) scene = osgDB::readNodeFile("fountain.osgt"); 286 286 287 287 osg::ref_ptr<osg::Group> group = dynamic_cast<osg::Group*>(scene.get()); -
OpenSceneGraph/trunk/examples/osgposter/osgposter.cpp
r12292 r12529 299 299 // Construct scene graph 300 300 osg::Node* scene = osgDB::readNodeFiles( arguments ); 301 if ( !scene ) scene = osgDB::readNodeFile( "cow.osg " );301 if ( !scene ) scene = osgDB::readNodeFile( "cow.osgt" ); 302 302 if ( !scene ) 303 303 { -
OpenSceneGraph/trunk/examples/osgprerender/osgprerender.cpp
r9137 r12529 468 468 469 469 // if not loaded assume no arguments passed in, try use default mode instead. 470 if (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osg ");470 if (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osgt"); 471 471 472 472 if (!loadedModel) … … 485 485 rootNode->addChild(createPreRenderSubGraph(loadedModelTransform,tex_width,tex_height, renderImplementation, useImage, useTextureRectangle, useHDR, samples, colorSamples)); 486 486 487 osgDB::writeNodeFile(*rootNode, "test.ive");487 //osgDB::writeNodeFile(*rootNode, "test.osgb"); 488 488 489 489 // add model to the viewer. -
OpenSceneGraph/trunk/examples/osgreflect/osgreflect.cpp
r7648 r12529 341 341 342 342 // if not loaded assume no arguments passed in, try use default mode instead. 343 if (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osg ");343 if (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osgt"); 344 344 345 345 // if no model has been successfully loaded report failure. … … 372 372 osg::DisplaySettings::instance()->setMinimumNumStencilBits(8); 373 373 374 osgDB::writeNodeFile(*rootNode, "test.osg");374 //osgDB::writeNodeFile(*rootNode, "test.osgt"); 375 375 376 376 return viewer.run(); -
OpenSceneGraph/trunk/examples/osgscribe/osgscribe.cpp
r6941 r12529 44 44 45 45 // if not loaded assume no arguments passed in, try use default mode instead. 46 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg ");46 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); 47 47 48 48 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osgsequence/osgsequence.cpp
r6941 r12529 135 135 else 136 136 { 137 filenames.push_back("cow.osg ");138 filenames.push_back("dumptruck.osg ");139 filenames.push_back("cessna.osg ");140 filenames.push_back("glider.osg ");137 filenames.push_back("cow.osgt"); 138 filenames.push_back("dumptruck.osgt"); 139 filenames.push_back("cessna.osgt"); 140 filenames.push_back("glider.osgt"); 141 141 } 142 142 -
OpenSceneGraph/trunk/examples/osgshadow/osgshadow.cpp
r12207 r12529 424 424 osg::Group* model = new osg::Group; 425 425 426 osg::Node* cessna = osgDB::readNodeFile("cessna.osg ");426 osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); 427 427 if (cessna) 428 428 { … … 960 960 961 961 962 // osgDB::writeNodeFile(*group,"test.osg ");962 // osgDB::writeNodeFile(*group,"test.osgt"); 963 963 964 964 while (!viewer.done()) … … 1017 1017 dumpFileNo ++; 1018 1018 char filename[256]; 1019 std::sprintf( filename, "shadowDump%d.osg ", dumpFileNo );1019 std::sprintf( filename, "shadowDump%d.osgt", dumpFileNo ); 1020 1020 1021 1021 osgShadow::MinimalShadowMap * msm = dynamic_cast<osgShadow::MinimalShadowMap*>( shadowedScene->getShadowTechnique() ); -
OpenSceneGraph/trunk/examples/osgsidebyside/osgsidebyside.cpp
r12292 r12529 242 242 osgViewer::Viewer viewer(arguments); 243 243 244 std::string outputfile("output.osg ");244 std::string outputfile("output.osgt"); 245 245 while (arguments.read("-o",outputfile)) {} 246 246 … … 279 279 280 280 // Uncomment these lines if you like to compare the loaded model to the resulting model in a merge/diff tool 281 //osgDB::writeNodeFile(*loadedModel.get(), "dummy1.osg ");281 //osgDB::writeNodeFile(*loadedModel.get(), "dummy1.osgt"); 282 282 283 283 osgDB::writeNodeFile(*loadedModel.get(), outputfile); 284 284 osg::ref_ptr<osg::Node> convertedModel = osgDB::readNodeFile(outputfile); 285 285 286 //osgDB::writeNodeFile(*convertedModel.get(), "dummy2.osg ");286 //osgDB::writeNodeFile(*convertedModel.get(), "dummy2.osgt"); 287 287 288 288 osg::Group* group2 = new osg::Group; -
OpenSceneGraph/trunk/examples/osgsimplifier/osgsimplifier.cpp
r6941 r12529 103 103 104 104 // if not loaded assume no arguments passed in, try use default mode instead. 105 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osg ");105 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); 106 106 107 107 // if no model has been successfully loaded report failure. -
OpenSceneGraph/trunk/examples/osgsimulation/osgsimulation.cpp
r9124 r12529 402 402 403 403 404 osg::Node* cessna = osgDB::readNodeFile("cessna.osg ");404 osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); 405 405 if (cessna) 406 406 { … … 458 458 else 459 459 { 460 std::cout<<"Failed to read cessna.osg "<<std::endl;460 std::cout<<"Failed to read cessna.osgt"<<std::endl; 461 461 } 462 462 -
OpenSceneGraph/trunk/examples/osgspheresegment/osgspheresegment.cpp
r11605 r12529 184 184 osg::Group* model = new osg::Group; 185 185 186 osg::Node* glider = osgDB::readNodeFile("glider.osg ");186 osg::Node* glider = osgDB::readNodeFile("glider.osgt"); 187 187 if (glider) 188 188 { … … 237 237 } 238 238 239 osg::Node* cessna = osgDB::readNodeFile("cessna.osg ");239 osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); 240 240 if (cessna) 241 241 { -
OpenSceneGraph/trunk/examples/osgspotlight/osgspotlight.cpp
r12295 r12529 229 229 osg::Group* model = new osg::Group; 230 230 231 osg::Node* cessna = osgDB::readNodeFile("cessna.osg ");231 osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); 232 232 if (cessna) 233 233 { -
OpenSceneGraph/trunk/examples/osgstereoimage/osgstereoimage.cpp
r9972 r12529 617 617 else rootNode=new osg::Switch(); 618 618 619 //osgDB::writeNodeFile(*rootNode,"test.osg ");619 //osgDB::writeNodeFile(*rootNode,"test.osgt"); 620 620 621 621 -
OpenSceneGraph/trunk/examples/osgtexture1D/osgtexture1D.cpp
r10066 r12529 152 152 153 153 // if not loaded assume no arguments passed in, try use default mode instead. 154 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osg ");154 if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); 155 155 156 156 if (!loadedModel) -
OpenSceneGraph/trunk/examples/osgthirdpersonview/osgthirdpersonview.cpp
r12292 r12529 33 33 // 34 34 // Command line arguments are taken to be models for display. If you 35 // specify no command line arguments, the code attempts to load cow.osg .35 // specify no command line arguments, the code attempts to load cow.osgt. 36 36 37 37 … … 148 148 // User didn't specify anything, or file(s) didn't exist. 149 149 // Try to load the cow... 150 osg::notify( osg::WARN ) << arguments.getApplicationName() << ": Could not find specified files. Trying \"cow.osg \" instead." << std::endl;151 if ( !(scene = osgDB::readNodeFile( std::string( "cow.osg " ) ) ) )150 osg::notify( osg::WARN ) << arguments.getApplicationName() << ": Could not find specified files. Trying \"cow.osgt\" instead." << std::endl; 151 if ( !(scene = osgDB::readNodeFile( std::string( "cow.osgt" ) ) ) ) 152 152 { 153 153 osg::notify( osg::FATAL ) << arguments.getApplicationName() << ": No data loaded." << std::endl; -
OpenSceneGraph/trunk/examples/osgunittests/FileNameUtils.cpp
r12292 r12529 30 30 strings.push_back(std::string("")); 31 31 strings.push_back(std::string("myfile")); 32 strings.push_back(std::string(".osg "));33 strings.push_back(std::string("myfile.osg "));34 strings.push_back(std::string("/myfile.osg "));35 strings.push_back(std::string("home/robert/myfile.osg "));36 strings.push_back(std::string("/home/robert/myfile.osg "));37 strings.push_back(std::string("\\myfile.osg "));38 strings.push_back(std::string("home\\robert\\myfile.osg "));39 strings.push_back(std::string("\\home\\robert\\myfile.osg "));40 strings.push_back(std::string("\\home/robert\\myfile.osg "));41 strings.push_back(std::string("\\home\\robert/myfile.osg "));32 strings.push_back(std::string(".osgt")); 33 strings.push_back(std::string("myfile.osgt")); 34 strings.push_back(std::string("/myfile.osgt")); 35 strings.push_back(std::string("home/robert/myfile.osgt")); 36 strings.push_back(std::string("/home/robert/myfile.osgt")); 37 strings.push_back(std::string("\\myfile.osgt")); 38 strings.push_back(std::string("home\\robert\\myfile.osgt")); 39 strings.push_back(std::string("\\home\\robert\\myfile.osgt")); 40 strings.push_back(std::string("\\home/robert\\myfile.osgt")); 41 strings.push_back(std::string("\\home\\robert/myfile.osgt")); 42 42 strings.push_back(std::string("home/robert/")); 43 43 strings.push_back(std::string("\\home\\robert\\")); 44 44 strings.push_back(std::string("home/robert/myfile")); 45 45 strings.push_back(std::string("\\home\\robert\\myfile")); 46 strings.push_back(std::string("home/robert/.osg "));47 strings.push_back(std::string("\\home\\robert\\.osg "));48 strings.push_back(std::string("home/robert/myfile.ext.osg "));49 strings.push_back(std::string("home\\robert\\myfile.ext.osg "));46 strings.push_back(std::string("home/robert/.osgt")); 47 strings.push_back(std::string("\\home\\robert\\.osgt")); 48 strings.push_back(std::string("home/robert/myfile.ext.osgt")); 49 strings.push_back(std::string("home\\robert\\myfile.ext.osgt")); 50 50 51 51 for(Strings::iterator itr = strings.begin(); -
OpenSceneGraph/trunk/examples/osgunittests/MultiThreadRead.cpp
r12292 r12529 193 193 readThread->setEndBarrier(endBarrier.get()); 194 194 195 readThread->addFileName("cessna.osg ");196 readThread->addFileName("glider.osg ");195 readThread->addFileName("cessna.osgt"); 196 readThread->addFileName("glider.osgt"); 197 197 readThread->addFileName("town.ive"); 198 198 -
OpenSceneGraph/trunk/examples/osgviewerFOX/FOX_OSG_MDIView.cpp
r12292 r12529 40 40 41 41 // load the scene. 42 osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile("cow.osg ");42 osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile("cow.osgt"); 43 43 if (!loadedModel) 44 44 { -
OpenSceneGraph/trunk/examples/osgviewerQt/osgviewerQt.cpp
r12415 r12529 21 21 setThreadingModel(threadingModel); 22 22 23 QWidget* widget1 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("cow.osg ") );24 QWidget* widget2 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("glider.osg ") );25 QWidget* widget3 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("axes.osg ") );26 QWidget* widget4 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("fountain.osg ") );23 QWidget* widget1 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("cow.osgt") ); 24 QWidget* widget2 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("glider.osgt") ); 25 QWidget* widget3 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("axes.osgt") ); 26 QWidget* widget4 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("fountain.osgt") ); 27 27 QWidget* popupWidget = addViewWidget( createCamera(900,100,320,240,"Popup window",true), 28 osgDB::readNodeFile("dumptruck.osg ") );28 osgDB::readNodeFile("dumptruck.osgt") ); 29 29 popupWidget->show(); 30 30 -
OpenSceneGraph/trunk/examples/osgwidgetbox/osgwidgetbox.cpp
r12292 r12529 113 113 box4->hide(); 114 114 115 osg::Node* model = osgDB::readNodeFile("spaceship.osg ");115 osg::Node* model = osgDB::readNodeFile("spaceship.osgt"); 116 116 117 117 model->setNodeMask(MASK_3D); -
OpenSceneGraph/trunk/examples/osgwidgetmenu/osgwidgetmenu.cpp
r12310 r12529 121 121 menu->resizePercent(100.0f); 122 122 123 osg::Node* model = osgDB::readNodeFile("osgcool.osg ");123 osg::Node* model = osgDB::readNodeFile("osgcool.osgt"); 124 124 125 125 model->setNodeMask(MASK_3D); -
OpenSceneGraph/trunk/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp
r12292 r12529 347 347 // AlphaSetterVisitor alpha(.8f); 348 348 // frame->accept(alpha); 349 return osgWidget::createExample(viewer, wm); //osgDB::readNodeFile("cow.osg "));349 return osgWidget::createExample(viewer, wm); //osgDB::readNodeFile("cow.osgt")); 350 350 351 351 } … … 675 675 AlphaSetterVisitor alpha(.8f); 676 676 frame->accept(alpha); 677 return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osg "));677 return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osgt")); 678 678 } 679 679 #endif -
OpenSceneGraph/trunk/examples/osgwidgetprogress/osgwidgetprogress.cpp
r12292 r12529 88 88 wm->addChild(canvas); 89 89 90 return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osg "));90 return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osgt")); 91 91 } -
OpenSceneGraph/trunk/examples/osgwidgetwindow/osgwidgetwindow.cpp
r12292 r12529 158 158 159 159 // Here we demonstrate the use of osgWidget/io_utils. This is really only useful for 160 // debugging at the moment, but later I'll make it more generic for .osg and .ive 161 // creation. 160 // debugging at the moment. 162 161 // std::cout << *box << std::endl << *boxCopy << std::endl; 163 162 … … 170 169 osg::Group* group = new osg::Group(); 171 170 osg::Camera* camera = osgWidget::createOrthoCamera(1280.0f, 1024.0f); 172 osg::Node* model = osgDB::readNodeFile("cow.osg ");171 osg::Node* model = osgDB::readNodeFile("cow.osgt"); 173 172 174 173 // Add our event handler; is this better as a MatrixManipulator? Add a few other -
OpenSceneGraph/trunk/examples/osgwindows/osgwindows.cpp
r7065 r12529 33 33 34 34 // if not loaded assume no arguments passed in, try use default mode instead. 35 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg ");35 if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); 36 36 37 37 // if no model has been successfully loaded report failure. -
OpenSceneGraph/trunk/runexamples.bat
r10869 r12529 43 43 osgfxbrowser 44 44 45 echo osgoutline cow.osg 46 osgoutline cow.osg 45 echo osgoutline cow.osgt 46 osgoutline cow.osgt 47 47 48 48 echo osggeometry … … 53 53 54 54 echo osghud 55 osghud dumptruck.osg 55 osghud dumptruck.osgt 56 56 57 57 echo osgimpostor … … 62 62 63 63 echo osgkeyboardmouse 64 osgkeyboardmouse dumptruck.osg 64 osgkeyboardmouse dumptruck.osgt 65 65 66 66 echo osglight 67 osglight glider.osg 67 osglight glider.osgt 68 68 69 69 echo osglightpoint … … 74 74 75 75 echo osglogicop 76 osglogicop glider.osg 76 osglogicop glider.osgt 77 77 78 78 echo osgmotionblur 79 osgmotionblur cow.osg 79 osgmotionblur cow.osgt 80 80 81 81 echo osgmultitexture 82 osgmultitexture cessnafire.osg 82 osgmultitexture cessnafire.osgt 83 83 84 84 echo osgoccluder 85 osgoccluder glider.osg 85 osgoccluder glider.osgt 86 86 87 87 echo osgocclusionquery … … 95 95 96 96 echo osgpick 97 osgpick fountain.osg 97 osgpick fountain.osgt 98 98 99 99 echo osgpointsprite … … 104 104 105 105 echo osgprecipitation --rain 0.5 106 osgprecipitation --rain 0.5 lz.osg 106 osgprecipitation --rain 0.5 lz.osgt 107 107 108 108 echo osgprecipitation --snow 0.5 109 osgprecipitation --snow 0.5 lz.osg 109 osgprecipitation --snow 0.5 lz.osgt 110 110 111 111 echo osgprerender 112 osgprerender dumptruck.osg 112 osgprerender dumptruck.osgt 113 113 114 114 echo osgprerendercubemap … … 116 116 117 117 echo osgreflect 118 osgreflect cessna.osg 118 osgreflect cessna.osgt 119 119 120 120 echo osgscalarbar … … 122 122 123 123 echo osgscribe 124 osgscribe cow.osg 124 osgscribe cow.osgt 125 125 126 126 echo osgsequence 127 osgsequence cow.osg dumptruck.osg cessna.osg glider.osg127 osgsequence cow.osgt dumptruck.osgt cessna.osgt glider.osgt 128 128 129 129 echo osgshaders … … 137 137 138 138 echo osgthirdpersonview 139 osgthirdpersonview cow.osg 140 141 echo osgviewer glsl_simple.osg 142 osgviewer glsl_simple.osg 143 144 echo osgviewer glsl_confetti.osg 145 osgviewer glsl_confetti.osg 146 147 echo osgviewer glsl_mandelbrot.osg 148 osgviewer glsl_mandelbrot.osg 149 150 echo osgviewer glsl_julia.osg 151 osgviewer glsl_julia.osg 139 osgthirdpersonview cow.osgt 140 141 echo osgviewer glsl_simple.osgt 142 osgviewer glsl_simple.osgt 143 144 echo osgviewer glsl_confetti.osgt 145 osgviewer glsl_confetti.osgt 146 147 echo osgviewer glsl_mandelbrot.osgt 148 osgviewer glsl_mandelbrot.osgt 149 150 echo osgviewer glsl_julia.osgt 151 osgviewer glsl_julia.osgt 152 152 153 153 echo osgshape … … 164 164 165 165 echo osgsimplifier 166 osgsimplifier --ratio 0.1 cessna.osg 166 osgsimplifier --ratio 0.1 cessna.osgt 167 167 168 168 echo osgsimulation
