teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

defaults are set to 1.0; remove contrast setting

Browse source 
(can be changed in config though); disable gamma control for not Windows
OSs
This commit is contained in:
mrcheko 2015-01-02 16:49:22 +03:00
parent 60a74d5eb8
commit a8621e6230
4 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwgui/settingswindow.cpp
View file

@ -182,6 +182,20 @@ namespace MWGui
getWidget(mRefractionButton, "RefractionButton");
getWidget(mDifficultySlider, "DifficultySlider");
#ifndef WIN32
// hide gamma controls since it currently does not work under Linux
MyGUI::ScrollBar *gammaSlider;
getWidget(gammaSlider, "GammaSlider");
gammaSlider->setVisible(false);
MyGUI::TextBox *textBox;
getWidget(textBox, "GammaText");
textBox->setVisible(false);
getWidget(textBox, "GammaTextDark");
textBox->setVisible(false);
getWidget(textBox, "GammaTextLight");
textBox->setVisible(false);
#endif
mMainWidget->castType<MyGUI::Window>()->eventWindowChangeCoord += MyGUI::newDelegate(this, &SettingsWindow::onWindowResize);
mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onOkButtonClicked);

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -757,7 +757,7 @@ void RenderingManager::processChangedSettings(const Settings::CategorySettingVec
changeRes = true;
else if (it->second == "field of view" && it->first == "General")
mRendering.setFov(Settings::Manager::getFloat("field of view", "General"));
else if ((it->second == "gamma" || it->second == "contrast") && it->first == "General")
else if (it->second == "gamma" && it->first == "General")
{
mRendering.setWindowGammaContrast(Settings::Manager::getFloat("gamma", "General"), Settings::Manager::getFloat("contrast", "General"));
}

25
files/mygui/openmw_settings_window.layout
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout" version="3.2.0">
<Widget type="Window" skin="MW_Window" position="0 0 400 530" layer="Windows" name="_Main">
<Widget type="Window" skin="MW_Window" position="0 0 400 485" layer="Windows" name="_Main">
<Property key="MinSize" value="430 446"/>
<Widget type="TabControl" skin="TabControl" position="8 8 368 455" align="Stretch" name="SettingsTab">
<Widget type="TabControl" skin="TabControl" position="8 8 368 405" align="Stretch" name="SettingsTab">
<Property key="ButtonAutoWidth" value="true"/>
<Widget type="TabItem" skin="" position="4 32 360 308">
<Property key="Caption" value=" #{sPrefs} "/>
@ -214,7 +214,7 @@
</Widget>
<Widget type="TabItem" skin="" position="4 32 360 308">
<Property key="Caption" value=" #{sVideo} "/>
<Widget type="TabControl" skin="TabControlInner" position="4 4 352 420" align="Stretch">
<Widget type="TabControl" skin="TabControlInner" position="4 4 352 390" align="Stretch">
<Property key="ButtonAutoWidth" value="true"/>
<Widget type="TabItem" skin="" position="0 28 352 268" align="Stretch">
<Property key="Caption" value=" Video "/>
@ -305,27 +305,14 @@
<UserString key="SettingMin" value="0.1"/>
<UserString key="SettingMax" value="3.0"/>
</Widget>
<Widget type="TextBox" skin="SandText" position="0 316 329 18" align="Left Top">
<Widget type="TextBox" skin="SandText" position="0 316 329 18" align="Left Top" name="GammaTextDark">
<Property key="Caption" value="#{sDark_Gamma}"/>
<Property key="TextAlign" value="Left"/>
</Widget>
<Widget type="TextBox" skin="SandText" position="0 316 329 18" align="Right Top">
<Widget type="TextBox" skin="SandText" position="0 316 329 18" align="Right Top" name="GammaTextLight">
<Property key="Caption" value="#{sLight_Gamma}"/>
<Property key="TextAlign" value="Right"/>
</Widget>
<Widget type="TextBox" skin="NormalText" position="0 338 329 18" align="Left Top" name="ContrastText">
<Property key="Caption" value="Contrast"/>
</Widget>
<Widget type="MWScrollBar" skin="MW_HScroll" position="0 362 329 18" align="HStretch Top" name="ContrastSlider">
<Property key="Range" value="10000"/>
<Property key="Page" value="300"/>
<UserString key="SettingType" value="Slider"/>
<UserString key="SettingCategory" value="General"/>
<UserString key="SettingName" value="contrast"/>
<UserString key="SettingValueType" value="Float"/>
<UserString key="SettingMin" value="0.1"/>
<UserString key="SettingMax" value="2.0"/>
</Widget>
</Widget>
<Widget type="TabItem" skin="" position="0 28 352 268">
<Property key="Caption" value=" Detail "/>
@ -504,7 +491,7 @@
</Widget>
</Widget>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="320 465 56 24" align="Right Bottom" name="OkButton">
<Widget type="AutoSizedButton" skin="MW_Button" position="320 420 56 24" align="Right Bottom" name="OkButton">
<Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sOK}"/>
</Widget>

4
files/settings-default.cfg
View file

@ -48,8 +48,8 @@ werewolf overlay = true
[General]
# Camera field of view
field of view = 55
gamma = 1.34
contrast = 0.98
gamma = 1.00
contrast = 1.00
# Texture filtering mode. valid values:
# none