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/xine/ReaderWriterXine.cpp

    r12262 r12912  
    193193            GLenum pixelFormat = GL_BGRA; 
    194194 
    195         #if 0    
    196             if (!imageStream->_ready) 
    197             { 
    198                 imageStream->allocateImage(width,height,1,pixelFormat,GL_UNSIGNED_BYTE,1); 
    199                 imageStream->setInternalTextureFormat(GL_RGBA); 
    200             } 
    201  
    202             osg::Timer_t start_tick = osg::Timer::instance()->tick(); 
    203  
    204             memcpy(imageStream->data(),data,imageStream->getTotalSizeInBytes()); 
    205  
    206             OSG_INFO<<"image memcpy size="<<imageStream->getTotalSizeInBytes()<<" time="<<osg::Timer::instance()->delta_m(start_tick,osg::Timer::instance()->tick())<<"ms"<<std::endl; 
    207  
    208  
    209             imageStream->dirty(); 
    210         #else 
    211              imageStream->setImage(width,height,1, 
     195            imageStream->setImage(width,height,1, 
    212196                              GL_RGB, 
    213197                              pixelFormat,GL_UNSIGNED_BYTE, 
     
    215199                              osg::Image::NO_DELETE, 
    216200                              1); 
    217         #endif 
     201 
    218202            imageStream->_ready = true; 
    219203        }