mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Add slider for refraction size in settings window"

Browse Source 
This reverts commit ee40b41285.
This commit is contained in:
Miloslav Číž 2018-01-01 13:28:14 +01:00
parent ee40b41285
commit 3b741dc4b7
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwrender/water.cpp
View File

@ -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) *

2
docs/source/reference/modding/settings/water.rst
View File

@ -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?

24
files/mygui/openmw_settings_window.layout
View File

@ -394,30 +394,8 @@
<Property key="Caption" value="Reflect actors"/>
</Widget>
</Widget>
<Widget type="TextBox" skin="NormalText" position="4 84 350 18" align="Left Top">
<Property key="Caption" value="Refraction scale"/>
</Widget>
<Widget type="HBox" skin="" position="4 112 350 24">
<Widget type="MWScrollBar" skin="MW_HScroll" position="4 154 200 18" align="Left Top">
<Property key="Range" value="10000"/>
<Property key="Page" value="100"/>
<UserString key="SettingType" value="Slider"/>
<UserString key="SettingCategory" value="Water"/>
<UserString key="SettingName" value="refraction scale"/>
<UserString key="SettingValueType" value="Float"/>
<UserString key="SettingMin" value="0.01"/>
<UserString key="SettingMax" value="1.0"/>
</Widget>
</Widget>
<Widget type="TextBox" skin="SandText" position="4 140 200 18" align="Left Top">
<Property key="Caption" value="0"/>
<Property key="TextAlign" value="Left"/>
</Widget>
<Widget type="TextBox" skin="SandText" position="4 140 200 18" align="Left Top">
<Property key="Caption" value="1"/>
<Property key="TextAlign" value="Right"/>
</Widget>
</Widget>
</Widget>
<!--
<Widget type="TabItem" skin="" position="0 28 352 268">