From 5dffc86d26d680dbf1756824c8985a1b7ff86870 Mon Sep 17 00:00:00 2001
From: Vincent Lejeune <vljn@ovi.com>
Date: Sat, 9 Aug 2014 00:43:28 +0200
Subject: [PATCH] Use lambda for debug_slider instead.

---
 src/states_screens/dialogs/debug_slider.cpp | 18 ++++--------------
 src/states_screens/dialogs/debug_slider.hpp | 10 ++++++----
 src/utils/debug.cpp                         |  4 ++--
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/states_screens/dialogs/debug_slider.cpp b/src/states_screens/dialogs/debug_slider.cpp
index bd0bb7635..4fe8c8051 100644
--- a/src/states_screens/dialogs/debug_slider.cpp
+++ b/src/states_screens/dialogs/debug_slider.cpp
@@ -32,8 +32,8 @@ using namespace GUIEngine;
 
 // ------------------------------------------------------------------------------------------------------
 
-DebugSliderDialog::DebugSliderDialog(std::string id, irr::core::stringw msg) :
-    ModalDialog(0.85f, 0.25f, MODAL_DIALOG_LOCATION_BOTTOM)
+DebugSliderDialog::DebugSliderDialog(std::string id, irr::core::stringw msg, std::function<int()> G, std::function<void(int)> S) :
+    ModalDialog(0.85f, 0.25f, MODAL_DIALOG_LOCATION_BOTTOM), Getter(G), Setter(S)
 {
     //if (StateManager::get()->getGameState() == GUIEngine::GAME)
     //{
@@ -45,17 +45,10 @@ DebugSliderDialog::DebugSliderDialog(std::string id, irr::core::stringw msg) :
 
     loadFromFile("debug_slider.stkgui");
 
-
     LabelWidget* message = getWidget<LabelWidget>("title");
     message->setText( msg.c_str(), false );
 
-    float val;
-    if (m_id == "lwhite")
-      val = irr_driver->getLwhite() * 10.f;
-    if (m_id == "exposure")
-      val = irr_driver->getExposure() * 100.f;
-
-    getWidget<SpinnerWidget>("value_slider")->setValue(int(val));
+    getWidget<SpinnerWidget>("value_slider")->setValue(Getter());
 }
 
 // ------------------------------------------------------------------------------------------------------
@@ -82,10 +75,7 @@ GUIEngine::EventPropagation DebugSliderDialog::processEvent(const std::string& e
     {
         int value = getWidget<SpinnerWidget>("value_slider")->getValue();
         Log::info("DebugSlider", "Value for <%s> : %i", m_id.c_str(), value);
-        if (m_id == "lwhite")
-            irr_driver->setLwhite(value / 10.f);
-        if (m_id == "exposure")
-            irr_driver->setExposure(value / 100.f);
+        Setter(value);
         return GUIEngine::EVENT_BLOCK;
     }
 
diff --git a/src/states_screens/dialogs/debug_slider.hpp b/src/states_screens/dialogs/debug_slider.hpp
index 53107f8aa..fa246b339 100644
--- a/src/states_screens/dialogs/debug_slider.hpp
+++ b/src/states_screens/dialogs/debug_slider.hpp
@@ -22,6 +22,7 @@
 #include "guiengine/modaldialog.hpp"
 #include "utils/cpp2011.hpp"
 #include "utils/leak_check.hpp"
+#include <functional>
 
 /**
  * \brief For internal value tweaking
@@ -32,18 +33,19 @@ class DebugSliderDialog : public GUIEngine::ModalDialog
 private:
 
     std::string m_id;
+    std::function<int()> Getter;
+    std::function<void(int)> Setter;
 
 public:
 
 
-    DebugSliderDialog(std::string id, ::core::stringw msg);
-    
+    DebugSliderDialog(std::string id, ::core::stringw msg, std::function<int()> G, std::function<void(int)> S);
+
     ~DebugSliderDialog();
-    
+
     virtual void onEnterPressedInternal() OVERRIDE;
     virtual void onUpdate(float dt) OVERRIDE;
 
-    
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
 };
 
diff --git a/src/utils/debug.cpp b/src/utils/debug.cpp
index 1f711f4a6..0f3dbdfec 100644
--- a/src/utils/debug.cpp
+++ b/src/utils/debug.cpp
@@ -440,11 +440,11 @@ bool onEvent(const SEvent &event)
                 }
                 else if (cmdID == DEBUG_TWEAK_SHADER_EXPOSURE)
                 {
-                    new DebugSliderDialog("exposure", "Exposure");
+                    new DebugSliderDialog("exposure", "Exposure", [](){ return irr_driver->getExposure() * 100.f; }, [](int v){irr_driver->setExposure(v / 100.f); });
                 }
                 else if (cmdID == DEBUG_TWEAK_SHADER_LWHITE)
                 {
-                    new DebugSliderDialog("lwhite", "LWhite");
+                    new DebugSliderDialog("lwhite", "LWhite", [](){ return irr_driver->getLwhite() * 10.f; }, [](int v){irr_driver->setLwhite(v / 10.f); });
                 }
             }