From 40545d99e5e1c2b24dfcf9bcef85c0cae45a5d93 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 22 Aug 2019 16:31:55 +0200 Subject: [PATCH] Make Screenspace renderable work again (closes #959) --- include/openspace/rendering/renderengine.h | 3 +++ src/rendering/renderengine.cpp | 8 ++++++++ src/rendering/screenspacerenderable.cpp | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h index b529926ee1..b848712074 100644 --- a/include/openspace/rendering/renderengine.h +++ b/include/openspace/rendering/renderengine.h @@ -92,6 +92,9 @@ public: float globalBlackOutFactor(); void setGlobalBlackOutFactor(float opacity); + float hdrExposure() const; + bool isHdrDisabled() const; + void addScreenSpaceRenderable(std::unique_ptr s); void removeScreenSpaceRenderable(ScreenSpaceRenderable* s); void removeScreenSpaceRenderable(const std::string& identifier); diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index ccfbb5a739..de5ed0052a 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -938,6 +938,14 @@ void RenderEngine::setGlobalBlackOutFactor(float opacity) { _globalBlackOutFactor = opacity; } +float RenderEngine::hdrExposure() const { + return _hdrExposure; +} + +bool RenderEngine::isHdrDisabled() const { + return _disableHDRPipeline; +} + /** * Build a program object for rendering with the used renderer */ diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index d8aa117073..9a3b01f0dc 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -500,7 +500,9 @@ void ScreenSpaceRenderable::createShaders() { ghoul::Dictionary rendererData = { { "fragmentRendererPath", "${SHADERS}/framebuffer/renderframebuffer.frag" }, { "windowWidth" , res.x }, - { "windowHeight" , res.y } + { "windowHeight" , res.y }, + { "hdrExposure", global::renderEngine.hdrExposure() }, + { "disableHDR", global::renderEngine.isHdrDisabled() } }; dict.setValue("rendererData", rendererData);