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

Changed the RenderStageCache::RenderStageMap to use map<Referenced*, ref_ptr<RenderStage>> in place of map<CullVisitor*, ref_ptr<RenderStage>> to

Browse Source 
avoid problems of dynamic_cast<> on an object that is being deleted.
This commit is contained in:
Robert Osfield 2016-05-27 09:47:07 +01:00
parent 110cf56a17
commit 31592d206b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgUtil/CullVisitor.cpp
View File

@ -1368,7 +1368,7 @@ class RenderStageCache : public osg::Object, public osg::Observer
{
public:
typedef std::map<CullVisitor*, osg::ref_ptr<RenderStage> > RenderStageMap;
typedef std::map<osg::Referenced*, osg::ref_ptr<RenderStage> > RenderStageMap;
RenderStageCache() {}
RenderStageCache(const RenderStageCache&, const osg::CopyOp&) {}
@ -1387,18 +1387,17 @@ class RenderStageCache : public osg::Object, public osg::Observer
virtual void objectDeleted(void* object)
{
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);
RenderStageMap::iterator itr = _renderStageMap.find(ref);
if (itr!=_renderStageMap.end())
{
_renderStageMap.erase(itr);
}
}
void setRenderStage(CullVisitor* cv, RenderStage* rs)
void setRenderStage(osg::Referenced* cv, RenderStage* rs)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
RenderStageMap::iterator itr = _renderStageMap.find(cv);
@ -1414,7 +1413,7 @@ class RenderStageCache : public osg::Object, public osg::Observer
}
RenderStage* getRenderStage(osgUtil::CullVisitor* cv)
RenderStage* getRenderStage(osg::Referenced* cv)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
RenderStageMap::iterator itr = _renderStageMap.find(cv);