FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow loading of 2.5D panels to be controlled again.

Browse Source
This commit is contained in:
James Turner
2010-08-14 19:48:52 +01:00
parent 3c57572b89
commit 764a3c29e9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/model/modellib.cxx
View File

@@ -112,12 +112,16 @@ osg::Node* loadFile(const string& path, SGReaderWriterXMLOptions* options)
osg::Node*
SGModelLib::loadModel(const string &path,
SGPropertyNode *prop_root,
SGModelData *data)
SGModelData *data,
bool load2DPanels)
{
osg::ref_ptr<SGReaderWriterXMLOptions> opt = new SGReaderWriterXMLOptions(*(osgDB::Registry::instance()->getOptions()));
opt->setPropRoot(prop_root ? prop_root: static_propRoot.get());
opt->setModelData(data);
opt->setLoadPanel(static_panelFunc);
if (load2DPanels) {
opt->setLoadPanel(static_panelFunc);
}
osg::Node *n = loadFile(path, opt.get());
if (n && n->getName().empty())

2
simgear/scene/model/modellib.hxx
View File

@@ -58,7 +58,7 @@ public:
// data->modelLoaded() will be called after the model is loaded
static osg::Node* loadModel(const std::string &path,
SGPropertyNode *prop_root = NULL,
SGModelData *data=0);
SGModelData *data=0, bool load2DPanels=false);
// Load a 3D model (any format) through the DatabasePager.
// Most models should be loaded using this function!