Remove unused settings

apps/openmw/mwgui/settingswindow.cpp

@@ -179,9 +179,6 @@ namespace MWGui
         getWidget(mWindowBorderButton, "WindowBorderButton");
         getWidget(mTextureFilteringButton, "TextureFilteringButton");
         getWidget(mAnisotropyBox, "AnisotropyBox");
-        getWidget(mShadersButton, "ShadersButton");
-        getWidget(mShadowsEnabledButton, "ShadowsEnabledButton");
-        getWidget(mShadowsTextureSize, "ShadowsTextureSize");
         getWidget(mControlsBox, "ControlsBox");
         getWidget(mResetControlsButton, "ResetControlsButton");
         getWidget(mKeyboardSwitch, "KeyboardButton");
@@ -211,8 +208,6 @@ namespace MWGui
 
         mWaterTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onWaterTextureSizeChanged);
 
-        mShadowsTextureSize->eventComboChangePosition += MyGUI::newDelegate(this, &SettingsWindow::onShadowTextureSizeChanged);
-
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
@@ -253,13 +248,6 @@ namespace MWGui
         if (waterTextureSize >= 2048)
             mWaterTextureSize->setIndexSelected(2);
 
-        mShadowsTextureSize->setCaption (Settings::Manager::getString ("texture size", "Shadows"));
-
-        if (!Settings::Manager::getBool("shaders", "Objects"))
-        {
-            mShadowsEnabledButton->setEnabled(false);
-        }
-
         mWindowBorderButton->setEnabled(!Settings::Manager::getBool("fullscreen", "Video"));
 
         mKeyboardSwitch->setStateSelected(true);
@@ -339,12 +327,6 @@ namespace MWGui
         apply();
     }
 
-    void SettingsWindow::onShadowTextureSizeChanged(MyGUI::ComboBox *_sender, size_t pos)
-    {
-        Settings::Manager::setString("texture size", "Shadows", _sender->getItemNameAt(pos));
-        apply();
-    }
-
     void SettingsWindow::onButtonToggled(MyGUI::Widget* _sender)
     {
         std::string on = MWBase::Environment::get().getWindowManager()->getGameSettingString("sOn", "On");
@@ -361,21 +343,6 @@ namespace MWGui
             newState = true;
         }
 
-        if (_sender == mShadersButton)
-        {
-            if (newState == false)
-            {
-                // shadows not supported
-                mShadowsEnabledButton->setEnabled(false);
-                mShadowsEnabledButton->setCaptionWithReplacing("#{sOff}");
-                Settings::Manager::setBool("enabled", "Shadows", false);
-            }
-            else
-            {
-                mShadowsEnabledButton->setEnabled(true);
-            }
-        }
-
         if (_sender == mFullscreenButton)
         {
             // check if this resolution is supported in fullscreen

apps/openmw/mwgui/settingswindow.hpp

@@ -32,13 +32,9 @@ namespace MWGui
             MyGUI::Button* mWindowBorderButton;
             MyGUI::ComboBox* mTextureFilteringButton;
             MyGUI::Widget* mAnisotropyBox;
-            MyGUI::Button* mShadersButton;
 
             MyGUI::ComboBox* mWaterTextureSize;
 
-            MyGUI::Button* mShadowsEnabledButton;
-            MyGUI::ComboBox* mShadowsTextureSize;
-
             // controls
             MyGUI::ScrollView* mControlsBox;
             MyGUI::Button* mResetControlsButton;
@@ -58,8 +54,6 @@ namespace MWGui
 
             void onWaterTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
 
-            void onShadowTextureSizeChanged(MyGUI::ComboBox* _sender, size_t pos);
-
             void onRebindAction(MyGUI::Widget* _sender);
             void onInputTabMouseWheel(MyGUI::Widget* _sender, int _rel);
             void onResetDefaultBindings(MyGUI::Widget* _sender);

files/mygui/openmw_settings_window.layout

@@ -257,18 +257,6 @@
                                 <Property key="Caption" value="Window border"/>
                             </Widget>
                         </Widget>
-                        <Widget type="HBox" skin="" position="182 124 300 24">
-                            <Property key="Visible" value="false"/>
-                            <UserString key="Hidden" value="true"/>
-                            <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 24 24" align="Left Top" name="ShadersButton">
-                                <UserString key="SettingCategory" value="Objects"/>
-                                <UserString key="SettingName" value="shaders"/>
-                                <UserString key="SettingType" value="CheckButton"/>
-                            </Widget>
-                            <Widget type="AutoSizedTextBox" skin="SandText" position="28 4 108 16" align="Left Top">
-                                <Property key="Caption" value="Object shaders"/>
-                            </Widget>
-                        </Widget>
 
                         <Widget type="TextBox" skin="SandText" position="182 94 300 32" align="Left Top">
                             <Property key="MultiLine" value="true"/>
@@ -411,7 +399,6 @@
                     </Widget>
                     <!--
                     <Widget type="TabItem" skin="" position="0 28 352 268">
-                    -->
                     <Widget type="Widget" skin="" position="0 28 352 268">
                         <Property key="Visible" value="false"/>
                         <Property key="Caption" value="  Shadows  "/>
@@ -489,6 +476,7 @@
                             </Widget>
                         </Widget>
                     </Widget>
+                    -->
                 </Widget>
             </Widget>
         </Widget>

files/settings-default.cfg

@@ -277,54 +277,6 @@ refraction = false
 # Draw NPCs and creatures on water reflections.
 reflect actors = false
 
-[Objects]
-
-# Enable shaders for objects other than water. Unused.
-shaders = true
-
-[Terrain]
-
-# Use shaders for terrain?  Unused.
-shader = true
-
-# Distant land is rendered?  Unused.
-distant land = false
-
-[Shadows]
-
-# Enable shadows. Other shadow settings disabled if false. Unused.
-enabled = false
-
-# Size of the shadow textures in pixels.  Unused.  (e.g. 256 to 2048).
-texture size = 1024
-
-# Actors cast shadows.  Unused.
-actor shadows = true
-
-# Static objects cast shadows.  Unused.
-statics shadows = true
-
-# Terrain cast shadows.  Unused.
-terrain shadows = true
-
-# Miscellaneous objects cast shadows.  Unused.
-misc shadows = true
-
-# Debugging of shadows.  Unused.
-debug = false
-
-# Fraction of distance after which shadow starts to fade out.  Unused.
-fade start = 0.8
-
-# Split shadow maps, allowing for a larger shadow distance.  Unused.
-split = false
-
-# Distance for shadows if not split.  Smaller is poorer. Unused.
-shadow distance = 1300
-
-# Distance for shadows if split.  Unused.
-split shadow distance = 14000
-
 [Windows]
 
 # Location and sizes of windows as a fraction of the OpenMW window or