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

Moved Registry::CacheHintOptions into ReaderWriter::Options

Browse Source
This commit is contained in:
Robert Osfield
2004-11-22 14:10:12 +00:00
parent 1ac452df69
commit a6369da4f4
20 changed files with 205 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgDB/Input.cpp
View File

@@ -80,22 +80,16 @@ osg::Node* Input::readNode()
osg::Object* Input::readObject(const std::string& fileName)
{
return readObjectFile(fileName);
return readObjectFile(fileName,_options.get());
}
osg::Image* Input::readImage(const std::string& fileName)
{
if (_options.valid() && !_options->getDatabasePath().empty())
{
osg::Image* image = readImageFile(_options->getDatabasePath()+'/'+fileName);
if (image) return image;
}
return readImageFile(fileName);
return readImageFile(fileName,_options.get());
}
osg::Node* Input::readNode(const std::string& fileName)
{
return readNodeFile(fileName);
return readNodeFile(fileName,_options.get());
}