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

Moved _stateset = new StateSet instances to setStateSet(new StateSet) to make

Browse Source 
sure the wiring up of the StateSet parents is done consistently
This commit is contained in:
Robert Osfield
2008-08-25 10:20:20 +00:00
parent 8d8852bc23
commit ff35465a33
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/StateSet.cpp
View File

@@ -1714,15 +1714,20 @@ void StateSet::setEventCallback(Callback* ac)
_eventCallback = ac;
osg::notify(osg::NOTICE)<<"StateSet::setEventCallback("<<ac<<")"<<std::endl;
if (delta!=0 && _numChildrenRequiringEventTraversal==0)
{
for(ParentList::iterator itr=_parents.begin();
itr!=_parents.end();
++itr)
{
osg::notify(osg::NOTICE)<<" updating parent("<<*itr<<")"<<std::endl;
osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(*itr);
if (drawable)
{
osg::notify(osg::NOTICE)<<" parent is a drawable("<<*itr<<")"<<std::endl;
//drawable->setNumChildrenRequiringUpdateTraversal(drawable->getNumChildrenRequiringUpdateTraversal()+delta);
}
else
@@ -1730,6 +1735,7 @@ void StateSet::setEventCallback(Callback* ac)
osg::Node* node = dynamic_cast<osg::Node*>(*itr);
if (node)
{
osg::notify(osg::NOTICE)<<" parent is a node("<<*itr<<")"<<std::endl;
node->setNumChildrenRequiringEventTraversal(node->getNumChildrenRequiringEventTraversal()+delta);
}
}