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

Converted code dependant on osg::Texture across to its replacement osg::Texture2D.

Browse Source
This commit is contained in:
Robert Osfield
2002-08-25 15:31:44 +00:00
parent 61ff1c7b0a
commit 8e75f531e3
42 changed files with 149 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/osgPlugins/pfb/ConvertFromPerformer.cpp
View File

@@ -8,7 +8,7 @@
#include <osg/Switch>
#include <osg/Geode>
#include <osg/Billboard>
#include <osg/Texture>
#include <osg/Texture2D>
#include <osg/Image>
#include <osg/CullFace>
#include <osg/TexGen>
@@ -1125,19 +1125,19 @@ osg::Material* ConvertFromPerformer::visitMaterial(osg::StateSet* osgStateSet,pf
}
static osg::Texture::FilterMode getTexfilter(int filter, int pftype)
static osg:::Texture2D::FilterMode getTexfilter(int filter, int pftype)
{
if (filter == PFTEX_MINFILTER)
{
if (pftype & PFTEX_LINEAR)
return osg::Texture::NEAREST_MIPMAP_LINEAR;
return osg:::Texture2D::NEAREST_MIPMAP_LINEAR;
else if (pftype & PFTEX_BILINEAR)
return osg::Texture::LINEAR_MIPMAP_NEAREST;
return osg:::Texture2D::LINEAR_MIPMAP_NEAREST;
else if (pftype & PFTEX_TRILINEAR)
return osg::Texture::LINEAR_MIPMAP_LINEAR;
return osg:::Texture2D::LINEAR_MIPMAP_LINEAR;
return osg::Texture::NEAREST_MIPMAP_LINEAR;
return osg:::Texture2D::NEAREST_MIPMAP_LINEAR;
}
else
@@ -1147,22 +1147,22 @@ static osg::Texture::FilterMode getTexfilter(int filter, int pftype)
// not quite sure what is supposed to be interpret the Peformer
// filter modes here so will simple go with OpenGL default.
return osg::Texture::LINEAR;
return osg:::Texture2D::LINEAR;
}
}
osg::Texture* ConvertFromPerformer::visitTexture(osg::StateSet* osgStateSet,pfTexture* tex)
osg::Texture2D* ConvertFromPerformer::visitTexture(osg::StateSet* osgStateSet,pfTexture* tex)
{
if (tex==NULL) return NULL;
osg::Texture* osgTexture = dynamic_cast<osg::Texture*>(getOsgObject(tex));
osg::Texture2D* osgTexture = dynamic_cast<osg::Texture2D*>(getOsgObject(tex));
if (osgTexture) {
if (osgStateSet) osgStateSet->setTextureAttribute(0,osgTexture);
return osgTexture;
}
osgTexture = new osg::Texture;
osgTexture = new osg::Texture2D;
registerPfObjectForOsgObject(tex, osgTexture);
//_pfToOsgMap[tex] = osgTexture;
@@ -1173,26 +1173,26 @@ osg::Texture* ConvertFromPerformer::visitTexture(osg::StateSet* osgStateSet,pfTe
int repeat_t = tex->getRepeat(PFTEX_WRAP_T);
if (repeat_r==PFTEX_CLAMP)
osgTexture->setWrap(osg::Texture::WRAP_R,osg::Texture::CLAMP);
osgTexture->setWrap(osg:::Texture2D::WRAP_R,osg:::Texture2D::CLAMP);
else
osgTexture->setWrap(osg::Texture::WRAP_R,osg::Texture::REPEAT);
osgTexture->setWrap(osg:::Texture2D::WRAP_R,osg:::Texture2D::REPEAT);
if (repeat_s==PFTEX_CLAMP)
osgTexture->setWrap(osg::Texture::WRAP_S,osg::Texture::CLAMP);
osgTexture->setWrap(osg:::Texture2D::WRAP_S,osg:::Texture2D::CLAMP);
else
osgTexture->setWrap(osg::Texture::WRAP_S,osg::Texture::REPEAT);
osgTexture->setWrap(osg:::Texture2D::WRAP_S,osg:::Texture2D::REPEAT);
if (repeat_t==PFTEX_CLAMP)
osgTexture->setWrap(osg::Texture::WRAP_T,osg::Texture::CLAMP);
osgTexture->setWrap(osg:::Texture2D::WRAP_T,osg:::Texture2D::CLAMP);
else
osgTexture->setWrap(osg::Texture::WRAP_T,osg::Texture::REPEAT);
osgTexture->setWrap(osg:::Texture2D::WRAP_T,osg:::Texture2D::REPEAT);
// filter
#if 1
osgTexture->setFilter(osg::Texture::MIN_FILTER,
osgTexture->setFilter(osg:::Texture2D::MIN_FILTER,
getTexfilter(PFTEX_MINFILTER,
tex->getFilter(PFTEX_MINFILTER)));
osgTexture->setFilter(osg::Texture::MAG_FILTER,
osgTexture->setFilter(osg:::Texture2D::MAG_FILTER,
getTexfilter(PFTEX_MAGFILTER,
tex->getFilter(PFTEX_MAGFILTER)));
#endif