Show
Ignore:
Timestamp:
09/02/14 11:14:08 (less than one hour ago)
Author:
robert
Message:

Added support for scaling widgets via the scoll wheel.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgWrappers/serializers/osg/ImageSequence.cpp

    r13058 r13191  
    77static bool checkFileNames( const osg::ImageSequence& image ) 
    88{ 
    9     return image.getNumImageFiles()>0; 
     9    return image.getNumImageData()>0; 
    1010} 
    1111 
     
    2424static bool writeFileNames( osgDB::OutputStream& os, const osg::ImageSequence& image ) 
    2525{ 
    26     const osg::ImageSequence::FileNames& files = image.getFileNames(); 
    27     os.writeSize(files.size()); os << os.BEGIN_BRACKET << std::endl; 
    28     for ( osg::ImageSequence::FileNames::const_iterator itr=files.begin(); 
    29           itr!=files.end(); ++itr ) 
     26    const osg::ImageSequence::ImageDataList& imageDataList = image.getImageDataList(); 
     27    os.writeSize(imageDataList.size()); os << os.BEGIN_BRACKET << std::endl; 
     28    for ( osg::ImageSequence::ImageDataList::const_iterator itr=imageDataList.begin(); 
     29          itr!=imageDataList.end(); 
     30          ++itr ) 
    3031    { 
    31         os.writeWrappedString( *itr ); 
     32        os.writeWrappedString( itr->_filename ); 
    3233        os << std::endl; 
    3334    } 
     
    3940static bool checkImages( const osg::ImageSequence& image ) 
    4041{ 
    41     return image.getNumImages()>0; 
     42    return false; 
    4243} 
    4344 
     
    5455} 
    5556 
    56 static bool writeImages( osgDB::OutputStream& os, const osg::ImageSequence& image ) 
     57static bool writeImages( osgDB::OutputStream& os, const osg::ImageSequence& image) 
    5758{ 
    58     const osg::ImageSequence::Images& images = image.getImages(); 
    59     os.writeSize(images.size()); os << os.BEGIN_BRACKET << std::endl; 
    60     for ( osg::ImageSequence::Images::const_iterator itr=images.begin(); 
    61           itr!=images.end(); ++itr ) 
     59    const osg::ImageSequence::ImageDataList& imageDataList = image.getImageDataList(); 
     60    os.writeSize(imageDataList.size()); os << os.BEGIN_BRACKET << std::endl; 
     61    for ( osg::ImageSequence::ImageDataList::const_iterator itr=imageDataList.begin(); 
     62          itr!=imageDataList.end(); 
     63          ++itr ) 
    6264    { 
    63         os.writeObject( (*itr).get() ); 
     65        os.writeObject( (*itr)._image.get() ); 
    6466    } 
    6567    os << os.END_BRACKET << std::endl;