diff --git a/examples/osganimate/osganimate.cpp b/examples/osganimate/osganimate.cpp index 1941d85d5..d4ebb6791 100644 --- a/examples/osganimate/osganimate.cpp +++ b/examples/osganimate/osganimate.cpp @@ -147,7 +147,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius) osg::Group* model = new osg::Group; - osg::Node* glider = osgDB::readNodeFile("glider.osg"); + osg::Node* glider = osgDB::readNodeFile("glider.osgt"); if (glider) { const osg::BoundingSphere& bs = glider->getBound(); @@ -168,7 +168,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius) model->addChild(xform); } - osg::Node* cessna = osgDB::readNodeFile("cessna.osg"); + osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); if (cessna) { const osg::BoundingSphere& bs = cessna->getBound(); diff --git a/examples/osgblendequation/osgblendequation.cpp b/examples/osgblendequation/osgblendequation.cpp index b643a01ad..ddf5cb8f8 100644 --- a/examples/osgblendequation/osgblendequation.cpp +++ b/examples/osgblendequation/osgblendequation.cpp @@ -142,7 +142,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("cessnafire.osgt"); if (!loadedModel) { diff --git a/examples/osgcallback/osgcallback.cpp b/examples/osgcallback/osgcallback.cpp index cdc9c20e8..de5d264e9 100644 --- a/examples/osgcallback/osgcallback.cpp +++ b/examples/osgcallback/osgcallback.cpp @@ -172,7 +172,7 @@ int main( int argc, char **argv ) osg::Node* rootnode = osgDB::readNodeFiles(arguments); // if not loaded assume no arguments passed in, try use default mode instead. - if (!rootnode) rootnode = osgDB::readNodeFile("cow.osg"); + if (!rootnode) rootnode = osgDB::readNodeFile("cow.osgt"); if (!rootnode) { diff --git a/examples/osgcamera/osgcamera.cpp b/examples/osgcamera/osgcamera.cpp index 890e7b021..a139c62ed 100644 --- a/examples/osgcamera/osgcamera.cpp +++ b/examples/osgcamera/osgcamera.cpp @@ -331,7 +331,7 @@ int main( int argc, char **argv ) // load the scene. osg::ref_ptr loadedModel = osgDB::readNodeFiles(arguments); - if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); if (!loadedModel) { diff --git a/examples/osgcatch/osgcatch.cpp b/examples/osgcatch/osgcatch.cpp index d94c1d2e0..85fbe81e0 100644 --- a/examples/osgcatch/osgcatch.cpp +++ b/examples/osgcatch/osgcatch.cpp @@ -1440,7 +1440,7 @@ int main( int argc, char **argv ) rootNode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF); - //osgDB::writeNodeFile(*rootNode,"test.osg"); + //osgDB::writeNodeFile(*rootNode,"test.osgt"); // for some reason osgcatch is hanging on exit inside the new TextureObject clean up code when the it's // run as multi-threaded view, switching to SingleThreaded cures this. diff --git a/examples/osgclip/osgclip.cpp b/examples/osgclip/osgclip.cpp index 124261174..2e5be9cf9 100644 --- a/examples/osgclip/osgclip.cpp +++ b/examples/osgclip/osgclip.cpp @@ -121,7 +121,7 @@ int main( int argc, char **argv ) // if not loaded assume no arguments passed in, try use default mode instead. - if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); if (!loadedModel) diff --git a/examples/osgcompositeviewer/osgcompositeviewer.cpp b/examples/osgcompositeviewer/osgcompositeviewer.cpp index 8ce219504..bc1bfbb2f 100644 --- a/examples/osgcompositeviewer/osgcompositeviewer.cpp +++ b/examples/osgcompositeviewer/osgcompositeviewer.cpp @@ -150,7 +150,7 @@ int main( int argc, char **argv ) { osgViewer::View* view = new osgViewer::View; view->setName("Single view"); - view->setSceneData(osgDB::readNodeFile("fountain.osg")); + view->setSceneData(osgDB::readNodeFile("fountain.osgt")); view->addEventHandler( new osgViewer::StatsHandler ); @@ -284,7 +284,7 @@ int main( int argc, char **argv ) view->setName("View three"); viewer.addView(view); - view->setSceneData(osgDB::readNodeFile("cessnafire.osg")); + view->setSceneData(osgDB::readNodeFile("cessnafire.osgt")); view->getCamera()->setName("Cam three"); view->getCamera()->setProjectionMatrixAsPerspective(30.0, double(traits->width) / double(traits->height/2), 1.0, 1000.0); diff --git a/examples/osgcopy/osgcopy.cpp b/examples/osgcopy/osgcopy.cpp index d01a87ce5..76d05cc28 100644 --- a/examples/osgcopy/osgcopy.cpp +++ b/examples/osgcopy/osgcopy.cpp @@ -234,17 +234,17 @@ int main( int argc, char **argv ) // write out the various scene graphs so that they can be browsed, either // in an editor or using a graphics diff tool gdiff/xdiff/xxdiff. - std::cout << std::endl << "Writing out the original scene graph as 'original.osg'"< ss = createStateSet(); geode->setStateSet( ss.get() ); - // osgDB::writeNodeFile(*geode, "instanced.osg"); + // osgDB::writeNodeFile(*geode, "instanced.osgt"); osgViewer::Viewer viewer(arguments); viewer.setSceneData( geode.get() ); diff --git a/examples/osgfxbrowser/osgfxbrowser.cpp b/examples/osgfxbrowser/osgfxbrowser.cpp index 901712801..c33f9c924 100644 --- a/examples/osgfxbrowser/osgfxbrowser.cpp +++ b/examples/osgfxbrowser/osgfxbrowser.cpp @@ -94,8 +94,8 @@ public: return true; } if (ea.getKey() == 'x') { - osgDB::writeNodeFile(*ep_->getRoot(), "osgfx_model.osg"); - std::cout << "written nodes to \"osgfx_model.osg\"\n"; + osgDB::writeNodeFile(*ep_->getRoot(), "osgfx_model.osgt"); + std::cout << "written nodes to \"osgfx_model.osgt\"\n"; return true; } if (ea.getKey() == 'r') { @@ -339,7 +339,7 @@ int main(int argc, char *argv[]) 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("dumptruck.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); if (!loadedModel) { diff --git a/examples/osggeometry/osggeometry.cpp b/examples/osggeometry/osggeometry.cpp index a0c270d77..ba218fc22 100644 --- a/examples/osggeometry/osggeometry.cpp +++ b/examples/osggeometry/osggeometry.cpp @@ -666,7 +666,7 @@ int main(int, char **) root->addChild( createScene() ); root->addChild( createBackground() ); - //osgDB::writeNodeFile(*root,"geoemtry.osg"); + //osgDB::writeNodeFile(*root,"geoemtry.osgt"); osgViewer::Viewer viewer; diff --git a/examples/osghud/osghud.cpp b/examples/osghud/osghud.cpp index 01f5b14ce..11b81bb24 100644 --- a/examples/osghud/osghud.cpp +++ b/examples/osghud/osghud.cpp @@ -275,7 +275,7 @@ int main( int argc, char **argv ) osg::ref_ptr scene = osgDB::readNodeFiles(arguments); // if not loaded assume no arguments passed in, try use default model instead. - if (!scene) scene = osgDB::readNodeFile("dumptruck.osg"); + if (!scene) scene = osgDB::readNodeFile("dumptruck.osgt"); if (!scene) diff --git a/examples/osgkeyboardmouse/osgkeyboardmouse.cpp b/examples/osgkeyboardmouse/osgkeyboardmouse.cpp index 655cdf6a2..d9d1f1fbe 100644 --- a/examples/osgkeyboardmouse/osgkeyboardmouse.cpp +++ b/examples/osgkeyboardmouse/osgkeyboardmouse.cpp @@ -142,8 +142,8 @@ public: } else if (ea.getKey()=='o') { - osg::notify(osg::NOTICE)<<"Saved model to file 'saved_model.osg'"<getSceneData()), "saved_model.osg"); + osg::notify(osg::NOTICE)<<"Saved model to file 'saved_model.osgt'"<getSceneData()), "saved_model.osgt"); } else if (ea.getKey()=='p') { @@ -325,8 +325,8 @@ public: if (cmtsv._group->getNumChildren()>0) { - std::cout<<"Writing selected compoents to 'selected_model.osg'"<1) loadedModel = osgDB::readNodeFile(argv[1]); // if not loaded assume no arguments passed in, try use default mode instead. - if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); if (!loadedModel) { diff --git a/examples/osglight/osglight.cpp b/examples/osglight/osglight.cpp index 0bdd231f3..25b3eda92 100644 --- a/examples/osglight/osglight.cpp +++ b/examples/osglight/osglight.cpp @@ -327,7 +327,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("glider.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osgt"); // create a room made of foor walls, a floor, a roof, and swinging light fitting. osg::Node* rootnode = createRoom(loadedModel); diff --git a/examples/osglogicop/osglogicop.cpp b/examples/osglogicop/osglogicop.cpp index 7a251b39b..acee4228d 100644 --- a/examples/osglogicop/osglogicop.cpp +++ b/examples/osglogicop/osglogicop.cpp @@ -145,7 +145,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("glider.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osgt"); if (!loadedModel) { diff --git a/examples/osgmotionblur/osgmotionblur.cpp b/examples/osgmotionblur/osgmotionblur.cpp index 82eb28160..4cdaeec7b 100644 --- a/examples/osgmotionblur/osgmotionblur.cpp +++ b/examples/osgmotionblur/osgmotionblur.cpp @@ -98,7 +98,7 @@ int main( int argc, char **argv ) 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 (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); // if no model has been successfully loaded report failure. if (!loadedModel) diff --git a/examples/osgmultitexture/osgmultitexture.cpp b/examples/osgmultitexture/osgmultitexture.cpp index 69b289b5e..2d32309fd 100644 --- a/examples/osgmultitexture/osgmultitexture.cpp +++ b/examples/osgmultitexture/osgmultitexture.cpp @@ -47,7 +47,7 @@ int main( int argc, char **argv ) 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) rootnode = osgDB::readNodeFile("cessnafire.osgt"); if (!rootnode) { diff --git a/examples/osgoccluder/osgoccluder.cpp b/examples/osgoccluder/osgoccluder.cpp index f9832b033..2de12f858 100644 --- a/examples/osgoccluder/osgoccluder.cpp +++ b/examples/osgoccluder/osgoccluder.cpp @@ -91,8 +91,8 @@ bool OccluderEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIAct if (_occluders.valid()) { - if (osgDB::writeNodeFile(*_occluders,"saved_occluders.osg")) - std::cout<<"saved occluders to 'saved_occluders.osg'"< 1 ? arguments[1] : "dumptruck.osg"; + std::string modelFilename = arguments.argc() > 1 ? arguments[1] : "dumptruck.osgt"; osg::ref_ptr outlineModel = osgDB::readNodeFile(modelFilename); if (!outlineModel) { @@ -48,7 +48,7 @@ int main(int argc, char** argv) if (testOcclusion) { // load occluder - std::string occludedModelFilename = "cow.osg"; + std::string occludedModelFilename = "cow.osgt"; osg::ref_ptr occludedModel = osgDB::readNodeFile(occludedModelFilename); if (!occludedModel) { diff --git a/examples/osgparticleeffects/osgparticleeffects.cpp b/examples/osgparticleeffects/osgparticleeffects.cpp index f53353d68..121119766 100644 --- a/examples/osgparticleeffects/osgparticleeffects.cpp +++ b/examples/osgparticleeffects/osgparticleeffects.cpp @@ -79,7 +79,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius) osg::Group* model = new osg::Group; - osg::Node* glider = osgDB::readNodeFile("glider.osg"); + osg::Node* glider = osgDB::readNodeFile("glider.osgt"); if (glider) { const osg::BoundingSphere& bs = glider->getBound(); @@ -102,7 +102,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius) model->addChild(xform); } - osg::Node* cessna = osgDB::readNodeFile("cessna.osg"); + osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); if (cessna) { const osg::BoundingSphere& bs = cessna->getBound(); diff --git a/examples/osgphotoalbum/osgphotoalbum.cpp b/examples/osgphotoalbum/osgphotoalbum.cpp index b785a86ba..dfdfd89d6 100644 --- a/examples/osgphotoalbum/osgphotoalbum.cpp +++ b/examples/osgphotoalbum/osgphotoalbum.cpp @@ -760,7 +760,7 @@ int main( int argc, char **argv ) if (!rootNode) return 0; - //osgDB::writeNodeFile(*rootNode,"test.osg"); + //osgDB::writeNodeFile(*rootNode,"test.osgt"); // set the scene to render viewer.setSceneData(album->getScene()); diff --git a/examples/osgpick/osgpick.cpp b/examples/osgpick/osgpick.cpp index 5d5e39a96..8a624baee 100644 --- a/examples/osgpick/osgpick.cpp +++ b/examples/osgpick/osgpick.cpp @@ -282,7 +282,7 @@ int main( int argc, char **argv ) } // if not loaded assume no arguments passed in, try use default mode instead. - if (!scene) scene = osgDB::readNodeFile("fountain.osg"); + if (!scene) scene = osgDB::readNodeFile("fountain.osgt"); osg::ref_ptr group = dynamic_cast(scene.get()); if (!group) diff --git a/examples/osgposter/osgposter.cpp b/examples/osgposter/osgposter.cpp index f92514fe1..75dae912a 100644 --- a/examples/osgposter/osgposter.cpp +++ b/examples/osgposter/osgposter.cpp @@ -298,7 +298,7 @@ int main( int argc, char** argv ) // Construct scene graph osg::Node* scene = osgDB::readNodeFiles( arguments ); - if ( !scene ) scene = osgDB::readNodeFile( "cow.osg" ); + if ( !scene ) scene = osgDB::readNodeFile( "cow.osgt" ); if ( !scene ) { std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl; diff --git a/examples/osgprerender/osgprerender.cpp b/examples/osgprerender/osgprerender.cpp index a6e2cbb68..8b0de5277 100644 --- a/examples/osgprerender/osgprerender.cpp +++ b/examples/osgprerender/osgprerender.cpp @@ -467,7 +467,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("cessna.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osgt"); if (!loadedModel) { @@ -484,7 +484,7 @@ int main( int argc, char **argv ) osg::Group* rootNode = new osg::Group(); rootNode->addChild(createPreRenderSubGraph(loadedModelTransform,tex_width,tex_height, renderImplementation, useImage, useTextureRectangle, useHDR, samples, colorSamples)); - osgDB::writeNodeFile(*rootNode, "test.ive"); + //osgDB::writeNodeFile(*rootNode, "test.osgb"); // add model to the viewer. viewer.setSceneData( rootNode ); diff --git a/examples/osgreflect/osgreflect.cpp b/examples/osgreflect/osgreflect.cpp index ba72a164a..0254a655c 100644 --- a/examples/osgreflect/osgreflect.cpp +++ b/examples/osgreflect/osgreflect.cpp @@ -340,7 +340,7 @@ int main( int argc, char **argv ) 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 (!loadedModel) loadedModel = osgDB::readNodeFile("cessna.osgt"); // if no model has been successfully loaded report failure. if (!loadedModel) @@ -371,7 +371,7 @@ int main( int argc, char **argv ) // hint to tell viewer to request stencil buffer when setting up windows osg::DisplaySettings::instance()->setMinimumNumStencilBits(8); - osgDB::writeNodeFile(*rootNode, "test.osg"); + //osgDB::writeNodeFile(*rootNode, "test.osgt"); return viewer.run(); diff --git a/examples/osgscribe/osgscribe.cpp b/examples/osgscribe/osgscribe.cpp index e4409aa93..0ac0b5eed 100644 --- a/examples/osgscribe/osgscribe.cpp +++ b/examples/osgscribe/osgscribe.cpp @@ -43,7 +43,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("cow.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); if (!loadedModel) { diff --git a/examples/osgsequence/osgsequence.cpp b/examples/osgsequence/osgsequence.cpp index 08b521fec..c42cf087b 100644 --- a/examples/osgsequence/osgsequence.cpp +++ b/examples/osgsequence/osgsequence.cpp @@ -134,10 +134,10 @@ osg::Sequence* createSequence(osg::ArgumentParser& arguments) } else { - filenames.push_back("cow.osg"); - filenames.push_back("dumptruck.osg"); - filenames.push_back("cessna.osg"); - filenames.push_back("glider.osg"); + filenames.push_back("cow.osgt"); + filenames.push_back("dumptruck.osgt"); + filenames.push_back("cessna.osgt"); + filenames.push_back("glider.osgt"); } for(Filenames::iterator itr = filenames.begin(); diff --git a/examples/osgshadow/osgshadow.cpp b/examples/osgshadow/osgshadow.cpp index 91de7d052..ffe79fc8d 100644 --- a/examples/osgshadow/osgshadow.cpp +++ b/examples/osgshadow/osgshadow.cpp @@ -423,7 +423,7 @@ namespace ModelTwo osg::Group* model = new osg::Group; - osg::Node* cessna = osgDB::readNodeFile("cessna.osg"); + osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); if (cessna) { const osg::BoundingSphere& bs = cessna->getBound(); @@ -959,7 +959,7 @@ int main(int argc, char** argv) } - // osgDB::writeNodeFile(*group,"test.osg"); + // osgDB::writeNodeFile(*group,"test.osgt"); while (!viewer.done()) { @@ -1016,7 +1016,7 @@ int main(int argc, char** argv) static int dumpFileNo = 0; dumpFileNo ++; char filename[256]; - std::sprintf( filename, "shadowDump%d.osg", dumpFileNo ); + std::sprintf( filename, "shadowDump%d.osgt", dumpFileNo ); osgShadow::MinimalShadowMap * msm = dynamic_cast( shadowedScene->getShadowTechnique() ); diff --git a/examples/osgsidebyside/osgsidebyside.cpp b/examples/osgsidebyside/osgsidebyside.cpp index 2910ee014..5ed3dbaef 100644 --- a/examples/osgsidebyside/osgsidebyside.cpp +++ b/examples/osgsidebyside/osgsidebyside.cpp @@ -241,7 +241,7 @@ int main( int argc, char **argv ) osgViewer::Viewer viewer(arguments); - std::string outputfile("output.osg"); + std::string outputfile("output.osgt"); while (arguments.read("-o",outputfile)) {} while (arguments.read("-s")) { viewer.setThreadingModel(osgViewer::Viewer::SingleThreaded); } @@ -278,12 +278,12 @@ int main( int argc, char **argv ) group1->setNodeMask(1); // Uncomment these lines if you like to compare the loaded model to the resulting model in a merge/diff tool - //osgDB::writeNodeFile(*loadedModel.get(), "dummy1.osg"); + //osgDB::writeNodeFile(*loadedModel.get(), "dummy1.osgt"); osgDB::writeNodeFile(*loadedModel.get(), outputfile); osg::ref_ptr convertedModel = osgDB::readNodeFile(outputfile); - //osgDB::writeNodeFile(*convertedModel.get(), "dummy2.osg"); + //osgDB::writeNodeFile(*convertedModel.get(), "dummy2.osgt"); osg::Group* group2 = new osg::Group; group2->addChild(convertedModel.get()); diff --git a/examples/osgsimplifier/osgsimplifier.cpp b/examples/osgsimplifier/osgsimplifier.cpp index 16675a458..3a6d82e9e 100644 --- a/examples/osgsimplifier/osgsimplifier.cpp +++ b/examples/osgsimplifier/osgsimplifier.cpp @@ -102,7 +102,7 @@ int main( int argc, char **argv ) 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("dumptruck.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); // if no model has been successfully loaded report failure. if (!loadedModel) diff --git a/examples/osgsimulation/osgsimulation.cpp b/examples/osgsimulation/osgsimulation.cpp index 280910391..6928d630d 100644 --- a/examples/osgsimulation/osgsimulation.cpp +++ b/examples/osgsimulation/osgsimulation.cpp @@ -401,7 +401,7 @@ int main(int argc, char **argv) } - osg::Node* cessna = osgDB::readNodeFile("cessna.osg"); + osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); if (cessna) { double s = 200000.0 / cessna->getBound().radius(); @@ -457,7 +457,7 @@ int main(int argc, char **argv) } else { - std::cout<<"Failed to read cessna.osg"<getBound(); @@ -236,7 +236,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius, osg::Geode * model->addChild(xform); } - osg::Node* cessna = osgDB::readNodeFile("cessna.osg"); + osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); if (cessna) { const osg::BoundingSphere& bs = cessna->getBound(); diff --git a/examples/osgspotlight/osgspotlight.cpp b/examples/osgspotlight/osgspotlight.cpp index 0d973a807..a81309465 100644 --- a/examples/osgspotlight/osgspotlight.cpp +++ b/examples/osgspotlight/osgspotlight.cpp @@ -228,7 +228,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius) osg::Group* model = new osg::Group; - osg::Node* cessna = osgDB::readNodeFile("cessna.osg"); + osg::Node* cessna = osgDB::readNodeFile("cessna.osgt"); if (cessna) { const osg::BoundingSphere& bs = cessna->getBound(); diff --git a/examples/osgstereoimage/osgstereoimage.cpp b/examples/osgstereoimage/osgstereoimage.cpp index 328196c17..e6f145093 100644 --- a/examples/osgstereoimage/osgstereoimage.cpp +++ b/examples/osgstereoimage/osgstereoimage.cpp @@ -616,7 +616,7 @@ int main( int argc, char **argv ) if (!onDisk) rootNode = createScene(fileList,texmatLeft,texmatRight,radius,height,length); else rootNode=new osg::Switch(); - //osgDB::writeNodeFile(*rootNode,"test.osg"); + //osgDB::writeNodeFile(*rootNode,"test.osgt"); diff --git a/examples/osgtexture1D/osgtexture1D.cpp b/examples/osgtexture1D/osgtexture1D.cpp index 485119b0e..b0426b7a4 100644 --- a/examples/osgtexture1D/osgtexture1D.cpp +++ b/examples/osgtexture1D/osgtexture1D.cpp @@ -151,7 +151,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("dumptruck.osg"); + if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt"); if (!loadedModel) { diff --git a/examples/osgthirdpersonview/osgthirdpersonview.cpp b/examples/osgthirdpersonview/osgthirdpersonview.cpp index e74148abb..c1bc5e108 100644 --- a/examples/osgthirdpersonview/osgthirdpersonview.cpp +++ b/examples/osgthirdpersonview/osgthirdpersonview.cpp @@ -32,7 +32,7 @@ // second View's displayed frustum. // // Command line arguments are taken to be models for display. If you -// specify no command line arguments, the code attempts to load cow.osg. +// specify no command line arguments, the code attempts to load cow.osgt. #include @@ -147,8 +147,8 @@ main( int argc, { // User didn't specify anything, or file(s) didn't exist. // Try to load the cow... - osg::notify( osg::WARN ) << arguments.getApplicationName() << ": Could not find specified files. Trying \"cow.osg\" instead." << std::endl; - if ( !(scene = osgDB::readNodeFile( std::string( "cow.osg" ) ) ) ) + osg::notify( osg::WARN ) << arguments.getApplicationName() << ": Could not find specified files. Trying \"cow.osgt\" instead." << std::endl; + if ( !(scene = osgDB::readNodeFile( std::string( "cow.osgt" ) ) ) ) { osg::notify( osg::FATAL ) << arguments.getApplicationName() << ": No data loaded." << std::endl; return 1; diff --git a/examples/osgunittests/FileNameUtils.cpp b/examples/osgunittests/FileNameUtils.cpp index 6f1c9d9d0..84a8c0fb2 100644 --- a/examples/osgunittests/FileNameUtils.cpp +++ b/examples/osgunittests/FileNameUtils.cpp @@ -29,24 +29,24 @@ typedef std::list Strings; Strings strings; strings.push_back(std::string("")); strings.push_back(std::string("myfile")); - strings.push_back(std::string(".osg")); - strings.push_back(std::string("myfile.osg")); - strings.push_back(std::string("/myfile.osg")); - strings.push_back(std::string("home/robert/myfile.osg")); - strings.push_back(std::string("/home/robert/myfile.osg")); - strings.push_back(std::string("\\myfile.osg")); - strings.push_back(std::string("home\\robert\\myfile.osg")); - strings.push_back(std::string("\\home\\robert\\myfile.osg")); - strings.push_back(std::string("\\home/robert\\myfile.osg")); - strings.push_back(std::string("\\home\\robert/myfile.osg")); + strings.push_back(std::string(".osgt")); + strings.push_back(std::string("myfile.osgt")); + strings.push_back(std::string("/myfile.osgt")); + strings.push_back(std::string("home/robert/myfile.osgt")); + strings.push_back(std::string("/home/robert/myfile.osgt")); + strings.push_back(std::string("\\myfile.osgt")); + strings.push_back(std::string("home\\robert\\myfile.osgt")); + strings.push_back(std::string("\\home\\robert\\myfile.osgt")); + strings.push_back(std::string("\\home/robert\\myfile.osgt")); + strings.push_back(std::string("\\home\\robert/myfile.osgt")); strings.push_back(std::string("home/robert/")); strings.push_back(std::string("\\home\\robert\\")); strings.push_back(std::string("home/robert/myfile")); strings.push_back(std::string("\\home\\robert\\myfile")); - strings.push_back(std::string("home/robert/.osg")); - strings.push_back(std::string("\\home\\robert\\.osg")); - strings.push_back(std::string("home/robert/myfile.ext.osg")); - strings.push_back(std::string("home\\robert\\myfile.ext.osg")); + strings.push_back(std::string("home/robert/.osgt")); + strings.push_back(std::string("\\home\\robert\\.osgt")); + strings.push_back(std::string("home/robert/myfile.ext.osgt")); + strings.push_back(std::string("home\\robert\\myfile.ext.osgt")); for(Strings::iterator itr = strings.begin(); itr != strings.end(); diff --git a/examples/osgunittests/MultiThreadRead.cpp b/examples/osgunittests/MultiThreadRead.cpp index 704e56277..c2078dec5 100644 --- a/examples/osgunittests/MultiThreadRead.cpp +++ b/examples/osgunittests/MultiThreadRead.cpp @@ -192,8 +192,8 @@ void runMultiThreadReadTests(int numThreads, osg::ArgumentParser& arguments) readThread->setStartBarrier(startBarrier.get()); readThread->setEndBarrier(endBarrier.get()); - readThread->addFileName("cessna.osg"); - readThread->addFileName("glider.osg"); + readThread->addFileName("cessna.osgt"); + readThread->addFileName("glider.osgt"); readThread->addFileName("town.ive"); readThreads.push_back(readThread.get()); diff --git a/examples/osgviewerFOX/FOX_OSG_MDIView.cpp b/examples/osgviewerFOX/FOX_OSG_MDIView.cpp index 04f269039..df6124e2e 100644 --- a/examples/osgviewerFOX/FOX_OSG_MDIView.cpp +++ b/examples/osgviewerFOX/FOX_OSG_MDIView.cpp @@ -39,7 +39,7 @@ FOX_OSG_MDIView::FOX_OSG_MDIView(FXMDIClient *p, const FXString &name, viewer->setKeyEventSetsDone(0); // load the scene. - osg::ref_ptr loadedModel = osgDB::readNodeFile("cow.osg"); + osg::ref_ptr loadedModel = osgDB::readNodeFile("cow.osgt"); if (!loadedModel) { return ; diff --git a/examples/osgviewerQt/osgviewerQt.cpp b/examples/osgviewerQt/osgviewerQt.cpp index 390307075..a9cd3c46d 100644 --- a/examples/osgviewerQt/osgviewerQt.cpp +++ b/examples/osgviewerQt/osgviewerQt.cpp @@ -20,12 +20,12 @@ public: { setThreadingModel(threadingModel); - QWidget* widget1 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("cow.osg") ); - QWidget* widget2 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("glider.osg") ); - QWidget* widget3 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("axes.osg") ); - QWidget* widget4 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("fountain.osg") ); + QWidget* widget1 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("cow.osgt") ); + QWidget* widget2 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("glider.osgt") ); + QWidget* widget3 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("axes.osgt") ); + QWidget* widget4 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("fountain.osgt") ); QWidget* popupWidget = addViewWidget( createCamera(900,100,320,240,"Popup window",true), - osgDB::readNodeFile("dumptruck.osg") ); + osgDB::readNodeFile("dumptruck.osgt") ); popupWidget->show(); QGridLayout* grid = new QGridLayout; diff --git a/examples/osgwidgetbox/osgwidgetbox.cpp b/examples/osgwidgetbox/osgwidgetbox.cpp index fad8b72d8..a0debef00 100644 --- a/examples/osgwidgetbox/osgwidgetbox.cpp +++ b/examples/osgwidgetbox/osgwidgetbox.cpp @@ -112,7 +112,7 @@ int main(int argc, char** argv) { box4->hide(); - osg::Node* model = osgDB::readNodeFile("spaceship.osg"); + osg::Node* model = osgDB::readNodeFile("spaceship.osgt"); model->setNodeMask(MASK_3D); diff --git a/examples/osgwidgetmenu/osgwidgetmenu.cpp b/examples/osgwidgetmenu/osgwidgetmenu.cpp index 14f0b89e0..b46023157 100644 --- a/examples/osgwidgetmenu/osgwidgetmenu.cpp +++ b/examples/osgwidgetmenu/osgwidgetmenu.cpp @@ -120,7 +120,7 @@ int main(int argc, char** argv) { menu->getBackground()->setColor(1.0f, 1.0f, 1.0f, 0.0f); menu->resizePercent(100.0f); - osg::Node* model = osgDB::readNodeFile("osgcool.osg"); + osg::Node* model = osgDB::readNodeFile("osgcool.osgt"); model->setNodeMask(MASK_3D); diff --git a/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp b/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp index f51e91b8d..381a2cc45 100644 --- a/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp +++ b/examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp @@ -346,7 +346,7 @@ int main(int argc, char** argv) // AlphaSetterVisitor alpha(.8f); // frame->accept(alpha); - return osgWidget::createExample(viewer, wm); //osgDB::readNodeFile("cow.osg")); + return osgWidget::createExample(viewer, wm); //osgDB::readNodeFile("cow.osgt")); } @@ -674,6 +674,6 @@ int main(int argc, char** argv) AlphaSetterVisitor alpha(.8f); frame->accept(alpha); - return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osg")); + return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osgt")); } #endif diff --git a/examples/osgwidgetprogress/osgwidgetprogress.cpp b/examples/osgwidgetprogress/osgwidgetprogress.cpp index 8ae0b9e73..677903818 100644 --- a/examples/osgwidgetprogress/osgwidgetprogress.cpp +++ b/examples/osgwidgetprogress/osgwidgetprogress.cpp @@ -87,5 +87,5 @@ int main(int argc, char** argv) { wm->addChild(canvas); - return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osg")); + return osgWidget::createExample(viewer, wm, osgDB::readNodeFile("cow.osgt")); } diff --git a/examples/osgwidgetwindow/osgwidgetwindow.cpp b/examples/osgwidgetwindow/osgwidgetwindow.cpp index 8018fcb86..1bd7d5f32 100644 --- a/examples/osgwidgetwindow/osgwidgetwindow.cpp +++ b/examples/osgwidgetwindow/osgwidgetwindow.cpp @@ -157,8 +157,7 @@ int main(int argc, char** argv) { boxCopy->resizePercent(100.0f, 0.0f); // Here we demonstrate the use of osgWidget/io_utils. This is really only useful for - // debugging at the moment, but later I'll make it more generic for .osg and .ive - // creation. + // debugging at the moment. // std::cout << *box << std::endl << *boxCopy << std::endl; // Setup our OSG objects for our scene; note the use of the utility function @@ -169,7 +168,7 @@ int main(int argc, char** argv) { // some of the other examples to see this in action... osg::Group* group = new osg::Group(); osg::Camera* camera = osgWidget::createOrthoCamera(1280.0f, 1024.0f); - osg::Node* model = osgDB::readNodeFile("cow.osg"); + osg::Node* model = osgDB::readNodeFile("cow.osgt"); // Add our event handler; is this better as a MatrixManipulator? Add a few other // helpful ViewerEventHandlers. diff --git a/examples/osgwindows/osgwindows.cpp b/examples/osgwindows/osgwindows.cpp index 625077ba7..75f49da6b 100644 --- a/examples/osgwindows/osgwindows.cpp +++ b/examples/osgwindows/osgwindows.cpp @@ -32,7 +32,7 @@ int main( int argc, char **argv ) 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 (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt"); // if no model has been successfully loaded report failure. if (!loadedModel) diff --git a/runexamples.bat b/runexamples.bat index 658967b68..21337f49a 100644 --- a/runexamples.bat +++ b/runexamples.bat @@ -42,8 +42,8 @@ osgforest echo osgfxbrowser osgfxbrowser -echo osgoutline cow.osg -osgoutline cow.osg +echo osgoutline cow.osgt +osgoutline cow.osgt echo osggeometry osggeometry @@ -52,7 +52,7 @@ echo osghangglide osghangglide echo osghud -osghud dumptruck.osg +osghud dumptruck.osgt echo osgimpostor osgimpostor @@ -61,10 +61,10 @@ echo osgkeyboard osgkeyboard echo osgkeyboardmouse -osgkeyboardmouse dumptruck.osg +osgkeyboardmouse dumptruck.osgt echo osglight -osglight glider.osg +osglight glider.osgt echo osglightpoint osglightpoint @@ -73,16 +73,16 @@ echo osglogo osglogo echo osglogicop -osglogicop glider.osg +osglogicop glider.osgt echo osgmotionblur -osgmotionblur cow.osg +osgmotionblur cow.osgt echo osgmultitexture -osgmultitexture cessnafire.osg +osgmultitexture cessnafire.osgt echo osgoccluder -osgoccluder glider.osg +osgoccluder glider.osgt echo osgocclusionquery osgocclusionquery @@ -94,7 +94,7 @@ echo osgparticleeffects osgparticleeffects echo osgpick -osgpick fountain.osg +osgpick fountain.osgt echo osgpointsprite osgpointsprite @@ -103,28 +103,28 @@ echo osgplanets osgplanets echo osgprecipitation --rain 0.5 -osgprecipitation --rain 0.5 lz.osg +osgprecipitation --rain 0.5 lz.osgt echo osgprecipitation --snow 0.5 -osgprecipitation --snow 0.5 lz.osg +osgprecipitation --snow 0.5 lz.osgt echo osgprerender -osgprerender dumptruck.osg +osgprerender dumptruck.osgt echo osgprerendercubemap osgprerendercubemap echo osgreflect -osgreflect cessna.osg +osgreflect cessna.osgt echo osgscalarbar osgscalarbar echo osgscribe -osgscribe cow.osg +osgscribe cow.osgt echo osgsequence -osgsequence cow.osg dumptruck.osg cessna.osg glider.osg +osgsequence cow.osgt dumptruck.osgt cessna.osgt glider.osgt echo osgshaders osgshaders @@ -136,19 +136,19 @@ echo osgparametric osgparametric echo osgthirdpersonview -osgthirdpersonview cow.osg +osgthirdpersonview cow.osgt -echo osgviewer glsl_simple.osg -osgviewer glsl_simple.osg +echo osgviewer glsl_simple.osgt +osgviewer glsl_simple.osgt -echo osgviewer glsl_confetti.osg -osgviewer glsl_confetti.osg +echo osgviewer glsl_confetti.osgt +osgviewer glsl_confetti.osgt -echo osgviewer glsl_mandelbrot.osg -osgviewer glsl_mandelbrot.osg +echo osgviewer glsl_mandelbrot.osgt +osgviewer glsl_mandelbrot.osgt -echo osgviewer glsl_julia.osg -osgviewer glsl_julia.osg +echo osgviewer glsl_julia.osgt +osgviewer glsl_julia.osgt echo osgshape osgshape @@ -163,7 +163,7 @@ echo osgshadow -3 --ssm osgshadow -3 --ssm echo osgsimplifier -osgsimplifier --ratio 0.1 cessna.osg +osgsimplifier --ratio 0.1 cessna.osgt echo osgsimulation osgsimulation