Permalink
Browse files

Replaced .osg with .osgt file usage

  • Loading branch information...
1 parent 68d06ca commit af0308673b67a958680150dc5a66d26319c24ed8 @osg-training-guest osg-training-guest committed Jun 14, 2011
Showing with 127 additions and 128 deletions.
  1. +2 −2 examples/osganimate/osganimate.cpp
  2. +1 −1 examples/osgblendequation/osgblendequation.cpp
  3. +1 −1 examples/osgcallback/osgcallback.cpp
  4. +1 −1 examples/osgcamera/osgcamera.cpp
  5. +1 −1 examples/osgcatch/osgcatch.cpp
  6. +1 −1 examples/osgclip/osgclip.cpp
  7. +2 −2 examples/osgcompositeviewer/osgcompositeviewer.cpp
  8. +8 −8 examples/osgcopy/osgcopy.cpp
  9. +1 −1 examples/osgcubemap/osgcubemap.cpp
  10. +1 −1 examples/osgdirectinput/osgdirectinput.cpp
  11. +1 −1 examples/osgdistortion/osgdistortion.cpp
  12. +1 −1 examples/osgdrawinstanced/osgdrawinstanced.cpp
  13. +3 −3 examples/osgfxbrowser/osgfxbrowser.cpp
  14. +1 −1 examples/osggeometry/osggeometry.cpp
  15. +1 −1 examples/osghud/osghud.cpp
  16. +5 −5 examples/osgkeyboardmouse/osgkeyboardmouse.cpp
  17. +1 −1 examples/osglight/osglight.cpp
  18. +1 −1 examples/osglogicop/osglogicop.cpp
  19. +1 −1 examples/osgmotionblur/osgmotionblur.cpp
  20. +1 −1 examples/osgmultitexture/osgmultitexture.cpp
  21. +3 −3 examples/osgoccluder/osgoccluder.cpp
  22. +2 −2 examples/osgoutline/osgoutline.cpp
  23. +2 −2 examples/osgparticleeffects/osgparticleeffects.cpp
  24. +1 −1 examples/osgphotoalbum/osgphotoalbum.cpp
  25. +1 −1 examples/osgpick/osgpick.cpp
  26. +1 −1 examples/osgposter/osgposter.cpp
  27. +2 −2 examples/osgprerender/osgprerender.cpp
  28. +2 −2 examples/osgreflect/osgreflect.cpp
  29. +1 −1 examples/osgscribe/osgscribe.cpp
  30. +4 −4 examples/osgsequence/osgsequence.cpp
  31. +3 −3 examples/osgshadow/osgshadow.cpp
  32. +3 −3 examples/osgsidebyside/osgsidebyside.cpp
  33. +1 −1 examples/osgsimplifier/osgsimplifier.cpp
  34. +2 −2 examples/osgsimulation/osgsimulation.cpp
  35. +2 −2 examples/osgspheresegment/osgspheresegment.cpp
  36. +1 −1 examples/osgspotlight/osgspotlight.cpp
  37. +1 −1 examples/osgstereoimage/osgstereoimage.cpp
  38. +1 −1 examples/osgtexture1D/osgtexture1D.cpp
  39. +3 −3 examples/osgthirdpersonview/osgthirdpersonview.cpp
  40. +14 −14 examples/osgunittests/FileNameUtils.cpp
  41. +2 −2 examples/osgunittests/MultiThreadRead.cpp
  42. +1 −1 examples/osgviewerFOX/FOX_OSG_MDIView.cpp
  43. +5 −5 examples/osgviewerQt/osgviewerQt.cpp
  44. +1 −1 examples/osgwidgetbox/osgwidgetbox.cpp
  45. +1 −1 examples/osgwidgetmenu/osgwidgetmenu.cpp
  46. +2 −2 examples/osgwidgetmessagebox/osgwidgetmessagebox.cpp
  47. +1 −1 examples/osgwidgetprogress/osgwidgetprogress.cpp
  48. +2 −3 examples/osgwidgetwindow/osgwidgetwindow.cpp
  49. +1 −1 examples/osgwindows/osgwindows.cpp
  50. +26 −26 runexamples.bat
