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

From Vladimir Chebeav, fix for removal of nested callbacks

Browse Source
This commit is contained in:
Robert Osfield 2013-10-18 08:37:18 +00:00
parent 5bfb2ef26d
commit 9146ba7d44
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/osg/Node
View File

@ -201,7 +201,11 @@ class OSG_EXPORT Node : public Object
/** Convenience method that removes a given callback from a node, even if that callback is nested. There is no error return in case the given callback is not found. */
inline void removeUpdateCallback(NodeCallback* nc) {
if (nc != NULL && _updateCallback.valid()) {
if (_updateCallback == nc) setUpdateCallback(nc->getNestedCallback()); // replace the callback by the nested one
if (_updateCallback == nc)
{
setUpdateCallback(nc->getNestedCallback()); // replace the callback by the nested one
nc->setNestedCallback(0);
}
else _updateCallback->removeNestedCallback(nc);
}
}
@ -231,7 +235,11 @@ class OSG_EXPORT Node : public Object
/** Convenience method that removes a given callback from a node, even if that callback is nested. There is no error return in case the given callback is not found. */
inline void removeEventCallback(NodeCallback* nc) {
if (nc != NULL && _eventCallback.valid()) {
if (_eventCallback == nc) setEventCallback(nc->getNestedCallback()); // replace the callback by the nested one
if (_eventCallback == nc)
{
setEventCallback(nc->getNestedCallback()); // replace the callback by the nested one
nc->setNestedCallback(0);
}
else _eventCallback->removeNestedCallback(nc);
}
}
@ -261,7 +269,11 @@ class OSG_EXPORT Node : public Object
/** Convenience method that removes a given callback from a node, even if that callback is nested. There is no error return in case the given callback is not found. */
inline void removeCullCallback(NodeCallback* nc) {
if (nc != NULL && _cullCallback.valid()) {
if (_cullCallback == nc) setCullCallback(nc->getNestedCallback()); // replace the callback by the nested one
if (_cullCallback == nc)
{
setCullCallback(nc->getNestedCallback()); // replace the callback by the nested one
nc->setNestedCallback(0);
}
else _cullCallback->removeNestedCallback(nc);
}
}