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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgViewer/Scene
View File

@ -45,7 +45,9 @@ class OSGVIEWER_EXPORT Scene : public osg::Referenced
osgDB::ImagePager* getImagePager() { return _imagePager.get(); }
const osgDB::ImagePager* getImagePager() const { return _imagePager.get(); }
void updateSceneGraph(osg::NodeVisitor& updateVisitor);
virtual bool requiresUpdateSceneGraph() const;
virtual void updateSceneGraph(osg::NodeVisitor& updateVisitor);
/** Get the Scene object that has the specified node assigned to it.

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;

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;
}