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

Changed osgUtil::RenderBin and osg::State to allow nesting of StateSet's associated with RenderBin's.

Browse Source
This commit is contained in:
Robert Osfield
2007-01-27 11:13:01 +00:00
parent 8625598e00
commit 36330f7e40
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgUtil/RenderBin.cpp
View File

@@ -367,11 +367,13 @@ void RenderBin::drawImplementation(osg::RenderInfo& renderInfo,RenderLeaf*& prev
// osg::notify(osg::NOTICE)<<"begin RenderBin::drawImplementation "<<className()<<" sortMode "<<getSortMode()<<std::endl;
if (_stateset.valid())
unsigned int stateSetStackSize = state.getStateSetStackSize();
previous = 0;
if (_stateset.valid())
{
// first need to flush the stack
previous = 0;
state.popAllStateSets();
// now its safe to push RenderBin's StateSet as we now know its the root.
state.pushStateSet(_stateset.get());
@@ -424,10 +426,16 @@ void RenderBin::drawImplementation(osg::RenderInfo& renderInfo,RenderLeaf*& prev
rbitr->second->draw(renderInfo,previous);
}
if (stateSetStackSize!=state.getStateSetStackSize())
{
state.popStateSetStackToSize(stateSetStackSize);
}
previous = 0;
if (_stateset.valid())
{
state.popAllStateSets();
previous = 0;
}
//osg::notify(osg::NOTICE)<<"end RenderBin::drawImplementation "<<className()<<std::endl;