From 3b741dc4b75ab3feb225492634c669fc0c3073b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Mon, 1 Jan 2018 13:28:14 +0100 Subject: [PATCH] Revert "Add slider for refraction size in settings window" This reverts commit ee40b41285cce4af6a49e6c91f98dac75afaaa0c. --- apps/openmw/mwrender/water.cpp | 2 +- .../reference/modding/settings/water.rst | 2 +- files/mygui/openmw_settings_window.layout | 24 +------------------ 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp index 043f1f697..dbfee05df 100644 --- a/apps/openmw/mwrender/water.cpp +++ b/apps/openmw/mwrender/water.cpp @@ -272,7 +272,7 @@ public: void setWaterLevel(float waterLevel) { - const float refractionScale = std::min(1.0f,std::max(0.01f, // 0.0 crashes the game + const float refractionScale = std::min(1.0f,std::max(0.0f, Settings::Manager::getFloat("refraction scale", "Water"))); setViewMatrix(osg::Matrix::scale(1,1,refractionScale) * diff --git a/docs/source/reference/modding/settings/water.rst b/docs/source/reference/modding/settings/water.rst index ab87c77e5..aceecc630 100644 --- a/docs/source/reference/modding/settings/water.rst +++ b/docs/source/reference/modding/settings/water.rst @@ -104,4 +104,4 @@ This setting only applies if water shader is on and refractions are enabled. Not setting if off, there will still be small refractions caused by the water waves, which however do not cause such significant distortion. -This setting can be edited with the 'Refraction scale' slider in the Water tab of the Video panel of the Options menu. +TODO: setting via GUI? Interation with rttsize? diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout index 6e377b284..8ff850cae 100644 --- a/files/mygui/openmw_settings_window.layout +++ b/files/mygui/openmw_settings_window.layout @@ -394,30 +394,8 @@ - - - - - - - - - - - - - - - - - - - - - - - +