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

Fixed RenderStageCache's handling of Observer functionality that was causing a crashing on exit in osgoit and osgprerender examples.

Browse Source
This commit is contained in:
Robert Osfield 2016-05-24 20:46:44 +01:00
parent 933b8cdbaf
commit 7bcc5d861e
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/osgUtil/CullVisitor.cpp
View File

@ -1368,6 +1368,8 @@ class RenderStageCache : public osg::Object, public osg::Observer
{
public:
typedef std::map<CullVisitor*, osg::ref_ptr<RenderStage> > RenderStageMap;
RenderStageCache() {}
RenderStageCache(const RenderStageCache&, const osg::CopyOp&) {}
virtual ~RenderStageCache()
@ -1386,28 +1388,46 @@ class RenderStageCache : public osg::Object, public osg::Observer
{
osg::Referenced* ref = reinterpret_cast<osg::Referenced*>(object);
osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(ref);
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
RenderStageMap::iterator itr = _renderStageMap.find(cv);
if (itr!=_renderStageMap.end())
{
_renderStageMap.erase(cv);
_renderStageMap.erase(itr);
}
}
void setRenderStage(CullVisitor* cv, RenderStage* rs)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
_renderStageMap[cv] = rs;
cv->addObserver(this);
RenderStageMap::iterator itr = _renderStageMap.find(cv);
if (itr==_renderStageMap.end())
{
_renderStageMap[cv] = rs;
cv->addObserver(this);
}
else
{
itr->second = rs;
}
}
RenderStage* getRenderStage(osgUtil::CullVisitor* cv)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return _renderStageMap[cv].get();
RenderStageMap::iterator itr = _renderStageMap.find(cv);
if (itr!=_renderStageMap.end())
{
return itr->second.get();
}
else
{
return 0;
}
}
typedef std::map<CullVisitor*, osg::ref_ptr<RenderStage> > RenderStageMap;
/** Resize any per context GLObject buffers to specified size. */
virtual void resizeGLObjectBuffers(unsigned int maxSize)