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

Fixed texture optimization problem associated with mixing already compiled scene graphs - resulting

Browse Source 
in incorrect texture assignment.  Solution was to a compareTextureObjects() test to the Texture*::compare(..) method that
the osgUtil::Optimizer::StateSetVisitor uses to determine uniqueness.
This commit is contained in:
Robert Osfield
2006-08-14 19:42:22 +00:00
parent fb27b27e5e
commit be60b32add
7 changed files with 73 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osg/TextureCubeMap.cpp
View File

@@ -76,8 +76,12 @@ int TextureCubeMap::compare(const StateAttribute& sa) const
// used by the COMPARE_StateAttribute_Paramter macro's below.
COMPARE_StateAttribute_Types(TextureCubeMap,sa)
bool noImages = true;
for (int n=0; n<6; n++)
{
if (noImages && _images[n].valid()) noImages = false;
if (noImages && rhs._images[n].valid()) noImages = false;
if (_images[n]!=rhs._images[n]) // smart pointer comparison.
{
if (_images[n].valid())
@@ -99,6 +103,17 @@ int TextureCubeMap::compare(const StateAttribute& sa) const
}
}
if (noImages)
{
// no image attached to either Texture2D
// but could these textures already be downloaded?
// check the _textureObjectBuffer to see if they have been
// downloaded
int result = compareTextureObjects(rhs);
if (result!=0) return result;
}
int result = compareTexture(rhs);
if (result!=0) return result;