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

TextureAtlasVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode

Browse Source
This commit is contained in:
scrawl
2017-01-20 21:25:32 +01:00
parent dc2689f779
commit 764b2f60c6
2 changed files with 14 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgUtil/Optimizer
View File

@@ -814,8 +814,7 @@ class OSGUTIL_EXPORT Optimizer
virtual void reset();
virtual void apply(osg::Node& node);
virtual void apply(osg::Geode& geode);
virtual void apply(osg::Drawable& node);
void optimize();

51
src/osgUtil/Optimizer.cpp
View File

@@ -4093,56 +4093,31 @@ void Optimizer::TextureAtlasVisitor::apply(osg::Node& node)
if (pushedStateState) popStateSet();
}
void Optimizer::TextureAtlasVisitor::apply(osg::Geode& geode)
void Optimizer::TextureAtlasVisitor::apply(osg::Drawable& node)
{
if (!isOperationPermissibleForObject(&geode)) return;
osg::StateSet* ss = geode.getStateSet();
bool pushedGeodeStateState = false;
bool pushedStateState = false;
osg::StateSet* ss = node.getStateSet();
if (ss && ss->getDataVariance()==osg::Object::STATIC)
{
if (isOperationPermissibleForObject(ss))
if (isOperationPermissibleForObject(&node) &&
isOperationPermissibleForObject(ss))
{
pushedGeodeStateState = pushStateSet(ss);
pushedStateState = pushStateSet(ss);
}
}
for(unsigned int i=0;i<geode.getNumDrawables();++i)
if (!_statesetStack.empty())
{
osg::Drawable* drawable = geode.getDrawable(i);
if (drawable)
for(StateSetStack::iterator ssitr = _statesetStack.begin();
ssitr != _statesetStack.end();
++ssitr)
{
bool pushedDrawableStateState = false;
ss = drawable->getStateSet();
if (ss && ss->getDataVariance()==osg::Object::STATIC)
{
if (isOperationPermissibleForObject(drawable) &&
isOperationPermissibleForObject(ss))
{
pushedDrawableStateState = pushStateSet(ss);
}
}
if (!_statesetStack.empty())
{
for(StateSetStack::iterator ssitr = _statesetStack.begin();
ssitr != _statesetStack.end();
++ssitr)
{
_statesetMap[*ssitr].insert(drawable);
}
}
if (pushedDrawableStateState) popStateSet();
_statesetMap[*ssitr].insert(&node);
}
}
if (pushedGeodeStateState) popStateSet();
if (pushedStateState) popStateSet();
}
void Optimizer::TextureAtlasVisitor::optimize()