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

Added population and access of the ReaderWriter::Options::s/getDatabasePath()

Browse Source 
to enable paged database to accessed without setting file paths explictly
This commit is contained in:
Robert Osfield
2004-10-13 14:13:17 +00:00
parent 3f0e4ea99a
commit 9d67383621
5 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osgPlugins/osg/ReaderWriterOSG.cpp
View File

@@ -2,6 +2,7 @@
#include <osg/Image>
#include <osg/Group>
#include <osg/Notify>
#include <osgDB/FileNameUtils>
#include <osgDB/FileUtils>
@@ -34,10 +35,20 @@ class OSGReaderWriter : public ReaderWriter
std::string fileName = osgDB::findDataFile( file );
if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
// code for setting up the database path so that any paged
// databases can be automatically located.
osg::ref_ptr<Options> local_opt = const_cast<Options*>(opt);
if (!local_opt) local_opt = new Options;
if (local_opt.valid() && local_opt->getDatabasePath().empty())
{
local_opt->setDatabasePath(osgDB::getFilePath(fileName));
}
std::ifstream fin(fileName.c_str());
if (fin)
{
return readNode(fin, opt);
return readNode(fin, local_opt.get());
}
return 0L;
@@ -49,7 +60,7 @@ class OSGReaderWriter : public ReaderWriter
Input fr;
fr.attach(&fin);
fr.setOptions(options);
typedef std::vector<osg::Node*> NodeList;
NodeList nodeList;