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

Add support for DDPF_PALETTEINDEXED8 pixel format reading

Browse Source
This commit is contained in:
capostrophic 2019-08-17 01:43:47 +03:00
parent 515a0bbe65
commit cbac09902d
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/osgPlugins/dds/ReaderWriterDDS.cpp
View File

@ -222,6 +222,7 @@ struct DXT1TexelsBlock
// //
#define DDPF_ALPHAPIXELS 0x00000001l #define DDPF_ALPHAPIXELS 0x00000001l
#define DDPF_FOURCC 0x00000004l // Compressed formats #define DDPF_FOURCC 0x00000004l // Compressed formats
#define DDPF_PALETTEINDEXED8 0x00000020l
#define DDPF_RGB 0x00000040l // Uncompressed formats #define DDPF_RGB 0x00000040l // Uncompressed formats
#define DDPF_ALPHA 0x00000002l #define DDPF_ALPHA 0x00000002l
#define DDPF_COMPRESSED 0x00000080l #define DDPF_COMPRESSED 0x00000080l
@ -944,6 +945,12 @@ osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)
internalFormat = GL_ALPHA; internalFormat = GL_ALPHA;
pixelFormat = GL_ALPHA; pixelFormat = GL_ALPHA;
} }
else if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)
{
OSG_INFO << "ReadDDSFile info : format = PALETTEINDEXED8" << std::endl;
// The indexed data needs to first be loaded as a single-component image.
pixelFormat = GL_RED;
}
else else
{ {
OSG_WARN << "ReadDDSFile warning: unhandled pixel format (ddsd.ddpfPixelFormat.dwFlags" OSG_WARN << "ReadDDSFile warning: unhandled pixel format (ddsd.ddpfPixelFormat.dwFlags"
@ -984,6 +991,17 @@ osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)
OSG_INFO<<"ReadDDS, dataType = 0x"<<std::hex<<dataType<<std::endl; OSG_INFO<<"ReadDDS, dataType = 0x"<<std::hex<<dataType<<std::endl;
unsigned char* palette = new unsigned char [1024];
if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)
{
if (!_istream.read((char*)palette, 1024))
{
delete [] palette;
OSG_WARN << "ReadDDSFile warning: couldn't read palette" << std::endl;
return NULL;
}
}
unsigned char* imageData = new unsigned char [sizeWithMipmaps]; unsigned char* imageData = new unsigned char [sizeWithMipmaps];
if(!imageData) if(!imageData)
{ {
@ -1010,7 +1028,27 @@ osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)
// this memory will not be used but it will not cause leak in worst meaning of this word. // this memory will not be used but it will not cause leak in worst meaning of this word.
} }
if (ddsd.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8)
{
// Now we need to substitute the indexed image data with full RGBA image data.
unsigned char* convertedData = new unsigned char [sizeWithMipmaps * 4];
for (unsigned int i = 0; i < sizeWithMipmaps; i++)
{
convertedData[i * 4 + 0] = palette[imageData[i] * 4 + 0];
convertedData[i * 4 + 1] = palette[imageData[i] * 4 + 1];
convertedData[i * 4 + 2] = palette[imageData[i] * 4 + 2];
convertedData[i * 4 + 3] = palette[imageData[i] * 4 + 3];
}
for (unsigned int i = 0; i < mipmap_offsets.size(); i++)
mipmap_offsets[i] *= 4;
internalFormat = GL_RGBA;
pixelFormat = GL_RGBA;
osgImage->setImage(s,t,r, internalFormat, pixelFormat, dataType, convertedData, osg::Image::USE_NEW_DELETE, packing);
}
else
{
osgImage->setImage(s,t,r, internalFormat, pixelFormat, dataType, imageData, osg::Image::USE_NEW_DELETE, packing); osgImage->setImage(s,t,r, internalFormat, pixelFormat, dataType, imageData, osg::Image::USE_NEW_DELETE, packing);
}
if (mipmap_offsets.size()>0) osgImage->setMipmapLevels(mipmap_offsets); if (mipmap_offsets.size()>0) osgImage->setMipmapLevels(mipmap_offsets);