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

16
src/osgViewer/Scene.cpp
View File

@@ -19,7 +19,7 @@ using namespace osgViewer;
namespace osgViewer
{
struct SceneSingleton
{
@@ -113,6 +113,20 @@ void Scene::setImagePager(osgDB::ImagePager* ip)
_imagePager = ip;
}
bool Scene::requiresUpdateSceneGraph() const
{
// check if the database pager needs to update the scene
if (getDatabasePager()->requiresUpdateSceneGraph() || getDatabasePager()->getRequestsInProgress()) return true;
// check if the image pager needs to update the scene
if (getImagePager()->requiresUpdateSceneGraph()) return true;
// check if scene graph needs update traversal
if (_sceneData.valid() && (_sceneData->getUpdateCallback() || (_sceneData->getNumChildrenRequiringUpdateTraversal()>0))) return true;
return false;
}
void Scene::updateSceneGraph(osg::NodeVisitor& updateVisitor)
{
if (!_sceneData) return;