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

Implemented StateGraph reuse in in scene graph Canera's RenderStage.

Browse Source
This commit is contained in:
Robert Osfield 2018-05-23 14:30:31 +01:00
parent a6ef1cd66b
commit 189e4e3a64
2 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgUtil/CullVisitor
View File

@ -466,7 +466,7 @@ inline RenderLeaf* CullVisitor::createOrReuseRenderLeaf(osg::Drawable* drawable,
while (_currentReuseRenderLeafIndex<_reuseRenderLeafList.size() && while (_currentReuseRenderLeafIndex<_reuseRenderLeafList.size() &&
_reuseRenderLeafList[_currentReuseRenderLeafIndex]->referenceCount()>1) _reuseRenderLeafList[_currentReuseRenderLeafIndex]->referenceCount()>1)
{ {
osg::notify(osg::NOTICE)<<"Warning:createOrReuseRenderLeaf() skipping multiply referenced entry."<< std::endl; osg::notify(osg::INFO)<<"CullVisitor:createOrReuseRenderLeaf() skipping multiply referenced entry. _reuseRenderLeafList.size()="<< _reuseRenderLeafList.size()<<" _reuseRenderLeafList["<<_currentReuseRenderLeafIndex<<"]->referenceCount()="<<_reuseRenderLeafList[_currentReuseRenderLeafIndex]->referenceCount()<<std::endl;
++_currentReuseRenderLeafIndex; ++_currentReuseRenderLeafIndex;
} }
@ -478,15 +478,15 @@ inline RenderLeaf* CullVisitor::createOrReuseRenderLeaf(osg::Drawable* drawable,
return renderleaf; return renderleaf;
} }
// Otherwise need to create new renderleaf. // Otherwise need to create new renderleaf.
RenderLeaf* renderleaf = new RenderLeaf(drawable,projection,matrix,depth,_traversalOrderNumber++); RenderLeaf* renderleaf = new RenderLeaf(drawable,projection,matrix,depth,_traversalOrderNumber++);
_reuseRenderLeafList.push_back(renderleaf); _reuseRenderLeafList.push_back(renderleaf);
++_currentReuseRenderLeafIndex; ++_currentReuseRenderLeafIndex;
return renderleaf; return renderleaf;
} }
} }
#endif #endif

74
src/osgUtil/CullVisitor.cpp
View File

@ -1569,36 +1569,6 @@ void CullVisitor::apply(osg::Camera& camera)
} }
else else
{ {
// cache the StateGraph and replace with a clone of the existing parental chain.
osg::ref_ptr<StateGraph> previous_rootStateGraph = _rootStateGraph;
StateGraph* previous_currentStateGraph = _currentStateGraph;
{
// replicate the StageGraph parental chain so that state graph and render leaves are kept local to the Camera's RenderStage.
typedef std::vector< osg::ref_ptr<StateGraph> > StageGraphStack;
StageGraphStack stateGraphParentalChain;
StateGraph* sg = _currentStateGraph;
while(sg)
{
stateGraphParentalChain.push_back(sg);
sg = sg->_parent;
}
StageGraphStack::reverse_iterator ritr = stateGraphParentalChain.rbegin();
if (ritr!=stateGraphParentalChain.rend())
{
const osg::StateSet* ss = (*ritr++)->getStateSet();
_rootStateGraph = ss ? new StateGraph(0, ss) : new StateGraph();
_currentStateGraph = _rootStateGraph.get();
while(ritr != stateGraphParentalChain.rend())
{
_currentStateGraph = _currentStateGraph->find_or_insert((*ritr++)->getStateSet());
}
}
}
// set up lighting. // set up lighting.
// currently ignore lights in the scene graph itself.. // currently ignore lights in the scene graph itself..
// will do later. // will do later.
@ -1649,8 +1619,49 @@ void CullVisitor::apply(osg::Camera& camera)
rtts->reset(); rtts->reset();
} }
// cache the StateGraph and replace with a clone of the existing parental chain.
osg::ref_ptr<StateGraph> previous_rootStateGraph = _rootStateGraph;
StateGraph* previous_currentStateGraph = _currentStateGraph;
// replicate the StageGraph parental chain so that state graph and render leaves are kept local to the Camera's RenderStage.
{
typedef std::vector< osg::ref_ptr<StateGraph> > StageGraphStack;
StageGraphStack stateGraphParentalChain;
StateGraph* sg = _currentStateGraph;
while(sg)
{
stateGraphParentalChain.push_back(sg);
sg = sg->_parent;
}
_rootStateGraph = rtts->getStateGraph();
if (_rootStateGraph)
{
_rootStateGraph->clean();
}
else
{
_rootStateGraph = new StateGraph;
// assign the state graph to the RenderStage to ensure it remains in memory for the draw traversal. // assign the state graph to the RenderStage to ensure it remains in memory for the draw traversal.
rtts->setStateGraph(_rootStateGraph); rtts->setStateGraph(_rootStateGraph.get());
}
_currentStateGraph = _rootStateGraph.get();
StageGraphStack::reverse_iterator ritr = stateGraphParentalChain.rbegin();
if (ritr!=stateGraphParentalChain.rend())
{
const osg::StateSet* ss = (*ritr++)->getStateSet();
_rootStateGraph->setStateSet(ss);
while(ritr != stateGraphParentalChain.rend())
{
_currentStateGraph = _currentStateGraph->find_or_insert((*ritr++)->getStateSet());
}
}
}
// set up clear masks/values // set up clear masks/values
rtts->setClearDepth(camera.getClearDepth()); rtts->setClearDepth(camera.getClearDepth());
@ -1701,6 +1712,7 @@ void CullVisitor::apply(osg::Camera& camera)
// restore cache of the StateGraph // restore cache of the StateGraph
_rootStateGraph->prune();
_rootStateGraph = previous_rootStateGraph; _rootStateGraph = previous_rootStateGraph;
_currentStateGraph = previous_currentStateGraph; _currentStateGraph = previous_currentStateGraph;