Futher work on adding event and update callbacks to StateSet, Uniform and StateAttributes

src/osg/Drawable.cpp

@@ -312,14 +312,53 @@ void Drawable::setStateSet(osg::StateSet* stateset)
     // do nothing if nothing changed.
     if (_stateset==stateset) return;
     
+    // track whether we need to account for the need to do a update or event traversal.
+    int delta_update = 0;
+    int delta_event = 0;
+
     // remove this node from the current statesets parent list 
-    if (_stateset.valid()) _stateset->removeParent(this);
+    if (_stateset.valid())
+    {
+        _stateset->removeParent(this);
+        if (_stateset->requiresUpdateTraversal()) --delta_update;
+        if (_stateset->requiresEventTraversal()) --delta_event;
+    }
     
     // set the stateset.
     _stateset = stateset;
     
     // add this node to the new stateset to the parent list.
-    if (_stateset.valid()) _stateset->addParent(this);
+    if (_stateset.valid())
+    {
+        _stateset->addParent(this);
+        if (_stateset->requiresUpdateTraversal()) ++delta_update;
+        if (_stateset->requiresEventTraversal()) ++delta_event;
+    }
+    
+
+    // only inform parents if change occurs and drawable doesn't already have an update callback
+    if (delta_update!=0 && !_updateCallback)
+    {
+        for(ParentList::iterator itr=_parents.begin();
+            itr!=_parents.end();
+            ++itr)
+        {
+            (*itr)->setNumChildrenRequiringUpdateTraversal((*itr)->getNumChildrenRequiringUpdateTraversal()+delta_update);
+        }
+    }
+
+    // only inform parents if change occurs and drawable doesn't already have an event callback
+    if (delta_event!=0 && !_eventCallback)
+    {
+        for(ParentList::iterator itr=_parents.begin();
+            itr!=_parents.end();
+            ++itr)
+        {
+            (*itr)->setNumChildrenRequiringEventTraversal((*itr)->getNumChildrenRequiringEventTraversal()+delta_event);
+        }
+    }
+
+
 }
 
 osg::StateSet* Drawable::getOrCreateStateSet()
@@ -502,7 +541,7 @@ void Drawable::setUpdateCallback(UpdateCallback* ac)
 
     _updateCallback = ac;
     
-    if (delta!=0)
+    if (delta!=0 && !(_stateset.valid() && _stateset->requiresUpdateTraversal()))
     {
         for(ParentList::iterator itr=_parents.begin();
             itr!=_parents.end();
@@ -523,7 +562,7 @@ void Drawable::setEventCallback(EventCallback* ac)
 
     _eventCallback = ac;
     
-    if (delta!=0)
+    if (delta!=0 && !(_stateset.valid() && _stateset->requiresEventTraversal()))
     {
         for(ParentList::iterator itr=_parents.begin();
             itr!=_parents.end();

src/osg/Node.cpp

@@ -91,14 +91,38 @@ void Node::setStateSet(osg::StateSet* stateset)
     // do nothing if nothing changed.
     if (_stateset==stateset) return;
     
+    // track whether we need to account for the need to do a update or event traversal.
+    int delta_update = 0;
+    int delta_event = 0;
+
     // remove this node from the current statesets parent list 
-    if (_stateset.valid()) _stateset->removeParent(this);
+    if (_stateset.valid())
+    {
+        _stateset->removeParent(this);
+        if (_stateset->requiresUpdateTraversal()) --delta_update;
+        if (_stateset->requiresEventTraversal()) --delta_event;
+    }
     
     // set the stateset.
     _stateset = stateset;
     
     // add this node to the new stateset to the parent list.
-    if (_stateset.valid()) _stateset->addParent(this);
+    if (_stateset.valid())
+    {
+        _stateset->addParent(this);
+        if (_stateset->requiresUpdateTraversal()) ++delta_update;
+        if (_stateset->requiresEventTraversal()) ++delta_event;
+    }
+    
+    if (delta_update!=0)
+    {
+        setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+delta_update);
+    }
+
+    if (delta_event!=0)
+    {
+        setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()+delta_event);
+    }
 }
 
 osg::StateSet* Node::getOrCreateStateSet()
@@ -113,7 +137,7 @@ void Node::setUpdateCallback(NodeCallback* nc)
     // if no changes just return.
     if (_updateCallback==nc) return;
     
-    // app callback has been changed, will need to update
+    // updated callback has been changed, will need to update
     // both _updateCallback and possibly the numChildrenRequiringAppTraversal
     // if the number of callbacks changes.
 
@@ -191,7 +215,7 @@ void Node::setEventCallback(NodeCallback* nc)
     // if no changes just return.
     if (_eventCallback==nc) return;
     
-    // app callback has been changed, will need to Event
+    // event callback has been changed, will need to Event
     // both _EventCallback and possibly the numChildrenRequiringAppTraversal
     // if the number of callbacks changes.
 

src/osg/StateSet.cpp

@@ -73,6 +73,9 @@ StateSet::StateSet()
 
     _renderingHint = DEFAULT_BIN;
     
+    _numChildrenRequiringUpdateTraversal = 0;
+    _numChildrenRequiringEventTraversal = 0;
+
     setRenderBinToInherit();
 }
 
