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

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

@@ -5,7 +5,6 @@
#include <osg/Switch>
#include <osg/Geode>
#include <osg/Billboard>
#include <osg/Texture>
#include <osg/Image>
#include <osg/Notify>
@@ -509,7 +508,7 @@ pfGeoState* ConvertToPerformer::visitStateSet(osg::StateSet* stateset)
case(osg::StateAttribute::INHERIT): break;
}
const osg::Texture *tex = dynamic_cast<const osg::Texture *>(stateset->getAttribute( osg::StateAttribute::TEXTURE));
const osg::Texture2D *tex = dynamic_cast<const osg::Texture2D *>(stateset->getAttribute( osg::StateAttribute::TEXTURE));
if( tex != NULL )
{
@@ -547,7 +546,7 @@ pfMaterial* ConvertToPerformer::visitMaterial(osg::Material* material)
}
pfTexture* ConvertToPerformer::visitTexture(osg::Texture* tex)
pfTexture* ConvertToPerformer::visitTexture(osg::Texture2D* tex)
{
if (tex==NULL) return NULL;