mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 01:41:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/FastVolume

Browse Source
This commit is contained in:
Jonathas Costa
2019-11-10 14:50:59 -05:00
parent 0fce6a8d26 c3510948fd
commit 9aba885b15
25 changed files with 461 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rendering/framebufferrenderer.cpp
View File

@@ -439,10 +439,16 @@ void FramebufferRenderer::applyTMO(float blackoutFactor) {
_hdrFilteringProgram->setUniform(_hdrUniformCache.Saturation, _saturation);
_hdrFilteringProgram->setUniform(_hdrUniformCache.Value, _value);
glDepthMask(false);
glDisable(GL_DEPTH_TEST);
glBindVertexArray(_screenQuad);
glDrawArrays(GL_TRIANGLES, 0, 6);
glBindVertexArray(0);
glDepthMask(true);
glEnable(GL_DEPTH_TEST);
_hdrFilteringProgram->deactivate();
}
@@ -473,10 +479,16 @@ void FramebufferRenderer::applyFXAA() {
glm::vec2 inverseScreenSize(1.f/_resolution.x, 1.f/_resolution.y);
_fxaaProgram->setUniform(_fxaaUniformCache.inverseScreenSize, inverseScreenSize);
glDepthMask(false);
glDisable(GL_DEPTH_TEST);
glBindVertexArray(_screenQuad);
glDrawArrays(GL_TRIANGLES, 0, 6);
glBindVertexArray(0);
glDepthMask(true);
glEnable(GL_DEPTH_TEST);
_fxaaProgram->deactivate();
}
@@ -760,7 +772,7 @@ void FramebufferRenderer::updateResolution() {
_resolution.y,
0,
GL_RGBA,
GL_BYTE,
GL_UNSIGNED_BYTE,
nullptr
);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -1049,7 +1061,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
if (doPerformanceMeasurements) {
perfInternal = std::make_unique<performance::PerformanceMeasurement>(
"FramebufferRenderer::render::deferredTasks"
);
);
}
performDeferredTasks(tasks.deferredcasterTasks);
}
@@ -1067,6 +1079,8 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
if (_enableFXAA) {
glBindFramebuffer(GL_FRAMEBUFFER, _fxaaBuffers.fxaaFramebuffer);
glDrawBuffers(1, ColorAttachment0Array);
glDisable(GL_BLEND);
}
else {
// When applying the TMO, the result is saved to the default FBO to be displayed