Integrated Brede Johansen's updates to flt loader.

This commit is contained in:
Robert Osfield
2001-12-04 16:03:10 +00:00
parent 3e940e0b33
commit d7ded2d90f
30 changed files with 1646 additions and 862 deletions

View File

@@ -61,7 +61,7 @@ ColorPool::ColorName* ColorPool::getColorName(int nIndex)
////////////////////////////////////////////////////////////////////
osg::Texture* TexturePool::getTexture(int nIndex)
osg::StateSet* TexturePool::getTexture(int nIndex)
{
TexturePaletteMap::iterator fitr = _textureMap.find(nIndex);
if (fitr != _textureMap.end())
@@ -71,9 +71,9 @@ osg::Texture* TexturePool::getTexture(int nIndex)
}
void TexturePool::addTexture(int nIndex, osg::Texture* osgTexture)
void TexturePool::addTexture(int nIndex, osg::StateSet* stateset)
{
_textureMap[nIndex] = osgTexture;
_textureMap[nIndex] = stateset;
}