Make Screenspace renderable work again (closes #959)

This commit is contained in:
Alexander Bock
2019-08-22 16:31:55 +02:00
parent 071d4af9dc
commit 40545d99e5
3 changed files with 14 additions and 1 deletions
@@ -92,6 +92,9 @@ public:
float globalBlackOutFactor();
void setGlobalBlackOutFactor(float opacity);
float hdrExposure() const;
bool isHdrDisabled() const;
void addScreenSpaceRenderable(std::unique_ptr<ScreenSpaceRenderable> s);
void removeScreenSpaceRenderable(ScreenSpaceRenderable* s);
void removeScreenSpaceRenderable(const std::string& identifier);
+8
View File
@@ -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
*/
+3 -1
View File
@@ -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);