#include <simgear/props/props_io.hxx>
#include <simgear/scene/model/model.hxx>
#include <simgear/scene/model/ModelRegistry.hxx>
+#include <simgear/misc/ResourceManager.hxx>
#include "SGPagedLOD.hxx"
#include "SGReaderWriterXML.hxx"
\fSGPropertyNode_ptr SGModelLib::static_propRoot;
SGModelLib::panel_func SGModelLib::static_panelFunc = NULL;
-SGModelLib::resolve_func SGModelLib::static_resolver = NULL;
////////////////////////////////////////////////////////////////////////
// Implementation of SGModelLib.
static_panelFunc = pf;
}
-void SGModelLib::setResolveFunc(resolve_func rf)
-{
- static_resolver = rf;
-}
-
std::string SGModelLib::findDataFile(const std::string& file,
- const osgDB::ReaderWriter::Options* opts)
+ const osgDB::ReaderWriter::Options* opts,
+ SGPath currentPath)
{
- if (static_resolver) {
- SGPath p = static_resolver(file);
- if (p.exists()) {
- return p.str();
- }
+ SGPath p = ResourceManager::instance()->findPath(file, currentPath);
+ if (p.exists()) {
+ return p.str();
}
-
+
+ // finally hand on to standard OSG behaviour
return osgDB::findDataFile(file, opts);
}
namespace
{
-osg::Node* loadFile(const string& path, osgDB::ReaderWriter::Options* options)
+osg::Node* loadFile(const string& path, SGReaderWriterXMLOptions* options)
{
using namespace osg;
using namespace osgDB;
+ if (boost::iends_with(path, ".ac"))
+ options->setInstantiateEffects(true);
ref_ptr<Node> model = readRefNodeFile(path, options);
if (!model)
return 0;
- if (boost::iends_with(path, ".ac")) {
- ref_ptr<SGReaderWriterXMLOptions> sgOptions;
- if (options)
- sgOptions = new SGReaderWriterXMLOptions(*options);
- model = instantiateEffects(model.get(), sgOptions.get());
- }
+ else
return model.release();
}
}
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())
}
osg::Node*
-SGModelLib::loadPagedModel(const string &path,
- SGPropertyNode *prop_root,
+SGModelLib::loadPagedModel(const string &path, SGPropertyNode *prop_root,
SGModelData *data)
{
SGPagedLOD *plod = new SGPagedLOD;
plod->setFileName(0, path);
plod->setRange(0, 0.0, 50.0*SG_NM_TO_METER);
- osg::ref_ptr<SGReaderWriterXMLOptions> opt = new SGReaderWriterXMLOptions(*(osgDB::Registry::instance()->getOptions()));
+ 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 (boost::iends_with(path, ".ac"))
+ opt->setInstantiateEffects(true);
plod->setReaderWriterOptions(opt.get());
return plod;
}