@@ -141,6 +144,10 @@ StateSet::StateSet(const StateSet& rhs,const CopyOp& copyop):Object(rhs,copyop)
     _binMode = rhs._binMode;
     _binNum = rhs._binNum;
     _binName = rhs._binName;
+
+    _numChildrenRequiringUpdateTraversal = rhs._numChildrenRequiringUpdateTraversal;
+    _numChildrenRequiringEventTraversal = rhs._numChildrenRequiringEventTraversal;
+
 }
 
 StateSet::~StateSet()
@@ -1243,6 +1250,47 @@ void StateSet::setUpdateCallback(Callback* ac)
     }
 }
 
+void StateSet::runUpdateCallbacks(osg::NodeVisitor* nv)
+{
+    if (_updateCallback.valid()) (*_updateCallback)(this,nv);
+
+    if (_numChildrenRequiringUpdateTraversal!=0)
+    {
+        // run attribute callbacks
+        for(AttributeList::iterator itr=_attributeList.begin();
+            itr!=_attributeList.end();
+            ++itr)
+        {
+            StateAttribute::Callback* callback = itr->second.first->getUpdateCallback();
+            if (callback) (*callback)(itr->second.first.get(),nv);
+        }
+
+
+        // run texture attribute callbacks.
+        for(unsigned int i=0;i<_textureAttributeList.size();++i)
+        {
+            AttributeList& attributeList = _textureAttributeList[i];
+            for(AttributeList::iterator itr=attributeList.begin();
+                itr!=attributeList.end();
+                ++itr)
+            {
+                StateAttribute::Callback* callback = itr->second.first->getUpdateCallback();
+                if (callback) (*callback)(itr->second.first.get(),nv);
+            }
+        }
+
+
+        // run uniform callbacks.
+        for(UniformList::iterator uitr = _uniformList.begin();
+            uitr != _uniformList.end();
+            ++uitr)
+        {
+            Uniform::Callback* callback = uitr->second.first->getUpdateCallback();
+            if (callback) (*callback)(uitr->second.first.get(),nv);
+        }
+    }
+}
+
 void StateSet::setEventCallback(Callback* ac)
 {
     if (_eventCallback==ac) return;
@@ -1265,3 +1313,44 @@ void StateSet::setEventCallback(Callback* ac)
 #endif
     }
 }
+
+void StateSet::runEventCallbacks(osg::NodeVisitor* nv)
+{
+    if (_eventCallback.valid()) (*_eventCallback)(this,nv);
+
+    if (_numChildrenRequiringEventTraversal!=0)
+    {
+        // run attribute callbacks
+        for(AttributeList::iterator itr=_attributeList.begin();
+            itr!=_attributeList.end();
+            ++itr)
+        {
+            StateAttribute::Callback* callback = itr->second.first->getEventCallback();
+            if (callback) (*callback)(itr->second.first.get(),nv);
+        }
+
+
+        // run texture attribute callbacks.
+        for(unsigned int i=0;i<_textureAttributeList.size();++i)
+        {
+            AttributeList& attributeList = _textureAttributeList[i];
+            for(AttributeList::iterator itr=attributeList.begin();
+                itr!=attributeList.end();
+                ++itr)
+            {
+                StateAttribute::Callback* callback = itr->second.first->getEventCallback();
+                if (callback) (*callback)(itr->second.first.get(),nv);
+            }
+        }
+
+
+        // run uniform callbacks.
+        for(UniformList::iterator uitr = _uniformList.begin();
+            uitr != _uniformList.end();
+            ++uitr)
+        {
+            Uniform::Callback* callback = uitr->second.first->getEventCallback();
+            if (callback) (*callback)(uitr->second.first.get(),nv);
+        }
+    }
+}