@@ -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();
@@ -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)
{
@@ -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)
{
@@ -331,7 +331,7 @@ int main( int argc, char **argv )
// load the scene.
osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
- if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osg");
+ if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt");
if (!loadedModel)
{
@@ -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.
@@ -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)
@@ -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);
@@ -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'"<<std::endl;
- osgDB::writeNodeFile(*rootnode,"original.osg");
+ std::cout << std::endl << "Writing out the original scene graph as 'original.osgt'"<<std::endl;
+ osgDB::writeNodeFile(*rootnode,"original.osgt");
- std::cout << std::endl << "Writing out the graph preserving scene graph as 'graph_copy.osg'"<<std::endl;
- osgDB::writeNodeFile(*graph_copy,"graph_copy.osg");
+ std::cout << std::endl << "Writing out the graph preserving scene graph as 'graph_copy.osgt'"<<std::endl;
+ osgDB::writeNodeFile(*graph_copy,"graph_copy.osgt");
- std::cout << "Writing out the deep copied scene graph as 'deep_copy.osg'"<<std::endl;
- osgDB::writeNodeFile(*deep_copy,"deep_copy.osg");
+ std::cout << "Writing out the deep copied scene graph as 'deep_copy.osgt'"<<std::endl;
+ osgDB::writeNodeFile(*deep_copy,"deep_copy.osgt");
- std::cout << "Writing out the shallow copied scene graph as 'shallow_copy.osg'"<<std::endl;
- osgDB::writeNodeFile(*shallow_copy,"shallow_copy.osg");
+ std::cout << "Writing out the shallow copied scene graph as 'shallow_copy.osgt'"<<std::endl;
+ osgDB::writeNodeFile(*shallow_copy,"shallow_copy.osgt");
// You can use a bit mask to control which parts of the scene graph are shallow copied
@@ -98,7 +98,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("cessna.osg");
+ if (!rootnode) rootnode = osgDB::readNodeFile("cessna.osgt");
if (!rootnode)
{
@@ -97,7 +97,7 @@ int main( int argc, char** argv )
{
osg::ArgumentParser arguments( &argc, argv );
osg::Node* model = osgDB::readNodeFiles( arguments );
- if ( !model ) model = osgDB::readNodeFile( "cow.osg" );
+ if ( !model ) model = osgDB::readNodeFile( "cow.osgt" );
if ( !model )
{
std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
@@ -669,7 +669,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)
{
@@ -142,7 +142,7 @@ int main( int argc, char **argv )
osg::ref_ptr< osg::StateSet > ss = createStateSet();
geode->setStateSet( ss.get() );
- // osgDB::writeNodeFile(*geode, "instanced.osg");
+ // osgDB::writeNodeFile(*geode, "instanced.osgt");
osgViewer::Viewer viewer(arguments);
viewer.setSceneData( geode.get() );
@@ -94,8 +94,8 @@ class EffectPanel: public osgfxbrowser::Frame {
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<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)
{
@@ -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;
@@ -275,7 +275,7 @@ int main( int argc, char **argv )
osg::ref_ptr<osg::Node> 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)
@@ -142,8 +142,8 @@ class PickHandler : public osgGA::GUIEventHandler
}
else if (ea.getKey()=='o')
{
- osg::notify(osg::NOTICE)<<"Saved model to file 'saved_model.osg'"<<std::endl;
- osgDB::writeNodeFile(*(viewer->getSceneData()), "saved_model.osg");
+ osg::notify(osg::NOTICE)<<"Saved model to file 'saved_model.osgt'"<<std::endl;
+ osgDB::writeNodeFile(*(viewer->getSceneData()), "saved_model.osgt");
}
else if (ea.getKey()=='p')
{
@@ -325,8 +325,8 @@ class PickHandler : public osgGA::GUIEventHandler
if (cmtsv._group->getNumChildren()>0)
{
- std::cout<<"Writing selected compoents to 'selected_model.osg'"<<std::endl;
- osgDB::writeNodeFile(*cmtsv._group, "selected_model.osg");
+ std::cout<<"Writing selected compoents to 'selected_model.osgt'"<<std::endl;
+ osgDB::writeNodeFile(*cmtsv._group, "selected_model.osgt");
}
}
@@ -345,7 +345,7 @@ int main( int argc, char **argv )
if (argc>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)
{
@@ -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);
@@ -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)
{
@@ -98,7 +98,7 @@ int main( int argc, char **argv )
osg::ref_ptr<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 no model has been successfully loaded report failure.
if (!loadedModel)
@@ -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)
{
@@ -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'"<<std::endl;
+ if (osgDB::writeNodeFile(*_occluders,"saved_occluders.osgt"))
+ std::cout<<"saved occluders to 'saved_occluders.osgt'"<<std::endl;
}
else
{
@@ -315,7 +315,7 @@ int main( int argc, char **argv )
osg::Node* loadedmodel = osgDB::readNodeFiles(arguments);
// if not loaded assume no arguments passed in, try using default mode instead.
- if (!loadedmodel) loadedmodel = osgDB::readNodeFile("glider.osg");
+ if (!loadedmodel) loadedmodel = osgDB::readNodeFile("glider.osgt");
if (!loadedmodel)
{
@@ -24,7 +24,7 @@ int main(int argc, char** argv)
while (arguments.read("--testOcclusion")) { testOcclusion = true; }
// load outlined object
- std::string modelFilename = arguments.argc() > 1 ? arguments[1] : "dumptruck.osg";
+ std::string modelFilename = arguments.argc() > 1 ? arguments[1] : "dumptruck.osgt";
osg::ref_ptr<osg::Node> 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<osg::Node> occludedModel = osgDB::readNodeFile(occludedModelFilename);
if (!occludedModel)
{
@@ -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();
@@ -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());
@@ -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<osg::Group> group = dynamic_cast<osg::Group*>(scene.get());
if (!group)
@@ -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;
@@ -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 );
@@ -340,7 +340,7 @@ int main( int argc, char **argv )
osg::ref_ptr<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 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();
@@ -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)
{
@@ -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();
Oops, something went wrong.

0 comments on commit af03086

Please sign in to comment.