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

Added osg::Image::setPixelFormat(..) and setInternalTextureFormat(), and

Browse Source 
renamed osg::Image::pixelFormat(), internalTextureFormat(),dataType() to
osg::Image::getPixelFormat() etc.  These changes are to bring it more
into line with the style of the rest of the OSG.

Updated the rest of the distribution to take account for these names changes.
This commit is contained in:
Robert Osfield
2002-04-16 14:57:39 +00:00
parent 2b4008bbbc
commit 7836540bb3
8 changed files with 66 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/pfb/ConvertToPerformer.cpp
View File

@@ -521,10 +521,10 @@ pfGeoState* ConvertToPerformer::visitStateSet(osg::StateSet* stateset)
int ns = img->s();
int nt = img->t();
int ncomp =
img->pixelFormat() == GL_LUMINANCE ? 1 :
img->pixelFormat() == GL_LUMINANCE_ALPHA ? 2 :
img->pixelFormat() == GL_RGB ? 3 :
img->pixelFormat() == GL_RGBA ? 4 : 3;
img->getPixelFormat() == GL_LUMINANCE ? 1 :
img->getPixelFormat() == GL_LUMINANCE_ALPHA ? 2 :
img->getPixelFormat() == GL_RGB ? 3 :
img->getPixelFormat() == GL_RGBA ? 4 : 3;
uint *uim = (uint *)pfMalloc( ns * nt * ncomp, pfGetSharedArena() );