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

Compositor: Do not clear buffers by default

Browse Source
This commit is contained in:
Fernando García Liñán 2021-07-26 16:14:58 +02:00
parent 908dc467a8
commit a256110c02
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
simgear/scene/viewer/CompositorPass.cxx
View File

@ -186,8 +186,8 @@ PassBuilder::build(Compositor *compositor, const SGPropertyNode *root,
GLbitfield clear_mask = 0; GLbitfield clear_mask = 0;
std::stringstream mask_ss; std::stringstream mask_ss;
std::string mask_bit; std::string mask_bit;
// Default clear mask as in OSG // Do not clear by default
mask_ss << root->getStringValue("clear-mask", "color depth"); mask_ss << root->getStringValue("clear-mask", "");
while (mask_ss >> mask_bit) { while (mask_ss >> mask_bit) {
if (mask_bit == "color") clear_mask |= GL_COLOR_BUFFER_BIT; if (mask_bit == "color") clear_mask |= GL_COLOR_BUFFER_BIT;
else if (mask_bit == "depth") clear_mask |= GL_DEPTH_BUFFER_BIT; else if (mask_bit == "depth") clear_mask |= GL_DEPTH_BUFFER_BIT;
@ -394,7 +394,7 @@ public:
camera->setViewMatrix(osg::Matrix::identity()); camera->setViewMatrix(osg::Matrix::identity());
camera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1)); camera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1));
// Do not automatically add a depth buffer // Do not automatically add a depth renderbuffer
camera->setImplicitBufferAttachmentMask( camera->setImplicitBufferAttachmentMask(
osg::DisplaySettings::IMPLICIT_COLOR_BUFFER_ATTACHMENT, osg::DisplaySettings::IMPLICIT_COLOR_BUFFER_ATTACHMENT,
osg::DisplaySettings::IMPLICIT_COLOR_BUFFER_ATTACHMENT); osg::DisplaySettings::IMPLICIT_COLOR_BUFFER_ATTACHMENT);
@ -425,13 +425,8 @@ public:
quad->addDrawable(geom); quad->addDrawable(geom);
osg::ref_ptr<osg::StateSet> quad_state = quad->getOrCreateStateSet(); osg::ref_ptr<osg::StateSet> quad_state = quad->getOrCreateStateSet();
int values = osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED; quad_state->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF
quad_state->setAttribute(new osg::PolygonMode( | osg::StateAttribute::PROTECTED);
osg::PolygonMode::FRONT_AND_BACK,
osg::PolygonMode::FILL),
values);
quad_state->setMode(GL_LIGHTING, values);
quad_state->setMode(GL_DEPTH_TEST, values);
osg::StateSet *ss = camera->getOrCreateStateSet(); osg::StateSet *ss = camera->getOrCreateStateSet();
for (const auto &uniform : compositor->getUniforms()) for (const auto &uniform : compositor->getUniforms())