Changeset 11018 for OpenSceneGraph/trunk/src/osgPlugins/osg/ReaderWriterOSG2.cpp

Timestamp:

01/27/10 18:09:05 (3 years ago)

Author:

robert

Message:

From Wang Rui, "Changes:

1. Rewrite the reading/writing exception handlers to work like the ive
plugin exceptions.
2. Write a header writing/checking function in ReaderWriterOSG2.cpp,
which may help decide if the stream is ascii or binary. The
readInputIterator() function will return null pointer if the input
file is nither osgb nor osgt format, which indicates that the old .osg
format could be used here, in case we've merged the two plugins
together.
3. Add a new ForceReadingImage? option in the InputStream?, which will
allocate an empty image object with the filename if specifed external
image file is missed. It may be useful for format converting in some
cases.
4. Add new osgParticle wrappers, as well as some modification to the
osgParticle headers, for instance, change isEnabled() to getEnabled().
5. Some fixes to the osg serialization wrappers."

Files:

• OpenSceneGraph/trunk/src/osgPlugins/osg/ReaderWriterOSG2.cpp (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgPlugins/osg/ReaderWriterOSG2.cpp

@@ -22 +22 @@
 using namespace osgDB;
 
-bool checkBinary( std::istream* fin )
+#define CATCH_EXCEPTION(s) \
+    if (s.getException()) return (s.getException()->getError() + " At " + s.getException()->getField());
+
+InputIterator* readInputIterator( std::istream& fin, const Options* options )
 {
-    unsigned int headerLow = 0, headerHigh = 0;
-    fin->read( (char*)&headerLow, INT_SIZE );
-    fin->read( (char*)&headerHigh, INT_SIZE );
-    if ( headerLow!=OSG_HEADER_LOW || headerHigh!=OSG_HEADER_HIGH )
-    {
-        fin->seekg( 0, std::ios::beg );
-        return false;
-    }
-    return true;
+    bool extensionIsAscii = false;
+    if ( options && options->getOptionString().find("Ascii")!=std::string::npos )
+        extensionIsAscii = true;
+    
+    if ( !extensionIsAscii )
+    {
+        unsigned int headerLow = 0, headerHigh = 0;
+        fin.read( (char*)&headerLow, INT_SIZE );
+        fin.read( (char*)&headerHigh, INT_SIZE );
+        if ( headerLow==OSG_HEADER_LOW && headerHigh==OSG_HEADER_HIGH )
+        {
+            return new BinaryInputIterator(&fin);
+        }
+        fin.seekg( 0, std::ios::beg );
+    }
+    
+    std::string header; fin >> header;
+    if ( header=="#Ascii" )
+    {
+        return new AsciiInputIterator(&fin);
+    }
+    return NULL;
+}
+
+OutputIterator* writeInputIterator( std::ostream& fout, const Options* options )
+{
+    if ( options && options->getOptionString().find("Ascii")!=std::string::npos )
+    {
+        fout << std::string("#Ascii") << ' ';
+        return new AsciiOutputIterator(&fout);
+    }
+    else
+    {
+        unsigned int low = OSG_HEADER_LOW, high = OSG_HEADER_HIGH;
+        fout.write( (char*)&low, INT_SIZE );
+        fout.write( (char*)&high, INT_SIZE );
+        return new BinaryOutputIterator(&fout);
+    }
 }
 
@@ -44 +76 @@
         supportsExtension( "osgb", "OpenSceneGraph extendable binary format" );
         
-        supportsOption( "Ascii", "Import/Export option: Force the writer export ascii file" );
+        supportsOption( "Ascii", "Import/Export option: Force reading/writing ascii file" );
+        supportsOption( "ForceReadingImage", "Import option: Load an empty image instead if required file missed" );
         supportsOption( "SchemaFile=<file>", "Import/Export option: Use/Record a ascii schema file" );
         supportsOption( "Compressor=<name>", "Export option: Use an inbuilt or user-defined compressor" );
@@ -83 +116 @@
             static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options;
         local_opt->getDatabasePathList().push_front(osgDB::getFilePath(fileName));
+        if ( ext=="osgt" ) local_opt->setOptionString( local_opt->getOptionString() + " Ascii" );
         
         osgDB::ifstream istream( fileName.c_str(), std::ios::out|std::ios::binary );
@@ -90 +124 @@
     virtual ReadResult readImage( std::istream& fin, const Options* options ) const
     {
-        try
-        {
-            InputStream is( options );
-            
-            InputIterator* ii = NULL;
-            if ( !checkBinary(&fin) )
-                ii = new AsciiInputIterator(&fin);
-            else
-                ii = new BinaryInputIterator(&fin);
-            
-            if ( is.start(ii)!=InputStream::READ_IMAGE )
-                return ReadResult::FILE_NOT_HANDLED;
-            is.decompress();
-            return is.readImage();
-        }
-        catch ( InputException e )
-        {
-            return e.getError() + " At " + e.getField();
-        }
+        osg::ref_ptr<InputIterator> ii = readInputIterator(fin, options);
+        if ( !ii ) return ReadResult::FILE_NOT_HANDLED;
+        
+        InputStream is( options );
+        if ( is.start(ii.get())!=InputStream::READ_IMAGE )
+        {
+            CATCH_EXCEPTION(is);
+            return ReadResult::FILE_NOT_HANDLED;
+        }
+        is.decompress(); CATCH_EXCEPTION(is);
+        osg::Image* image = is.readImage(); CATCH_EXCEPTION(is);
+        return image;
     }
     
@@ -121 +148 @@
             static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options;
         local_opt->getDatabasePathList().push_front(osgDB::getFilePath(fileName));
+        if ( ext=="osgt" ) local_opt->setOptionString( local_opt->getOptionString() + " Ascii" );
         
         osgDB::ifstream istream( fileName.c_str(), std::ios::out|std::ios::binary );
@@ -128 +156 @@
     virtual ReadResult readNode( std::istream& fin, const Options* options ) const
     {
-        try
-        {
-            InputStream is( options );
-            
-            InputIterator* ii = NULL;
-            if ( !checkBinary(&fin) )
-                ii = new AsciiInputIterator(&fin);
-            else
-                ii = new BinaryInputIterator(&fin);
-            
-            if ( is.start(ii)!=InputStream::READ_SCENE )
-                return ReadResult::FILE_NOT_HANDLED;
-            is.decompress();
-            return dynamic_cast<osg::Node*>( is.readObject() );
-        }
-        catch ( InputException e )
-        {
-            return e.getError() + " At " + e.getField();
-        }
+        osg::ref_ptr<InputIterator> ii = readInputIterator(fin, options);
+        if ( !ii ) return ReadResult::FILE_NOT_HANDLED;
+        
+        InputStream is( options );
+        if ( is.start(ii.get())!=InputStream::READ_SCENE )
+        {
+            CATCH_EXCEPTION(is);
+            return ReadResult::FILE_NOT_HANDLED;
+        }
+        
+        is.decompress(); CATCH_EXCEPTION(is);
+        osg::Node* node = dynamic_cast<osg::Node*>(is.readObject()); CATCH_EXCEPTION(is);
+        return node;
     }
     
@@ -190 +212 @@
     virtual WriteResult writeImage( const osg::Image& image, std::ostream& fout, const Options* options ) const
     {
-        try
-        {
-            OutputStream os( options );
-            
-            osgDB::OutputIterator* oi = NULL;
-            if ( options && options->getOptionString().find("Ascii")!=std::string::npos )
-                oi = new AsciiOutputIterator(&fout);
-            else
-                oi = new BinaryOutputIterator(&fout);
-            
-            os.start( oi, OutputStream::WRITE_IMAGE );
-            os.writeImage( &image );
-            os.compress( &fout );
-            
-            if ( fout.fail() ) return WriteResult::ERROR_IN_WRITING_FILE;
-            return WriteResult::FILE_SAVED;
-        }
-        catch ( OutputException e )
-        {
-            osg::notify(osg::WARN) << "ReaderWriterOSG2::writeImage(): " << e.getError()
-                                   << " At " << e.getField() << std::endl;
-        }
-        return WriteResult::FILE_NOT_HANDLED;
+        osg::ref_ptr<OutputIterator> oi = writeInputIterator(fout, options);
+        
+        OutputStream os( options );
+        os.start( oi.get(), OutputStream::WRITE_IMAGE ); CATCH_EXCEPTION(os);
+        os.writeImage( &image ); CATCH_EXCEPTION(os);
+        os.compress( &fout ); CATCH_EXCEPTION(os);
+        
+        if ( !os.getSchemaName().empty() )
+        {
+            osgDB::ofstream schemaStream( os.getSchemaName().c_str(), std::ios::out );
+            if ( !schemaStream.fail() ) os.writeSchema( schemaStream );
+            schemaStream.close();
+        }
+        
+        if ( fout.fail() ) return WriteResult::ERROR_IN_WRITING_FILE;
+        return WriteResult::FILE_SAVED;
     }
     
@@ -236 +251 @@
     virtual WriteResult writeNode( const osg::Node& node, std::ostream& fout, const Options* options ) const
     {
-        try
-        {
-            OutputStream os( options );
-            
-            osgDB::OutputIterator* oi = NULL;
-            if ( options && options->getOptionString().find("Ascii")!=std::string::npos )
-                oi = new AsciiOutputIterator(&fout);
-            else
-                oi = new BinaryOutputIterator(&fout);
-            
-            os.start( oi, OutputStream::WRITE_SCENE );
-            os.writeObject( &node );
-            os.compress( &fout );
-            
-            if ( fout.fail() ) return WriteResult::ERROR_IN_WRITING_FILE;
-            return WriteResult::FILE_SAVED;
-        }
-        catch ( OutputException e )
-        {
-            osg::notify(osg::WARN) << "ReaderWriterOSG2::writeNode(): " << e.getError()
-                                   << " At " << e.getField() << std::endl;
-        }
-        return WriteResult::FILE_NOT_HANDLED;
+        osg::ref_ptr<OutputIterator> oi = writeInputIterator(fout, options);
+        
+        OutputStream os( options );
+        os.start( oi.get(), OutputStream::WRITE_SCENE ); CATCH_EXCEPTION(os);
+        os.writeObject( &node ); CATCH_EXCEPTION(os);
+        os.compress( &fout ); CATCH_EXCEPTION(os);
+        
+        if ( !os.getSchemaName().empty() )
+        {
+            osgDB::ofstream schemaStream( os.getSchemaName().c_str(), std::ios::out );
+            if ( !schemaStream.fail() ) os.writeSchema( schemaStream );
+            schemaStream.close();
+        }
+        
+        if ( fout.fail() ) return WriteResult::ERROR_IN_WRITING_FILE;
+        return WriteResult::FILE_SAVED;
     }
 };