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

Moved the scene related requiresUpdateSceneGraph() implementation details from View into Scene.

Browse Source 
Added check against the ImagePager.
This commit is contained in:
Robert Osfield
2016-06-29 15:34:11 +01:00
parent 48c1d0e8da
commit 990c04d4b9
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgViewer/View.cpp
View File

@@ -1132,17 +1132,11 @@ void View::removeDevice(osgGA::Device* eventSource)
bool View::requiresUpdateSceneGraph() const
{
// check if the database pager needs to update the scene
if (getDatabasePager()->requiresUpdateSceneGraph() || getDatabasePager()->getRequestsInProgress()) return true;
// check if there are camera update callbacks
if (_camera->getUpdateCallback()) return true;
// check if there are node update callbacks
if (getSceneData() != 0)
{
if (getSceneData()->getUpdateCallback() || (getSceneData()->getNumChildrenRequiringUpdateTraversal()>0)) return true;
}
// check if there scene requires an update traversal
if (_scene.valid() && _scene->requiresUpdateSceneGraph()) return true;
return false;
}