fly/flightgear
1
0
Fork 0
Code Activity

Compositor: Removed the option to change the CameraGroup cull masks. Instead, the FGRenderer sets the view master camera cull mask, which may be inherited by any pass that needs it.

Browse source
This commit is contained in:
Fernando García Liñán 2019-02-23 23:29:12 +01:00
parent 8e35b7efc7
commit ed276141c7
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Viewer/CameraGroup_compositor.cxx
View file

@ -802,12 +802,6 @@ CameraGroup* CameraGroup::buildCameraGroup(osgViewer::Viewer* viewer,
return cgroup;
}
void CameraGroup::setCameraCullMasks(Node::NodeMask nm)
{
for (const auto &info : _cameras)
info->compositor->setCameraCullMasks(nm);
}
void CameraGroup::resized()
{
for (const auto &info : _cameras)

5
src/Viewer/CameraGroup_compositor.hxx
View file

@ -111,7 +111,7 @@ struct CameraInfo : public osg::Referenced
* so they can avoid recalculating them.
*/
osg::Matrix viewMatrix, projMatrix;
/** The Compositor used to manage the pipeline of this camera
/** The Compositor used to manage the pipeline of this camera.
*/
osg::ref_ptr<simgear::compositor::Compositor> compositor;
};
@ -170,9 +170,6 @@ public:
* current viewport.
*/
void setCameraParameters(float vfov, float aspectRatio);
/** Set the cull mask on all non-GUI cameras
*/
void setCameraCullMasks(osg::Node::NodeMask nm);
/** Update camera properties after a resize event.
*/
void resized();

4
src/Viewer/renderer_compositor.cxx
View file

@ -730,7 +730,9 @@ FGRenderer::update( ) {
->getLightNodeMask(_updateVisitor.get());
if (_panel_hotspots->getBoolValue())
cullMask |= simgear::PICK_BIT;
CameraGroup::getDefault()->setCameraCullMasks(cullMask);
camera->setCullMask(cullMask);
camera->setCullMaskLeft(cullMask);
camera->setCullMaskRight(cullMask);
}
void