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

Moved the modified tag's from osg::Texture into the osg::Texture1D,2D,3D and

Browse Source 
CubeMap classes.
This commit is contained in:
Robert Osfield
2003-04-07 09:46:06 +00:00
parent 98f691f693
commit 7e58786b11
10 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/osg/TextureCubeMap.cpp
View File

@@ -107,6 +107,13 @@ TextureCubeMap::TextureCubeMap(const TextureCubeMap& text,const CopyOp& copyop):
_images[4] = copyop(text._images[4].get());
_images[5] = copyop(text._images[5].get());
_modifiedTag[0].setAllElementsTo(0);
_modifiedTag[1].setAllElementsTo(0);
_modifiedTag[2].setAllElementsTo(0);
_modifiedTag[3].setAllElementsTo(0);
_modifiedTag[4].setAllElementsTo(0);
_modifiedTag[5].setAllElementsTo(0);
}
@@ -160,6 +167,7 @@ void TextureCubeMap::setImage( Face face, Image* image)
{
dirtyTextureObject();
_images[face] = image;
_modifiedTag[face].setAllElementsTo(0);
}
Image* TextureCubeMap::getImage(Face face)
@@ -211,6 +219,15 @@ void TextureCubeMap::apply(State& state) const
}
else
{
for (int n=0; n<6; n++)
{
osg::Image* image = _images[n].get();
if (image && getModifiedTag((Face)n,contextID) != image->getModifiedTag())
{
applyTexImage2D_subload( faceTarget[n], _images[n].get(), state, _textureWidth, _textureHeight, _numMimpmapLevels);
getModifiedTag((Face)n,contextID) = image->getModifiedTag();
}
}
}
}
@@ -245,6 +262,15 @@ void TextureCubeMap::apply(State& state) const
applyTexImage2D_load( faceTarget[n], _images[n].get(), state, _textureWidth, _textureHeight, _numMimpmapLevels);
}
for (int n=0; n<6; n++)
{
osg::Image* image = _images[n].get();
if (image)
{
applyTexImage2D_load( faceTarget[n], _images[n].get(), state, _textureWidth, _textureHeight, _numMimpmapLevels);
getModifiedTag((Face)n,contextID) = image->getModifiedTag();
}
}
// in theory the following line is redundent, but in practice
// have found that the first frame drawn doesn't apply the textures