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

Fixed global fade-out. (#867)

Browse Source
This commit is contained in:
Jonathas Costa
2019-05-18 13:17:53 -04:00
committed by Alexander Bock
parent ae5392dbeb
commit 368292aba6
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rendering/framebufferrenderer.cpp
View File

@@ -987,7 +987,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
"FramebufferRenderer::render::deferredTasks"
);
}
performDeferredTasks(tasks.deferredcasterTasks);
performDeferredTasks(tasks.deferredcasterTasks, blackoutFactor);
}
if (tasks.deferredcasterTasks.empty()) {
@@ -1098,7 +1098,9 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
}
void FramebufferRenderer::performDeferredTasks(
const std::vector<DeferredcasterTask>& tasks)
const std::vector<DeferredcasterTask>& tasks,
float blackoutFactor
)
{
bool firstPaint = true;
@@ -1149,6 +1151,9 @@ void FramebufferRenderer::performDeferredTasks(
deferredcastProgram->setUniform("atmExposure", _hdrExposure);
deferredcastProgram->setUniform("backgroundConstant", _hdrBackground);
deferredcastProgram->setUniform("blackoutFactor", blackoutFactor);
deferredcaster->preRaycast(
deferredcasterTask.renderData,
_deferredcastData[deferredcaster],