FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added extra check for GL_BGR and GL_BGRA formats and messages describing image format loaded

Browse Source
This commit is contained in:
Robert Osfield 2011-02-23 10:37:51 +00:00
parent d73f37e841
commit e489c7b1bf
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/osgvolume/osgvolume.cpp
View File

@ -476,7 +476,9 @@ osg::Image* createTexture3D(ImageList& imageList, ProcessRow& processRow,
pixelFormat==GL_LUMINANCE ||
pixelFormat==GL_LUMINANCE_ALPHA ||
pixelFormat==GL_RGB ||
pixelFormat==GL_RGBA)
pixelFormat==GL_RGBA ||
pixelFormat==GL_BGR ||
pixelFormat==GL_BGRA)
{
max_s = osg::maximum(image->s(), max_s);
max_t = osg::maximum(image->t(), max_t);
@ -485,7 +487,7 @@ osg::Image* createTexture3D(ImageList& imageList, ProcessRow& processRow,
}
else
{
osg::notify(osg::NOTICE)<<"Image "<<image->getFileName()<<" has unsuitable pixel format"<< std::hex<< pixelFormat << std::dec << std::endl;
osg::notify(osg::NOTICE)<<"Image "<<image->getFileName()<<" has unsuitable pixel format 0x"<< std::hex<< pixelFormat << std::dec << std::endl;
}
}
@ -1242,6 +1244,7 @@ int main( int argc, char **argv )
if(image)
{
OSG_NOTICE<<"Read osg::Image FileName::"<<image->getFileName()<<", pixelFormat=0x"<<std::hex<<image->getPixelFormat()<<std::dec<<", s="<<image->s()<<", t="<<image->t()<<", r="<<image->r()<<std::endl;
imageList.push_back(image);
}
}
@ -1253,6 +1256,7 @@ int main( int argc, char **argv )
if(image)
{
OSG_NOTICE<<"Read osg::Image FileName::"<<image->getFileName()<<", pixelFormat=0x"<<std::hex<<image->getPixelFormat()<<std::dec<<", s="<<image->s()<<", t="<<image->t()<<", r="<<image->r()<<std::endl;
imageList.push_back(image);
}
}
@ -1263,7 +1267,10 @@ int main( int argc, char **argv )
// pack the textures into a single texture.
ProcessRow processRow;
osg::Image* image = createTexture3D(imageList, processRow, numComponentsDesired, s_maximumTextureSize, t_maximumTextureSize, r_maximumTextureSize, resizeToPowerOfTwo);
if (image) images.push_back(image);
if (image)
{
images.push_back(image);
}
}