From 01dbac7b1589e0c2458d5160c27bad1b212d1d31 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 4 Mar 2018 11:37:11 -0800
Subject: [PATCH] Don't use a different setting for distant viewing distance

---
 apps/openmw/mwrender/renderingmanager.cpp | 14 ++++----------
 apps/openmw/mwrender/renderingmanager.hpp |  1 -
 files/settings-default.cfg                |  4 ----
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index b3fee20b5..6f0ddba3a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -53,7 +53,6 @@
 
 namespace
 {
-    float DLRenderDistance;
     float DLLandFogStart;
     float DLLandFogEnd;
     float DLUnderwaterFogStart;
@@ -231,7 +230,6 @@ namespace MWRender
 
         mWater.reset(new Water(mRootNode, sceneRoot, mResourceSystem, mViewer->getIncrementalCompileOperation(), fallback, resourcePath));
 
-        DLRenderDistance = Settings::Manager::getFloat("distant viewing distance", "Camera");
         DLLandFogStart = Settings::Manager::getFloat("distant land fog start", "Fog");
         DLLandFogEnd = Settings::Manager::getFloat("distant land fog end", "Fog");
         DLUnderwaterFogStart = Settings::Manager::getFloat("distant underwater fog start", "Fog");
@@ -312,10 +310,8 @@ namespace MWRender
         mFirstPersonFieldOfView = Settings::Manager::getFloat("first person field of view", "Camera");
         mStateUpdater->setFogEnd(mViewDistance);
 
-        mFarClip = mDistantTerrain ? DLRenderDistance : mViewDistance;
-
         mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("near", mNearClip));
-        mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("far", mFarClip));
+        mRootNode->getOrCreateStateSet()->addUniform(new osg::Uniform("far", mViewDistance));
 
         mUniformNear = mRootNode->getOrCreateStateSet()->getUniform("near");
         mUniformFar = mRootNode->getOrCreateStateSet()->getUniform("far");
@@ -680,7 +676,7 @@ namespace MWRender
         rttCamera->setRenderOrder(osg::Camera::PRE_RENDER);
         rttCamera->setReferenceFrame(osg::Camera::ABSOLUTE_RF);
         rttCamera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT, osg::Camera::PIXEL_BUFFER_RTT);
-        rttCamera->setProjectionMatrixAsPerspective(mFieldOfView, w/float(h), mNearClip, mFarClip);
+        rttCamera->setProjectionMatrixAsPerspective(mFieldOfView, w/float(h), mNearClip, mViewDistance);
         rttCamera->setViewMatrix(mViewer->getCamera()->getViewMatrix());
         rttCamera->setViewport(0, 0, w, h);
 
@@ -945,10 +941,10 @@ namespace MWRender
         float fov = mFieldOfView;
         if (mFieldOfViewOverridden)
             fov = mFieldOfViewOverride;
-        mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mFarClip);
+        mViewer->getCamera()->setProjectionMatrixAsPerspective(fov, aspect, mNearClip, mViewDistance);
 
         mUniformNear->set(mNearClip);
-        mUniformFar->set(mFarClip);
+        mUniformFar->set(mViewDistance);
     }
 
     void RenderingManager::updateTextureFiltering()
@@ -1008,8 +1004,6 @@ namespace MWRender
             else if (it->first == "Camera" && it->second == "viewing distance")
             {
                 mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
-                if(!mDistantTerrain)
-                    mFarClip = mViewDistance;
                 if(!mDistantFog)
                     mStateUpdater->setFogEnd(mViewDistance);
                 updateProjectionMatrix();
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index da79fba98..1c689d29f 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -254,7 +254,6 @@ namespace MWRender
         float mNightEyeFactor;
 
         float mNearClip;
-        float mFarClip;
         float mViewDistance;
         bool mDistantFog : 1;
         bool mDistantTerrain : 1;
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index c1d269e6f..dc770425f 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -25,10 +25,6 @@ small feature culling pixel size = 2.0
 # can dramatically affect performance, see documentation for details.
 viewing distance = 6666.0
 
-# Maximum visible distance for distant terrain. Caution: setting this too high
-# can increase the chance for Z-fighting (flickering artifacts).
-distant viewing distance = 40960
-
 # Camera field of view in degrees (e.g. 30.0 to 110.0).
 # Does not affect the player's hands in the first person camera.
 field of view = 55.0