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

From Wang Rui, "I've fixed some pen-slips in SharedStateManager.cpp, which writing the

Browse Source 
last few examples for my to-be-finished book. I also do a minor fix to
the share() method to make it work for geodes, too."
This commit is contained in:
Robert Osfield 2010-09-15 11:32:51 +00:00
parent df7df0739a
commit 6ac8b63419
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgDB/SharedStateManager.cpp
View File

@ -72,7 +72,7 @@ void SharedStateManager::share(osg::Node *node, OpenThreads::Mutex *mt)
// osg::Timer_t start_tick = timer.tick();
_mutex = mt;
apply(*node);
node->accept(*this);
tmpSharedTextureList.clear();
tmpSharedStateSetList.clear();
_mutex = 0;
@ -252,7 +252,7 @@ void SharedStateManager::process(osg::StateSet* ss, osg::Object* parent)
= StateSetSharePair(ss, false);
}
// Only in this case sharing textures is also required
if (_shareMode & (SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES))
if (_shareMode & (SHARE_DYNAMIC_TEXTURES | SHARE_STATIC_TEXTURES | SHARE_UNSPECIFIED_TEXTURES))
{
shareTextures(ss);
}
@ -267,7 +267,7 @@ void SharedStateManager::process(osg::StateSet* ss, osg::Object* parent)
if(_mutex) _mutex->unlock();
}
}
else if (_shareMode & (SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES | SHARE_UNSPECIFIED_TEXTURES))
else if (_shareMode & (SHARE_DYNAMIC_TEXTURES | SHARE_STATIC_TEXTURES | SHARE_UNSPECIFIED_TEXTURES))
{
shareTextures(ss);
}