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

From Mathias Froehlich, "I have attached an updated version of the VRML2 loader.

Browse Source 
That change is the result of the '[osgPlugins] VRML plugin - "file" url'
discussion on osg-users.

The attached change avoids rewriting file names into some kind of file urls
and then use the url for opening an fstream. Instead just use the given file
name to open the stream.
Also this change adds some Notify output for the error paths.
"
This commit is contained in:
Robert Osfield 2011-07-21 09:07:22 +00:00
parent eb72bd6556
commit 9f4fee5fd3
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/osgPlugins/vrml/ReaderWriterVRML2.cpp
View File

@ -178,33 +178,26 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string& f
if (fileName.empty()) if (fileName.empty())
return ReadResult::FILE_NOT_FOUND; return ReadResult::FILE_NOT_FOUND;
// convert possible Windows backslashes to Unix slashes
// OpenVRML doesn't like backslashes, even on Windows
std::string unixFileName = osgDB::convertFileNameToUnixStyle(fileName);
#ifdef WIN32
if(unixFileName[1] == ':') // absolute path
fileName = "file:///" + unixFileName;
#else
if (unixFileName[0] == '/') // absolute path
fileName = "file://" + unixFileName;
#endif
else
// relative path
fileName = unixFileName;
std::fstream null; std::fstream null;
resource_fetcher fetcher; resource_fetcher fetcher;
openvrml::browser *b = new openvrml::browser(fetcher, null, null); openvrml::browser *b = new openvrml::browser(fetcher, null, null);
osgDB::ifstream vrml_stream(fileName.c_str()); osgDB::ifstream vrml_stream(fileName.c_str());
if (!vrml_stream.is_open())
{
OSG_INFO << "ReaderWriterVRML2: Could not open \"" << fileName << "\"" << std::endl;
return ReadResult::FILE_NOT_FOUND;
}
try try
{ {
const std::vector< boost::intrusive_ptr< openvrml::node > > & mfn = b->create_vrml_from_stream(vrml_stream); const std::vector< boost::intrusive_ptr< openvrml::node > > & mfn = b->create_vrml_from_stream(vrml_stream);
if(mfn.empty()) if(mfn.empty())
{
OSG_INFO << "ReaderWriterVRML2: OpenVRML library did not return any vrml nodes." << std::endl;
return ReadResult::FILE_NOT_HANDLED; return ReadResult::FILE_NOT_HANDLED;
}
else else
{ {
osg::ref_ptr<osg::MatrixTransform> osg_root = new osg::MatrixTransform(osg::Matrix( 1, 0, 0, 0, osg::ref_ptr<osg::MatrixTransform> osg_root = new osg::MatrixTransform(osg::Matrix( 1, 0, 0, 0,
@ -212,7 +205,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string& f
0, -1, 0, 0, 0, -1, 0, 0,
0, 0, 0, 1)); 0, 0, 0, 1));
osgDB::getDataFilePathList().push_front(osgDB::getFilePath(unixFileName)); osgDB::getDataFilePathList().push_front(osgDB::getFilePath(fileName));
for (unsigned i = 0; i < mfn.size(); i++) for (unsigned i = 0; i < mfn.size(); i++)
{ {
openvrml::node *vrml_node = mfn[i].get(); openvrml::node *vrml_node = mfn[i].get();
@ -223,8 +216,16 @@ osgDB::ReaderWriter::ReadResult ReaderWriterVRML2::readNode(const std::string& f
} }
} }
catch (openvrml::invalid_vrml) { return ReadResult::FILE_NOT_HANDLED; } catch (const openvrml::invalid_vrml& e)
catch (std::invalid_argument) { return ReadResult::FILE_NOT_HANDLED; } {
OSG_INFO << "ReaderWriterVRML2: Invalid VRML in line " << e.line << " at column " << e.column << ": \"" << e.what() << "\"" << std::endl;
return ReadResult::FILE_NOT_HANDLED;
}
catch (const std::invalid_argument& e)
{
OSG_INFO << "ReaderWriterVRML2: Invalid argument: \"" << e.what() << "\"" << std::endl;
return ReadResult::FILE_NOT_HANDLED;
}
} }
osgDB::ReaderWriter::WriteResult ReaderWriterVRML2::writeNode(const osg::Node& root,const std::string& filename, const osgDB::ReaderWriter::Options *options) const osgDB::ReaderWriter::WriteResult ReaderWriterVRML2::writeNode(const osg::Node& root,const std::string& filename, const osgDB::ReaderWriter::Options *options) const