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

OpenSceneGraph/trunk/src/osgDB/InputStream.cpp

@@ -25 +25 @@
 
 InputStream::InputStream( const osgDB::Options* options )
-:   _byteSwap(0), _useFloatMatrix(false),
-    _in(0)
+:   _byteSwap(0), _useFloatMatrix(false), _forceReadingImage(false)
 {
     if ( !options ) return;
@@ -39 +38 @@
         {
             // Omit this
+        }
+        else if ( option=="ForceReadingImage" )
+        {
+            _forceReadingImage = true;
         }
         else
@@ -158 +161 @@
 }
 
+bool InputStream::matchString( const std::string& str )
+{
+    if ( !isBinary() )
+    {
+        std::string s; *this >> s;
+        if ( s==str ) return true;
+        else _in->getStream()->seekg( -(int)(s.length()), std::ios::cur );
+    }
+    return false;
+}
+
+void InputStream::advanceToCurrentEndBracket()
+{
+    if ( isBinary() )
+        return;
+    
+    std::string passString;
+    unsigned int blocks = 0;
+    while ( !_in->getStream()->eof() )
+    {
+        passString.clear();
+        *this >> passString;
+        
+        if ( passString=="}" )
+        {
+            if ( blocks<=0 ) return;
+            else blocks--;
+        }
+        else if ( passString=="{" )
+            blocks++;
+    }
+}
+
+void InputStream::readWrappedString( std::string& str )
+{
+    *this >> str;
+    if ( !isBinary() )
+    {
+        if ( str[0]=='\"' )
+        {
+            if ( str.size()==1 || (*str.rbegin())!='\"' )
+            {
+                char ch;
+                do
+                {
+                    _in->getStream()->get( ch ); checkStream();
+                    if ( ch=='\\' )
+                    {
+                        _in->getStream()->get( ch ); checkStream();
+                        if ( ch=='\"' )
+                        {
+                            str += ch; ch = 0;
+                        }
+                        else if ( ch=='\\' )
+                        {
+                            str += ch;
+                        }
+                        else
+                        {
+                            str += '\\'; str += ch;
+                        }
+                    }
+                    else
+                        str += ch;
+                } while ( ch!='\"' );
+            }
+            str = str.substr(1, str.size()-2);
+        }
+    }
+}
+
 osg::Array* InputStream::readArray()
 {
@@ -320 +394 @@
         break;
     default:
-        throw InputException(_currentField, "InputStream::readArray(): Unsupported array type.");
-    }
-    
+        throwException( "InputStream::readArray(): Unsupported array type." );
+    }
+    
+    if ( getException() ) return NULL;
     _arrayMap[id] = array;
     return array.release();
@@ -402 +477 @@
         break;
     default:
-        throw InputException(_currentField, "InputStream::readPrimitiveSet(): Unsupported array type.");
-    }
+        throwException( "InputStream::readPrimitiveSet(): Unsupported array type." );
+    }
+    
+    if ( getException() ) return NULL;
     return primitive.release();
 }
@@ -413 +490 @@
     *this >> PROPERTY("FileName"); readWrappedString(name);
     *this >> PROPERTY("WriteHint") >> writeHint >> decision;
+    if ( getException() ) return NULL;
     
     osg::ref_ptr<osg::Image> image = NULL;
@@ -437 +515 @@
                 char* data = new char[size];
                 if ( !data )
-                    throw InputException(_currentField, "InputStream::readImage() Out of memory.");
+                    throwException( "InputStream::readImage() Out of memory." );
+                if ( getException() ) return NULL;
+                
                 readCharArray( data, size );
                 image->setOrigin( (osg::Image::Origin)origin );
@@ -464 +544 @@
                 char* data = new char[size];
                 if ( !data )
-                    throw InputException(_currentField, "InputStream::readImage(): Out of memory.");
+                    throwException( "InputStream::readImage(): Out of memory." );
+                if ( getException() ) return NULL;
                 readCharArray( data, size );
                 
@@ -501 +582 @@
     
     if ( readFromExternal )
+    {
         image = osgDB::readImageFile( name );
+        if ( !image && _forceReadingImage ) image = new osg::Image;
+    }
     if ( image.valid() )
     {
@@ -517 +601 @@
     unsigned int id = 0;
     *this >> className >> BEGIN_BRACKET >> PROPERTY("UniqueID") >> id;
+    if ( getException() ) return NULL;
     
     IdentifierMap::iterator itr = _identifierMap.find( id );
@@ -533 +618 @@
         return NULL;
     }
+    _fields.push_back( className );
+    
     osg::ref_ptr<osg::Object> obj = existingObj ? existingObj : wrapper->getProto()->cloneType();
     if ( obj.valid() )
@@ -548 +635 @@
                 continue;
             }
+            _fields.push_back( assocWrapper->getName() );
             
-            _currentField = assocWrapper->getName();
             assocWrapper->read( *this, *obj );
+            if ( getException() ) return NULL;
+            
+            _fields.pop_back();
         }
     }
     advanceToCurrentEndBracket();
+    _fields.pop_back();
     return obj.release();
 }
@@ -576 +667 @@
 InputStream::ReadType InputStream::start( InputIterator* inIterator )
 {
+    _fields.clear();
+    _fields.push_back( "Start" );
+    
     ReadType type = READ_UNKNOWN;
-    _currentField = "Header";
     _in = inIterator;
     if ( !_in )
-        throw InputException(_currentField, "InputStream: Null stream specified.");
+        throwException( "InputStream: Null stream specified." );
+    if ( getException() ) return type;
     
     // Check OSG header information
@@ -596 +690 @@
     if ( !isBinary() )
     {
-        DEF_PROPERTY("#Ascii", header); *this >> header;
-        if ( header._name!="#Ascii" ) return READ_UNKNOWN;
-        
         std::string typeString; *this >> typeString;
         if ( typeString=="Scene" ) type = READ_SCENE;
@@ -615 +706 @@
                                << PLUGIN_VERSION << std::endl;
     }
+    _fields.pop_back();
     return type;
 }
@@ -620 +712 @@
 void InputStream::decompress()
 {
-    _currentField = "Decompression";
+    _fields.clear();
+    _fields.push_back( "Decompression" );
     if ( !isBinary() ) return;
     
@@ -635 +728 @@
     std::string data;
     if ( !compressor->decompress(*(_in->getStream()), data) )
-        throw InputException(_currentField, "InputStream: Failed to decompress stream.");
+        throwException( "InputStream: Failed to decompress stream." );
+    if ( getException() ) return;
+    
     _in->setStream( new std::stringstream(data) );
+    _fields.pop_back();
 }