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

Added support s/getImage(uint i) and getNumImages().

Browse Source
This commit is contained in:
Robert Osfield
2004-07-27 10:11:45 +00:00
parent a4f93740d1
commit bb5576bef8
14 changed files with 91 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osg/TextureCubeMap.cpp
View File

@@ -164,18 +164,18 @@ int TextureCubeMap::compare(const StateAttribute& sa) const
}
void TextureCubeMap::setImage( Face face, Image* image)
void TextureCubeMap::setImage( unsigned int face, Image* image)
{
_images[face] = image;
_modifiedTag[face].setAllElementsTo(0);
}
Image* TextureCubeMap::getImage(Face face)
Image* TextureCubeMap::getImage(unsigned int face)
{
return _images[face].get();
}
const Image* TextureCubeMap::getImage(Face face) const
const Image* TextureCubeMap::getImage(unsigned int face) const
{
return _images[face].get();
}
@@ -284,7 +284,7 @@ void TextureCubeMap::apply(State& state) const
}
if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded())
if (_unrefImageDataAfterApply && areAllTextureObjectsLoaded() && getDataVariance()==STATIC)
{
TextureCubeMap* non_const_this = const_cast<TextureCubeMap*>(this);
for (int n=0; n<6; n++)
@@ -292,12 +292,6 @@ void TextureCubeMap::apply(State& state) const
non_const_this->_images[n] = 0;
}
}
// in theory the following line is redundent, but in practice
// have found that the first frame drawn doesn't apply the textures
// unless a second bind is called?!!
// perhaps it is the first glBind which is not required...
//glBindTexture( GL_TEXTURE_CUBE_MAP, handle );
}
else