Changed the default number of components for a RGB to 4 so it appears as an RGBA

This commit is contained in:
Robert Osfield 2011-02-23 12:13:43 +00:00
parent 2981a52b05
commit a727b74926

View File

@ -491,6 +491,12 @@ osg::Image* createTexture3D(ImageList& imageList, ProcessRow& processRow,
} }
} }
if (max_components==3)
{
// change RGB to a RGBA
max_components = 4;
}
if (numComponentsDesired!=0) max_components = numComponentsDesired; if (numComponentsDesired!=0) max_components = numComponentsDesired;
GLenum desiredPixelFormat = 0; GLenum desiredPixelFormat = 0;
@ -1081,7 +1087,7 @@ int main( int argc, char **argv )
while (arguments.read("--yMultiplier",yMultiplier)) { OSG_NOTICE<<"Warning: --yMultiplier option no longer supported."<<std::endl; invalidOption = true; } while (arguments.read("--yMultiplier",yMultiplier)) { OSG_NOTICE<<"Warning: --yMultiplier option no longer supported."<<std::endl; invalidOption = true; }
float zMultiplier=1.0f; float zMultiplier=1.0f;
while (arguments.read("--zMultiplier",zMultiplier)) { OSG_NOTICE<<"Warning: --yMultiplier option no longer supported."<<std::endl; invalidOption = true; } while (arguments.read("--zMultiplier",zMultiplier)) { OSG_NOTICE<<"Warning: --zMultiplier option no longer supported."<<std::endl; invalidOption = true; }
if (invalidOption) return 1; if (invalidOption) return 1;
} }