From c5fbd5ff847ed36f12bd7459e00d6fdcdf099ef4 Mon Sep 17 00:00:00 2001 From: vlj Date: Fri, 25 Apr 2014 00:59:02 +0200 Subject: [PATCH] Reenable ability to change exposure/lwhite. --- src/graphics/shaders.cpp | 4 ++-- src/states_screens/dialogs/debug_slider.cpp | 8 ++++++++ src/tracks/track.cpp | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp index 58b06894a..0c5a8ca3c 100644 --- a/src/graphics/shaders.cpp +++ b/src/graphics/shaders.cpp @@ -2091,8 +2091,8 @@ namespace FullScreenShader { glUniform1i(uniform_tex, TU_tex); glUniform1i(uniform_logluminancetex, TU_loglum); -// glUniform1f(uniform_exposure, exposure); -// glUniform1f(uniform_lwhite, Lwhite); + glUniform1f(uniform_exposure, exposure); + glUniform1f(uniform_lwhite, Lwhite); } GLuint DepthOfFieldShader::Program; diff --git a/src/states_screens/dialogs/debug_slider.cpp b/src/states_screens/dialogs/debug_slider.cpp index f3ce2462c..d8b7b9536 100644 --- a/src/states_screens/dialogs/debug_slider.cpp +++ b/src/states_screens/dialogs/debug_slider.cpp @@ -48,6 +48,14 @@ DebugSliderDialog::DebugSliderDialog(std::string id, irr::core::stringw msg) : LabelWidget* message = getWidget("title"); message->setText( msg.c_str(), false ); + + float val; + if (m_id == "lwhite") + val = irr_driver->getLwhite() * 10.; + if (m_id == "exposure") + val = irr_driver->getExposure() * 100.; + + getWidget("value_slider")->setValue(val); } // ------------------------------------------------------------------------------------------------------ diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 9e7f1e0a4..cf6068168 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -356,6 +356,8 @@ void Track::cleanup() //----------------------------------------------------------------------------- void Track::loadTrackInfo() { + irr_driver->setLwhite(1.); + irr_driver->setExposure(0.09); // Default values m_use_fog = false; m_fog_max = 1.0f;