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

Fixed TextureAtlasVisitor bug where repeating textures were incorrectly assigned as non repeating.

Browse Source
This commit is contained in:
Robert Osfield
2006-08-31 15:39:23 +00:00
parent 8aa58c986c
commit d92fdafd53
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgUtil/Optimizer.cpp
View File

@@ -3798,7 +3798,6 @@ void Optimizer::TextureAtlasVisitor::optimize()
return;
}
Textures alreadyCheckedForRepeat;
Textures texturesThatRepeat;
Textures texturesThatRepeatAndAreOutOfRange;
@@ -3814,10 +3813,8 @@ void Optimizer::TextureAtlasVisitor::optimize()
for(unsigned int unit=0; unit<tal.size(); ++unit)
{
osg::Texture2D* texture = dynamic_cast<osg::Texture2D*>(stateset->getTextureAttribute(unit,osg::StateAttribute::TEXTURE));
if (texture && alreadyCheckedForRepeat.count(texture)==0)
if (texture)
{
alreadyCheckedForRepeat.insert(texture);
bool s_repeat = texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::REPEAT ||
texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::MIRROR;
@@ -3899,7 +3896,6 @@ void Optimizer::TextureAtlasVisitor::optimize()
++titr)
{
osg::Texture2D* texture = *titr;
alreadyCheckedForRepeat.insert(texture);
bool s_repeat = texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::REPEAT ||
texture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::MIRROR;