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

Further updates to the ReaderWriter support in osgDB, and a fix to a small warning

Browse Source 
in Matrix.cpp.
This commit is contained in:
Robert Osfield
2001-10-30 19:23:24 +00:00
parent f0372817b5
commit 8f4e62ced0
7 changed files with 77 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgDB/ReadFile.cpp
View File

@@ -11,17 +11,26 @@ using namespace osgDB;
Object* osgDB::readObjectFile(const std::string& filename)
{
return Registry::instance()->readObject(filename);
ReaderWriter::ReadResult rr = Registry::instance()->readObject(filename);
if (rr.validObject()) return rr.takeObject();
if (rr.error()) notify(WARN) << rr.message() << endl;
return NULL;
}
Image* osgDB::readImageFile(const std::string& filename)
Image* osgDB::readImageFile(const std::string& filename)
{
return Registry::instance()->readImage(filename);
ReaderWriter::ReadResult rr = Registry::instance()->readImage(filename);
if (rr.validImage()) return rr.takeImage();
if (rr.error()) notify(WARN) << rr.message() << endl;
return NULL;
}
Node* osgDB::readNodeFile(const std::string& filename)
Node* osgDB::readNodeFile(const std::string& filename)
{
return Registry::instance()->readNode(filename);
ReaderWriter::ReadResult rr = Registry::instance()->readNode(filename);
if (rr.validNode()) return rr.takeNode();
if (rr.error()) notify(WARN) << rr.message() << endl;
return NULL;
}