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

From Lukasz Izdebski, "I found problem with rgb plugin.

Browse Source 
Internal format of rgb image is wrongly set ( diffrent then in other images type  plugin ), because of that using rgb images in osg::Texture2DArray causes a bug."
This commit is contained in:
Robert Osfield
2013-01-23 11:45:31 +00:00
parent e5ce3489a2
commit 9a7c9b2a50
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osgPlugins/rgb/ReaderWriterRGB.cpp
View File

@@ -481,18 +481,19 @@ class ReaderWriterRGB : public osgDB::ReaderWriter
int s = raw->sizeX;
int t = raw->sizeY;
int r = 1;
#if 0
int internalFormat = raw->sizeZ == 3 ? GL_RGB5 :
raw->sizeZ == 4 ? GL_RGB5_A1 : GL_RGB;
#else
int internalFormat = raw->sizeZ;
#endif
unsigned int pixelFormat =
raw->sizeZ == 1 ? GL_LUMINANCE :
raw->sizeZ == 2 ? GL_LUMINANCE_ALPHA :
raw->sizeZ == 3 ? GL_RGB :
raw->sizeZ == 4 ? GL_RGBA : (GLenum)-1;
#if 0
int internalFormat = raw->sizeZ == 3 ? GL_RGB5 :
raw->sizeZ == 4 ? GL_RGB5_A1 : GL_RGB;
#else
int internalFormat = pixelFormat;
#endif
unsigned int dataType = raw->bpc == 1 ? GL_UNSIGNED_BYTE :
GL_UNSIGNED_SHORT;