}
std::string SGModelLib::findDataFile(const std::string& file,
- const osgDB::ReaderWriter::Options* opts,
+ const osgDB::Options* opts,
SGPath currentPath)
{
if (file.empty())
SGModelData *data,
bool load2DPanels)
{
- osg::ref_ptr<SGReaderWriterOptions> opt = new SGReaderWriterOptions(*(osgDB::Registry::instance()->getOptions()));
+ osg::ref_ptr<SGReaderWriterOptions> opt;
+ opt = SGReaderWriterOptions::copyOrCreate(osgDB::Registry::instance()->getOptions());
opt->setPropertyNode(prop_root ? prop_root: static_propRoot.get());
opt->setModelData(data);
proxyNode->setLoadingExternalReferenceMode(osg::ProxyNode::DEFER_LOADING_TO_DATABASE_PAGER);
proxyNode->setFileName(0, path);
- osg::ref_ptr<SGReaderWriterOptions> opt
- = new SGReaderWriterOptions(*(osgDB::Registry::instance()
- ->getOptions()));
+ osg::ref_ptr<SGReaderWriterOptions> opt;
+ opt = SGReaderWriterOptions::copyOrCreate(osgDB::Registry::instance()->getOptions());
opt->setPropertyNode(prop_root ? prop_root: static_propRoot.get());
opt->setModelData(data);
opt->setLoadPanel(static_panelFunc);
if (SGPath(path).lower_extension() == "ac")
opt->setInstantiateEffects(true);
if (!prop_root || prop_root->getBoolValue("/sim/rendering/cache", true))
- opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL);
+ opt->setObjectCacheHint(osgDB::Options::CACHE_ALL);
else
- opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
+ opt->setObjectCacheHint(osgDB::Options::CACHE_NONE);
proxyNode->setDatabaseOptions(opt.get());
return proxyNode;
plod->setFileName(0, path);
plod->setRange(0, 0.0, 50.0*SG_NM_TO_METER);
- osg::ref_ptr<SGReaderWriterOptions> opt
- = new SGReaderWriterOptions(*(osgDB::Registry::instance()
- ->getOptions()));
+ osg::ref_ptr<SGReaderWriterOptions> opt;
+ opt = SGReaderWriterOptions::copyOrCreate(osgDB::Registry::instance()->getOptions());
opt->setPropertyNode(prop_root ? prop_root: static_propRoot.get());
opt->setModelData(data);
opt->setLoadPanel(static_panelFunc);
if (SGPath(path).lower_extension() == "ac")
opt->setInstantiateEffects(true);
if (!prop_root || prop_root->getBoolValue("/sim/rendering/cache", true))
- opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL);
+ opt->setObjectCacheHint(osgDB::Options::CACHE_ALL);
else
- opt->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_NONE);
+ opt->setObjectCacheHint(osgDB::Options::CACHE_NONE);
plod->setDatabaseOptions(opt.get());
return plod;
}