Show
Ignore:
Timestamp:
01/27/10 18:09:05 (5 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/osg/AsciiStreamOperator.h

    r10986 r11018  
    117117    { 
    118118        std::string boolString; 
    119         *_in >> boolString; checkStream(); 
     119        *_in >> boolString; 
    120120        if ( boolString=="TRUE" ) b = true; 
    121121        else b = false; 
     
    125125    { 
    126126        short s = 0; 
    127         *_in >> s; checkStream(); 
     127        *_in >> s; 
    128128        c = (char)s; 
    129129    } 
     
    132132    { 
    133133        short s = 0; 
    134         *_in >> s; checkStream(); 
     134        *_in >> s; 
    135135        c = (signed char)s; 
    136136    } 
     
    139139    { 
    140140        short s = 0; 
    141         *_in >> s; checkStream(); 
     141        *_in >> s; 
    142142        c = (unsigned char)s; 
    143143    } 
    144144     
    145145    virtual void readShort( short& s ) 
    146     { *_in >> s; checkStream(); } 
     146    { *_in >> s; } 
    147147     
    148148    virtual void readUShort( unsigned short& s ) 
    149     { *_in >> s; checkStream(); } 
     149    { *_in >> s; } 
    150150     
    151151    virtual void readInt( int& i ) 
    152     { *_in >> i; checkStream(); } 
     152    { *_in >> i; } 
    153153     
    154154    virtual void readUInt( unsigned int& i ) 
    155     { *_in >> i; checkStream(); } 
     155    { *_in >> i; } 
    156156     
    157157    virtual void readLong( long& l ) 
    158     { *_in >> l; checkStream(); } 
     158    { *_in >> l; } 
    159159     
    160160    virtual void readULong( unsigned long& l ) 
    161     { *_in >> l; checkStream(); } 
     161    { *_in >> l; } 
    162162     
    163163    virtual void readFloat( float& f ) 
    164     { *_in >> f; checkStream(); } 
     164    { *_in >> f; } 
    165165     
    166166    virtual void readDouble( double& d ) 
    167     { *_in >> d; checkStream(); } 
     167    { *_in >> d; } 
    168168     
    169169    virtual void readString( std::string& s ) 
    170     { *_in >> s; checkStream(); } 
     170    { *_in >> s; } 
    171171     
    172172    virtual void readStream( std::istream& (*fn)(std::istream&) ) 
     
    180180        GLenum e = 0; 
    181181        std::string enumString; 
    182         *_in >> enumString; checkStream(); 
     182        *_in >> enumString; 
    183183        e = osgDB::Registry::instance()->getObjectWrapperManager()->getValue("GL", enumString); 
    184184        value.set( e ); 
     
    189189        int value = 0; 
    190190        std::string enumString; 
    191         *_in >> enumString; checkStream(); 
     191        *_in >> enumString; 
    192192        if ( prop._mapProperty ) 
    193193        { 
     
    209209    { 
    210210        std::string markString; 
    211         *_in >> markString; checkStream(); 
     211        *_in >> markString; 
    212212    } 
    213213