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

From Brede Johansen, "Attached is a fix that returns a default color (white) if an invalid

Browse Source 
index to the color palette is used."
This commit is contained in:
Robert Osfield
2007-07-06 13:33:40 +00:00
parent 6931ae4878
commit a7de33ee55
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/OpenFlight/Pools.cpp
View File

@@ -20,8 +20,14 @@ osg::Vec4 ColorPool::getColor(int indexIntensity) const
// bit 12 fixed intensity bit
bool fixedIntensity = (indexIntensity & 0x1000) ? true : false;
unsigned int index = (fixedIntensity) ? (indexIntensity & 0x0fff)+(4096>>7) : indexIntensity >> 7;
assert(index<size());
osg::Vec4 col = at(index);
if (index>=size())
{
// color index not available.
return osg::Vec4(1,1,1,1);
}
osg::Vec4 col = operator[](index);
if (!fixedIntensity)
{
float intensity = (float)(indexIntensity & 0x7f)/127.f;
@@ -35,15 +41,15 @@ osg::Vec4 ColorPool::getColor(int indexIntensity) const
{
// bit 0-6: intensity
// bit 7-15 color index
int index = indexIntensity >> 7;
unsigned int index = indexIntensity >> 7;
if (index<0 || index>=(int)size())
if (index>=size())
{
// color index not available.
return osg::Vec4(1,1,1,1);
}
osg::Vec4 col = at(index);
osg::Vec4 col = operator[](index);
float intensity = (float)(indexIntensity & 0x7f)/127.f;
col[0] *= intensity;
col[1] *= intensity;