Show
Ignore:
Timestamp:
01/24/12 15:34:02 (3 years ago)
Author:
robert
Message:

Added support for using GL_UNPACK_ROW_LENGTH in conjunction with texture's + osg::Image via new RowLength?
parameter in osg::Image. To support this Image::setData(..) now has a new optional rowLength parameter which
defaults to 0, which provides the original behaviour, Image::setRowLength(int) and int Image::getRowLength() are also provided.

With the introduction of RowLength? support in osg::Image it is now possible to create a sub image where
the t size of the image are smaller than the row length, useful for when you have a large image on the CPU
and which to use a small portion of it on the GPU. However, when these sub images are created the data
within the image is no longer contiguous so data access can no longer assume that all the data is in
one block. The new method Image::isDataContiguous() enables the user to check whether the data is contiguous,
and if not one can either access the data row by row using Image::data(column,row,image) accessor, or use the
new Image::DataIterator? for stepping through each block on memory assocatied with the image.

To support the possibility of non contiguous osg::Image usage of image objects has had to be updated to
check DataContiguous? and handle the case or use access via the DataIerator? or by row by row. To achieve
this a relatively large number of files has had to be modified, in particular the texture classes and
image plugins that doing writing.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/rgb/ReaderWriterRGB.cpp

    r11563 r12912  
    661661        virtual WriteResult writeImage(const osg::Image& img,std::ostream& fout,const osgDB::ReaderWriter::Options*) const 
    662662        { 
     663            if (img.isCompressed()) 
     664            { 
     665                OSG_NOTICE<<"Warning: RGB plugin does not supporting writing compressed imagery."<<std::endl; 
     666                return WriteResult::ERROR_IN_WRITING_FILE; 
     667            } 
     668            if (!img.isDataContiguous()) 
     669            { 
     670                OSG_NOTICE<<"Warning: RGB plugin does not supporting writing non contiguous imagery."<<std::endl; 
     671                return WriteResult::ERROR_IN_WRITING_FILE; 
     672            } 
     673             
    663674            return writeRGBStream(img,fout,""); 
    664675        } 
     
    666677        virtual WriteResult writeImage(const osg::Image &img,const std::string& fileName, const osgDB::ReaderWriter::Options*) const 
    667678        { 
     679            if (img.isCompressed()) 
     680            { 
     681                OSG_NOTICE<<"Warning: RGB plugin does not supporting writing compressed imagery."<<std::endl; 
     682                return WriteResult::ERROR_IN_WRITING_FILE; 
     683            } 
     684            if (!img.isDataContiguous()) 
     685            { 
     686                OSG_NOTICE<<"Warning: RGB plugin does not supporting writing non contiguous imagery."<<std::endl; 
     687                return WriteResult::ERROR_IN_WRITING_FILE; 
     688            } 
     689 
    668690            std::string ext = osgDB::getFileExtension(fileName); 
    669691            if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;