Changeset 11018 for OpenSceneGraph/trunk/src/osgDB/OutputStream.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/osgDB/OutputStream.cpp (modified) (16 diffs)

OpenSceneGraph/trunk/src/osgDB/OutputStream.cpp

@@ -23 +23 @@
 
 OutputStream::OutputStream( const osgDB::Options* options )
-:   _writeImageHint(WRITE_USE_IMAGE_HINT),
-    _out(0)
+:   _writeImageHint(WRITE_USE_IMAGE_HINT)
 {
     if ( !options ) return;
@@ -44 +43 @@
             
             if ( keyAndValues[0]=="SchemaFile" )
-            {
-                osgDB::ofstream schemaStream( keyAndValues[1].c_str(), std::ios::out );
-                if ( !schemaStream.fail() ) writeSchema( schemaStream );
-                schemaStream.close();
-            }
+                _schemaName = keyAndValues[1];
             else if ( keyAndValues[0]=="Compressor" )
                 _compressorName = keyAndValues[1];
@@ -137 +132 @@
 }
 
+void OutputStream::writeWrappedString( const std::string& str )
+{
+    if ( !isBinary() )
+    {
+        std::string wrappedStr;
+        unsigned int size = str.size();
+        for ( unsigned int i=0; i<size; ++i )
+        {
+            char ch = str[i];
+            if ( ch=='\"' ) wrappedStr += '\\';
+            else if ( ch=='\\' ) wrappedStr += '\\';
+            wrappedStr += ch;
+        }
+        
+        wrappedStr.insert( 0, 1, '\"' );
+        wrappedStr += '\"';
+        *this << wrappedStr;
+    }
+    else
+        *this << str;
+}
+
 void OutputStream::writeArray( const osg::Array* a )
 {
@@ -236 +253 @@
         break;
     default:
-        throw OutputException(_currentField, "OutputStream::writeArray(): Unsupported array type.");
+        throwException( "OutputStream::writeArray(): Unsupported array type." );
     }
 }
@@ -287 +304 @@
         break;
     default:
-        throw OutputException(_currentField, "OutputStream::writePrimitiveSet(): Unsupported primitive type.");
+        throwException( "OutputStream::writePrimitiveSet(): Unsupported primitive type." );
     }
 }
@@ -297 +314 @@
     *this << PROPERTY("FileName"); writeWrappedString(img->getFileName()); *this << std::endl;
     *this << PROPERTY("WriteHint") << (int)img->getWriteHint();
+    if ( getException() ) return;
     
     int decision = IMAGE_EXTERNAL;
@@ -368 +386 @@
                     char* data = new char[size];
                     if ( !data )
-                        throw OutputException(_currentField, "OutputStream::writeImage(): Out of memory.");
+                        throwException( "OutputStream::writeImage(): Out of memory." );
+                    if ( getException() ) return;
+                    
                     infile.seekg( 0, std::ios::beg );
                     infile.read( data, size );
@@ -389 +409 @@
         break;
     }
-    
     writeObject( img );
 }
@@ -403 +422 @@
     *this << name << BEGIN_BRACKET << std::endl;       // Write object name
     *this << PROPERTY("UniqueID") << id << std::endl;  // Write object ID
+    if ( getException() ) return;
     
     // Check whether this is a shared object or not
@@ -415 +435 @@
             return;
         }
+        _fields.push_back( name );
         
         const StringList& associates = wrapper->getAssociates();
@@ -426 +447 @@
                 continue;
             }
+            _fields.push_back( assocWrapper->getName() );
             
-            _currentField = assocWrapper->getName();
             assocWrapper->write( *this, *obj );
-        }
+            if ( getException() ) return;
+            
+            _fields.pop_back();
+        }
+        _fields.pop_back();
     }
     *this << END_BRACKET << std::endl;
@@ -436 +461 @@
 void OutputStream::start( OutputIterator* outIterator, OutputStream::WriteType type )
 {
-    _currentField = "Header";
+    _fields.clear();
+    _fields.push_back( "Start" );
+    
     _out = outIterator;
     if ( !_out )
-        throw OutputException(_currentField, "OutputStream: Null stream specified.");
+        throwException( "OutputStream: Null stream specified." );
+    if ( getException() ) return;
     
     if ( isBinary() )
     {
-        *this << (unsigned int)OSG_HEADER_LOW << (unsigned int)OSG_HEADER_HIGH
-              << (unsigned int)type << (unsigned int)PLUGIN_VERSION;
+        *this << (unsigned int)type << (unsigned int)PLUGIN_VERSION;
         
         if ( sizeof(osg::Matrix::value_type)==FLOAT_SIZE ) *this << (unsigned int)0;
@@ -477 +504 @@
         }
         
-        *this << PROPERTY("#Ascii") << typeString << std::endl;
+        *this << typeString << std::endl;
         *this << PROPERTY("#Version") << (unsigned int)PLUGIN_VERSION << std::endl;
         *this << PROPERTY("#Generator") << std::string("OpenSceneGraph")
@@ -483 +510 @@
         *this << std::endl;
     }
+    _fields.pop_back();
 }
 
 void OutputStream::compress( std::ostream* ostream )
 {
-    _currentField = "Compression";
+    _fields.clear();
+    _fields.push_back( "Compression" );
     if ( _compressorName.empty() || !isBinary() ) return;
     
@@ -494 +523 @@
     
     if ( !compressor->compress(*ostream, _compressSource.str()) )
-        throw OutputException(_currentField, "OutputStream: Failed to compress stream.");
-}
-
-// PROTECTED METHODS
+        throwException( "OutputStream: Failed to compress stream." );
+    _fields.pop_back();
+}
 
 void OutputStream::writeSchema( std::ostream& fout )
@@ -522 +550 @@
 }
 
+// PROTECTED METHODS
+
 template<typename T>
 void OutputStream::writeArrayImplementation( const T* a, int writeSize, unsigned int numInRow )