fly/flightgear
1
0
Fork 0
Code Activity

Load BTG files through the osgDB::Registry

Browse source 
This is part of changes leading towards using the OSG database pager thread.
This commit is contained in:
timoore 2007-07-29 22:34:15 +00:00
parent 256aaacb50
commit acaf611495
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Scenery/tileentry.cxx
View file

@ -40,6 +40,8 @@
#include <osg/NodeCallback> #include <osg/NodeCallback>
#include <osg/Switch> #include <osg/Switch>
#include <osgDB/ReadFile>
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/math/polar3d.hxx> #include <simgear/math/polar3d.hxx>
@ -50,6 +52,7 @@
#include <simgear/scene/material/matlib.hxx> #include <simgear/scene/material/matlib.hxx>
#include <simgear/scene/tgdb/apt_signs.hxx> #include <simgear/scene/tgdb/apt_signs.hxx>
#include <simgear/scene/tgdb/obj.hxx> #include <simgear/scene/tgdb/obj.hxx>
#include <simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx>
#include <simgear/scene/model/placementtrans.hxx> #include <simgear/scene/model/placementtrans.hxx>
#include <simgear/scene/util/SGUpdateVisitor.hxx> #include <simgear/scene/util/SGUpdateVisitor.hxx>
@ -215,7 +218,12 @@ bool FGTileEntry::obj_load( const string& path,
fgGetBool("/sim/rendering/random-objects", true); fgGetBool("/sim/rendering/random-objects", true);
// try loading binary format // try loading binary format
osg::Node* node = SGLoadBTG(path, globals->get_matlib(), is_base, use_random_objects); osg::ref_ptr<SGReaderWriterBTGOptions> options
= new SGReaderWriterBTGOptions();
options->setMatlib(globals->get_matlib());
options->setCalcLights(is_base);
options->setUseRandomObjects(use_random_objects);
osg::Node* node = osgDB::readNodeFile(path, options.get());
if (node) if (node)
geometry->addChild(node); geometry->addChild(node);