Merge pull request #852 from cesarBLG/remove-adhesion-options

Remove unneeded adhesion options
openrails · Jul 22, 2023 · 868d5ab · 868d5ab
2 parents d9fc5d4 + 72b9655
commit 868d5ab
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 61 deletions.
diff --git a/Source/Documentation/Manual/options.rst b/Source/Documentation/Manual/options.rst
@@ -355,13 +355,6 @@ by MSTS, while the advanced one is based on a model more similar to reality.
 For more information read the section on :ref:`Adhesion Models <physics-adhesion>` later in this
 manual.
 
-Adhesion moving average filter size
------------------------------------
-
-The computations related to adhesion are passed through a moving average
-filter. Higher values cause smoother operation, but also less
-responsiveness. 10 is the default filter size.
-
 Break couplers
 --------------
 

diff --git a/Source/Menu/Options.Designer.cs b/Source/Menu/Options.Designer.cs
diff --git a/Source/Menu/Options.cs b/Source/Menu/Options.cs
@@ -178,9 +178,6 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
 
             checkSimpleControlsPhysics.Checked = Settings.SimpleControlPhysics;
             checkUseAdvancedAdhesion.Checked = Settings.UseAdvancedAdhesion;
-            labelAdhesionMovingAverageFilterSize.Enabled = checkUseAdvancedAdhesion.Checked;
-            numericAdhesionMovingAverageFilterSize.Enabled = checkUseAdvancedAdhesion.Checked; 
-            numericAdhesionMovingAverageFilterSize.Value = Settings.AdhesionMovingAverageFilterSize;
             checkBreakCouplers.Checked = Settings.BreakCouplers;
             checkCurveSpeedDependent.Checked = Settings.CurveSpeedDependent;
             checkBoilerPreheated.Checked = Settings.HotStart;
@@ -466,7 +463,6 @@ void buttonOK_Click(object sender, EventArgs e)
             // Simulation tab
             Settings.SimpleControlPhysics = checkSimpleControlsPhysics.Checked;
             Settings.UseAdvancedAdhesion = checkUseAdvancedAdhesion.Checked;
-            Settings.AdhesionMovingAverageFilterSize = (int)numericAdhesionMovingAverageFilterSize.Value;
             Settings.BreakCouplers = checkBreakCouplers.Checked;
             Settings.CurveSpeedDependent = checkCurveSpeedDependent.Checked;
             Settings.HotStart = checkBoilerPreheated.Checked;
@@ -589,8 +585,6 @@ private void trackAdhesionFactor_ValueChanged(object sender, EventArgs e)
         private void SetAdhesionLevelValue()
         {
             int level = trackAdhesionFactor.Value - trackAdhesionFactorChange.Value;
-            // Adjust level to be proportional to weather 
-            level -= 40;
 
             if (level > 159)
                 AdhesionLevelValue.Text = catalog.GetString("Very easy");
@@ -779,12 +773,6 @@ private void checkDistantMountains_Click(object sender, EventArgs e)
            numericDistantMountainsViewingDistance.Enabled = checkDistantMountains.Checked;
         }
 
-        private void checkUseAdvancedAdhesion_Click(object sender, EventArgs e)
-        {
-            labelAdhesionMovingAverageFilterSize.Enabled = checkUseAdvancedAdhesion.Checked;
-            numericAdhesionMovingAverageFilterSize.Enabled = checkUseAdvancedAdhesion.Checked;
-        }
-
         private void checkDataLogTrainSpeed_Click(object sender, EventArgs e)
         {
             checkListDataLogTSContents.Enabled = checkDataLogTrainSpeed.Checked;

diff --git a/Source/ORTS.Settings/UserSettings.cs b/Source/ORTS.Settings/UserSettings.cs
@@ -212,8 +212,6 @@ public enum DirectXFeature
         public bool SimpleControlPhysics { get; set; }
         [Default(true)]
         public bool UseAdvancedAdhesion { get; set; }
-        [Default(10)]
-        public int AdhesionMovingAverageFilterSize { get; set; }
         [Default(false)]
         public bool BreakCouplers { get; set; }
         [Default(false)]

diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -3120,7 +3120,7 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
                 Train.SlipperySpotLengthM = 10 + 40 * (float)Simulator.Random.NextDouble();
                 Train.SlipperySpotDistanceM = Train.SlipperySpotLengthM + 2000 * (float)Simulator.Random.NextDouble();
             }
-            if (Train.SlipperySpotDistanceM < Train.SlipperySpotLengthM)
+            if (Train.SlipperySpotDistanceM < Train.SlipperySpotLengthM && Simulator.Settings.AdhesionFactorChange > 0)
             {
                 if (BaseFrictionCoefficientFactor > 0.6 && BaseFrictionCoefficientFactor < 0.8)
                 {