From b830a413d3a04f9b9b196c6c2fb6ea0573a5d785 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 13 Dec 2015 16:02:09 -0800
Subject: [PATCH] Rename the texture filter options

To avoid compatibility issues with upgrading from or downgrading to older
builds.
---
 apps/openmw/engine.cpp                    | 8 ++++----
 apps/openmw/mwgui/settingswindow.cpp      | 6 +++---
 apps/openmw/mwrender/renderingmanager.cpp | 8 ++++----
 files/settings-default.cfg                | 8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index eeba6e65c..1441f8b4f 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -455,16 +455,16 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         osg::Texture::FilterMode min = osg::Texture::LINEAR;
         osg::Texture::FilterMode mag = osg::Texture::LINEAR;
 
-        std::string filter = Settings::Manager::getString("texture filtering", "General");
+        std::string filter = Settings::Manager::getString("texture filter", "General");
         if(filter == "nearest")
         {
             min = osg::Texture::NEAREST;
             mag = osg::Texture::NEAREST;
         }
         else if(filter != "linear")
-            std::cerr<< "Invalid texture filtering option: "<<filter <<std::endl;
+            std::cerr<< "Invalid texture filter option: "<<filter <<std::endl;
 
-        std::string mipmap = Settings::Manager::getString("texture mipmapping", "General");
+        std::string mipmap = Settings::Manager::getString("texture mipmap", "General");
         if(mipmap == "nearest")
         {
             if(min == osg::Texture::NEAREST)
@@ -475,7 +475,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
         else if(mipmap != "none")
         {
             if(mipmap != "linear")
-                std::cerr<< "Invalid texture mipmapping option: "<<mipmap <<std::endl;
+                std::cerr<< "Invalid texture mipmap option: "<<mipmap <<std::endl;
             if(min == osg::Texture::NEAREST)
                 min = osg::Texture::NEAREST_MIPMAP_LINEAR;
             else if(min == osg::Texture::LINEAR)
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index b9aa3aa26..fbfbd0e70 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -236,7 +236,7 @@ namespace MWGui
         }
         highlightCurrentResolution();
 
-        std::string tmip = Settings::Manager::getString("texture mipmapping", "General");
+        std::string tmip = Settings::Manager::getString("texture mipmap", "General");
         mTextureFilteringButton->setCaption(textureMipmappingToStr(tmip));
         mAnisotropyLabel->setCaption("Anisotropy (" + MyGUI::utility::toString(Settings::Manager::getInt("anisotropy", "General")) + ")");
 
@@ -427,9 +427,9 @@ namespace MWGui
     void SettingsWindow::onTextureFilteringChanged(MyGUI::ComboBox* _sender, size_t pos)
     {
         if(pos == 0)
-            Settings::Manager::setString("texture mipmapping", "General", "nearest");
+            Settings::Manager::setString("texture mipmap", "General", "nearest");
         else if(pos == 1)
-            Settings::Manager::setString("texture mipmapping", "General", "linear");
+            Settings::Manager::setString("texture mipmap", "General", "linear");
         else
             std::cerr<< "Unexpected option pos "<<pos <<std::endl;
         apply();
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index f66398d2f..edc877ad4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -784,14 +784,14 @@ namespace MWRender
         osg::Texture::FilterMode min = osg::Texture::LINEAR;
         osg::Texture::FilterMode mag = osg::Texture::LINEAR;
 
-        std::string filter = Settings::Manager::getString("texture filtering", "General");
+        std::string filter = Settings::Manager::getString("texture filter", "General");
         if(filter == "nearest")
         {
             min = osg::Texture::NEAREST;
             mag = osg::Texture::NEAREST;
         }
 
-        std::string mipmap = Settings::Manager::getString("texture mipmapping", "General");
+        std::string mipmap = Settings::Manager::getString("texture mipmap", "General");
         if(mipmap == "nearest")
         {
             if(min == osg::Texture::NEAREST)
@@ -846,8 +846,8 @@ namespace MWRender
                 mStateUpdater->setFogEnd(mViewDistance);
                 updateProjectionMatrix();
             }
-            else if (it->first == "General" && (it->second == "texture filtering" ||
-                                                it->second == "texture mipmapping" ||
+            else if (it->first == "General" && (it->second == "texture filter" ||
+                                                it->second == "texture mipmap" ||
                                                 it->second == "anisotropy"))
                 updateTextureFiltering();
             else if (it->first == "Water")
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c9132dada..b77b95c52 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -110,11 +110,11 @@ anisotropy = 4
 # File format for screenshots.  (jpg, png, tga, and possibly more).
 screenshot format = png
 
-# Texture filtering.  (nearest or linear).
-texture filtering = linear
+# Texture filter type.  (nearest or linear).
+texture filter = linear
 
-# Texture mipmapping.  (none, nearest, or linear).
-texture mipmapping = nearest
+# Texture mipmap type.  (none, nearest, or linear).
+texture mipmap = nearest
 
 [Input]