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

Fixed crash in handling of osg::Callback attached as Drawable update callback.

Browse Source 
Added handling of osg::Callback as a Drawable cull callback
This commit is contained in:
Robert Osfield 2016-11-23 19:18:14 +00:00
parent 8af48d369c
commit 46df1fd141
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgUtil/UpdateVisitor
View File

@ -55,12 +55,11 @@ class OSGUTIL_EXPORT UpdateVisitor : public osg::NodeVisitor
{
osg::Drawable::UpdateCallback* drawable_callback = dynamic_cast<osg::Drawable::UpdateCallback*>(callback);
osg::NodeCallback* node_callback = dynamic_cast<osg::NodeCallback*>(callback);
osg::CallbackObject* callback_object = dynamic_cast<osg::CallbackObject*>(callback);
if (drawable_callback) drawable_callback->update(this,&drawable);
if (node_callback) (*node_callback)(&drawable, this);
if ((!drawable_callback && !node_callback) || callback_object) callback_object->run(&drawable, this);
if (!drawable_callback && !node_callback) callback->run(&drawable, this);
}
handle_callbacks(drawable.getStateSet());

4
src/osgUtil/CullVisitor.cpp
View File

@ -990,6 +990,10 @@ void CullVisitor::apply(osg::Drawable& drawable)
{
if( dcb->cull( this, &drawable, &_renderInfo ) == true ) return;
}
else
{
drawable.getCullCallback()->run(&drawable,this);
}
}
if (drawable.isCullingActive() && isCulled(bb)) return;