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

Added save and restoring of the cull mask to Camera handling code

Browse Source
This commit is contained in:
Robert Osfield
2007-08-02 08:50:39 +00:00
parent cc6740176f
commit 1b36cfc928
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgUtil/CullVisitor.cpp
View File

@@ -1124,13 +1124,10 @@ void CullVisitor::apply(osg::Camera& camera)
// activate all active cull settings from this Camera
inheritCullSettings(camera);
bool hasSetCullMask =
(camera.getInheritanceMask() & osg::CullSettings::CULL_MASK) == 0;
if (hasSetCullMask)
{
setTraversalMask(camera.getCullMask());
}
// set the cull mask.
unsigned int savedTraversalMask = getTraversalMask();
bool mustSetCullMask = (camera.getInheritanceMask() & osg::CullSettings::CULL_MASK) == 0;
if (mustSetCullMask) setTraversalMask(camera.getCullMask());
RefMatrix& originalModelView = *getModelViewMatrix();
@@ -1190,11 +1187,11 @@ void CullVisitor::apply(osg::Camera& camera)
// use render to texture stage.
// create the render to texture stage.
osg::ref_ptr<osgUtil::RenderStageCache> rsCache = dynamic_cast<osgUtil::RenderStageCache*>(camera.getRenderer());
osg::ref_ptr<osgUtil::RenderStageCache> rsCache = dynamic_cast<osgUtil::RenderStageCache*>(camera.getRenderingCache());
if (!rsCache)
{
rsCache = new osgUtil::RenderStageCache;
camera.setRenderer(rsCache.get());
camera.setRenderingCache(rsCache.get());
}
osg::ref_ptr<osgUtil::RenderStage> rtts = rsCache->getRenderStage(this);
@@ -1317,6 +1314,9 @@ void CullVisitor::apply(osg::Camera& camera)
if (camera.getViewport()) popViewport();
// restore the previous traversal mask settings
if (mustSetCullMask) setTraversalMask(savedTraversalMask);
// restore the previous cull settings
setCullSettings(saved_cull_settings);