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

Added mutex locking add addParents/removeParents in Drawable, Node and StateSet.

Browse Source
This commit is contained in:
Robert Osfield
2007-08-31 20:14:36 +00:00
parent 1bc6d0bae4
commit 86e998f64c
4 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/osg/Node.cpp
View File

@@ -95,13 +95,32 @@ Node::~Node()
void Node::addParent(osg::Group* node)
{
_parents.push_back(node);
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
_parents.push_back(node);
}
else
{
_parents.push_back(node);
}
}
void Node::removeParent(osg::Group* node)
{
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
if (getRefMutex())
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getRefMutex());
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
else
{
ParentList::iterator pitr = std::find(_parents.begin(),_parents.end(),node);
if (pitr!=_parents.end()) _parents.erase(pitr);
}
}
void Node::accept(NodeVisitor& nv)