mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 17:51:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged master. It broke the bloom filter.

Browse Source
This commit is contained in:
Jonathas Costa
2019-06-19 20:47:37 -04:00
parent 5fc11c9df2 a75bb5a5ae
commit 6b5ce52173
1393 changed files with 16974 additions and 11009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rendering/framebufferrenderer.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2018 *
* Copyright (c) 2014-2019 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -1638,7 +1638,6 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
RenderData data = {
*camera,
psc(),
std::move(time),
doPerformanceMeasurements,
0,
@@ -1678,7 +1677,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
"FramebufferRenderer::render::deferredTasks"
);
}
performDeferredTasks(tasks.deferredcasterTasks);
performDeferredTasks(tasks.deferredcasterTasks, blackoutFactor);
}
@@ -1873,7 +1872,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;
@@ -1923,7 +1924,6 @@ void FramebufferRenderer::performDeferredTasks(
deferredcastProgram->setUniform("firstPaint", firstPaint);
deferredcastProgram->setUniform("atmExposure", _hdrExposure);
deferredcaster->preRaycast(
deferredcasterTask.renderData,
_deferredcastData[deferredcaster],