FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved plugins across to using ReaderWriter::Options* for search paths in addition

Browse Source 
to standard osgDB::DataFilePaths
This commit is contained in:
Robert Osfield
2004-11-22 23:54:45 +00:00
parent e54f46f630
commit ce07879e2e
51 changed files with 301 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/lws/ReaderWriterLWS.cpp
View File

@@ -36,13 +36,13 @@ public:
std::string ext = osgDB::getLowerCaseFileExtension(file);
if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
std::string fileName = osgDB::findDataFile(file);
std::string fileName = osgDB::findDataFile(file, options);
if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
lwosg::SceneLoader::Options conv_options = parse_options(options);
lwosg::SceneLoader scene_loader(conv_options);
osg::ref_ptr<osg::Node> node = scene_loader.load(fileName);
osg::ref_ptr<osg::Node> node = scene_loader.load(fileName, options);
if (node.valid()) {
return node.take();
}

4
src/osgPlugins/lws/SceneLoader.cpp
View File

@@ -80,12 +80,12 @@ SceneLoader::SceneLoader(const Options &options)
{
}
osg::Group *SceneLoader::load(const std::string &filename, bool search)
osg::Group *SceneLoader::load(const std::string &filename, const osgDB::ReaderWriter::Options *options, bool search)
{
std::string fname;
if (search) {
fname = osgDB::findDataFile(filename);
fname = osgDB::findDataFile(filename, options);
if (fname.empty()) return 0;
} else {
fname = filename;

4
src/osgPlugins/lws/SceneLoader.h
View File

@@ -14,6 +14,8 @@
#include <osg/Vec3>
#include <osg/Vec4>
#include <osgDB/ReaderWriter>
#include <string>
#include <vector>
#include <map>
@@ -60,7 +62,7 @@ namespace lwosg
SceneLoader();
SceneLoader(const Options &options);
osg::Group *load(const std::string &filename, bool search = false);
osg::Group *load(const std::string &filename, const osgDB::ReaderWriter::Options *options, bool search = false);
inline osg::Group *get_root() { return root_.get(); }
inline const osg::Group *get_root() const { return root_.get(); }