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

Added readObject() implementations

Browse Source
This commit is contained in:
Robert Osfield
2019-07-25 12:48:21 +01:00
parent 00679c7631
commit e6f6de640a
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.h
View File

@@ -62,6 +62,12 @@ class ReaderWritterOpenCASCADE: public osgDB::ReaderWriter
/// \brief returns class name
virtual const char* className() const { return "STEP/IGES Reader"; }
virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
{
return readNode(fileName, options);
}
virtual osgDB::ReaderWriter::ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options*) const;
virtual osgDB::ReaderWriter::WriteResult writeNode(const osg::Node&, const std::string&, const Options* =NULL) const ;

10
src/osgPlugins/obj/ReaderWriterOBJ.cpp
View File

@@ -82,18 +82,12 @@ public:
virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
{
ReadResult result = readNode(fileName, options);
osg::Node* node = result.getNode();
if (node) return node;
else return result;
return readNode(fileName, options);
}
virtual ReadResult readObject(std::istream& fin, const Options* options) const
{
ReadResult result = readNode(fin, options);
osg::Node* node = result.getNode();
if (node) return node;
else return result;
return readNode(fin, options);
}
virtual ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const;

6
src/osgPlugins/ogr/ReaderWriterOGR.cpp
View File

@@ -114,6 +114,12 @@ public:
virtual const char* className() const { return "OGR file reader"; }
virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
{
return readNode(fileName, options);
}
virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options) const
{
OSG_INFO<<"OGR::readNode("<<file<<")"<<std::endl;

6
src/osgPlugins/txp/ReaderWriterTXP.h
View File

@@ -64,6 +64,12 @@ public:
return "TXP Reader/Writer";
}
virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
{
return readNode(fileName, options);
}
virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options) const
{
if( !acceptsExtension(osgDB::getFileExtension(file) ))