#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"
osgDB::RegisterReaderWriterProxy<SGReaderWriterXML> g_readerWriter_XML_Proxy;
ModelRegistryCallbackProxy<LoadOnlyCallback> g_xmlCallbackProxy("xml");
-\fSGPropertyNode_ptr SGModelLib::static_propRoot;
+SGPropertyNode_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);
}
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())