Merge pull request #665 from cjakeman/menu-options02n

02n: Removes some redundant experimental options

Author: cjakeman

Source/Documentation/Manual/options.rst

@@ -741,15 +741,6 @@ lat/lon rectangle corresponding to the arid zone of North America (lat from
 The randomization is not performed either if the activity contains weather
 change events.
 
-.. _options-dds-textures:
-
-Load DDS textures in preference to ACE
---------------------------------------
-
-Open Rails is capable of loading both ACE and DDS textures. If only one of
-the two is present, it is loaded. If both are present, the ACE texture is
-loaded unless this option has been selected.
-
 
 MSTS Environments
 -----------------
@@ -761,12 +752,6 @@ With this option selected, ORTS applies the MSTS environment files. This
 includes support of Kosmos environments, even if the final effect may be
 different from the current MSTS one.
 
-Adhesion factor correction
---------------------------
-
-The adhesion is multiplied by this percentage factor. Therefore lower
-values of the slider reduce adhesion and cause more frequent wheel slips
-and therefore a more difficult, but more challenging driving experience.
 
 Level of detail bias
 --------------------
@@ -793,37 +778,21 @@ Note: If your content does not use multiple LODs, then this option will have no
 Adhesion proportional to rain/snow/fog
 --------------------------------------
 
-When this option is selected, adhesion becomes dependent on the intensity
+Adhesion is dependent on the intensity
 of rain and snow and the density of fog. Intensities and density can be
 modified at runtime by the player.
 
+
+Adhesion factor correction
+--------------------------
+
+The adhesion is multiplied by this percentage factor. Therefore lower
+values of the slider reduce adhesion and cause more frequent wheel slips
+and therefore a more difficult, but more challenging driving experience.
+
+
 Adhesion factor random change
 -----------------------------
 
 This factor randomizes the adhesion factor corrector by the entered
 percentage. The higher the value, the higher the adhesion variations.
-
-Precipitation Box Size
-----------------------
-
-Open Rails will simulate precipitation -- i.e. rain or snow, as falling
-individual particles. This represents a significant computing and display
-system load, especially for systems with limited resources. Therefore, the
-region in which the precipitation particles are visible, the
-*Precipitation Box*, is limited in size and moves with the camera. The
-size of the box can be set by the entries in the height, width and length
-boxes. The X and Z values are centered on the camera location, and falling
-particles *spawn* and fall from the top of the box.
-
-The max size for both length and width is 3000 meters or 9,842ft. Due to possibe
-resource issues, the ability to use max length and width may not be possible.  The
-best way to use the precipitation box is to define a square around your entire train
-if small enough or around most of your train.  Keep track on how your resources are 
-being used since snow will take up the most resources so you will have to adjust the
-size until you are satisified with the results.
-
-The reason for defining a square around your train is to minimize the moments when your train
-is approaching the edge of the precipitation box.  Worst case is to save the activity,
-exit and re-enter the activity since doing this will set your train back in the middle of the
-precipitation box.
-

Source/Menu/Options.Designer.cs

@@ -317,17 +317,12 @@ orderby folder.Key
             trackLODBias.Value = Settings.LODBias;
             trackLODBias_ValueChanged(null, null);
             checkSignalLightGlow.Checked = Settings.SignalLightGlow;
-            checkPreferDDSTexture.Checked = Settings.PreferDDSTexture;
             checkUseLocationPassingPaths.Checked = Settings.UseLocationPassingPaths;
             checkUseMSTSEnv.Checked = Settings.UseMSTSEnv;
             trackAdhesionFactor.Value = Settings.AdhesionFactor;
-            checkAdhesionPropToWeather.Checked = Settings.AdhesionProportionalToWeather;
             trackAdhesionFactorChange.Value = Settings.AdhesionFactorChange;
             trackAdhesionFactor_ValueChanged(null, null);
             checkShapeWarnings.Checked = !Settings.SuppressShapeWarnings;   // Inverted as "Show warnings" is better UI than "Suppress warnings"
-            precipitationBoxHeight.Value = Settings.PrecipitationBoxHeight;
-            precipitationBoxWidth.Value = Settings.PrecipitationBoxWidth;
-            precipitationBoxLength.Value = Settings.PrecipitationBoxLength;
             checkCorrectQuestionableBrakingParams.Checked = Settings.CorrectQuestionableBrakingParams;
             numericActRandomizationLevel.Value = Settings.ActRandomizationLevel;
             numericActWeatherRandomizationLevel.Value = Settings.ActWeatherRandomizationLevel;
@@ -509,16 +504,11 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.SuperElevationGauge = (int)numericSuperElevationGauge.Value;
             Settings.LODBias = trackLODBias.Value;
             Settings.SignalLightGlow = checkSignalLightGlow.Checked;
-            Settings.PreferDDSTexture = checkPreferDDSTexture.Checked;
             Settings.UseLocationPassingPaths = checkUseLocationPassingPaths.Checked;
             Settings.UseMSTSEnv = checkUseMSTSEnv.Checked;
             Settings.AdhesionFactor = (int)trackAdhesionFactor.Value;
-            Settings.AdhesionProportionalToWeather = checkAdhesionPropToWeather.Checked;
             Settings.AdhesionFactorChange = (int)trackAdhesionFactorChange.Value;
             Settings.SuppressShapeWarnings = !checkShapeWarnings.Checked;
-            Settings.PrecipitationBoxHeight = (int)precipitationBoxHeight.Value;
-            Settings.PrecipitationBoxWidth = (int)precipitationBoxWidth.Value;
-            Settings.PrecipitationBoxLength = (int)precipitationBoxLength.Value;
             Settings.CorrectQuestionableBrakingParams = checkCorrectQuestionableBrakingParams.Checked;
             Settings.ActRandomizationLevel = (int)numericActRandomizationLevel.Value;
             Settings.ActWeatherRandomizationLevel = (int)numericActWeatherRandomizationLevel.Value;
@@ -584,8 +574,8 @@ private void trackAdhesionFactor_ValueChanged(object sender, EventArgs e)
         private void SetAdhesionLevelValue()
         {
             int level = trackAdhesionFactor.Value - trackAdhesionFactorChange.Value;
-            if (checkAdhesionPropToWeather.Checked)
-                level -= 40;
+            // Adjust level to be proportional to weather 
+            level -= 40;
 
             if (level > 159)
                 AdhesionLevelValue.Text = catalog.GetString("Very easy");

Source/Menu/Options.cs

@@ -302,8 +302,6 @@ public enum DirectXFeature
         [Default(false)]
         public bool AuxActionEnabled { get; set; }
         [Default(false)]
-        public bool PreferDDSTexture { get; set; }
-        [Default(false)]
         public bool UseLocationPassingPaths { get; set; }
         [Default(false)]
         public bool UseMSTSEnv { get; set; }

Source/ORTS.Settings/UserSettings.cs

@@ -60,7 +60,7 @@ public static string GetNightTextureFile(Simulator simulator, string textureFile
             else if (!String.IsNullOrEmpty(nightTexturePath + textureName) && Path.GetExtension(nightTexturePath + textureName) == ".ace")
             {
                 var alternativeTexture = Path.ChangeExtension(nightTexturePath + textureName, ".dds");
-                if (simulator.Settings.PreferDDSTexture && !String.IsNullOrEmpty(alternativeTexture.ToLower()) && File.Exists(alternativeTexture))
+                if (!String.IsNullOrEmpty(alternativeTexture.ToLower()) && File.Exists(alternativeTexture))
                 {
                     return alternativeTexture;
                 }

Source/RunActivity/Viewer3D/Common/Helpers.cs

@@ -88,7 +88,7 @@ public Texture2D Get(string path, Texture2D defaultTexture, bool required = fals
                     {
                         var alternativeTexture = Path.ChangeExtension(path, ".dds");
 
-                        if (Viewer.Settings.PreferDDSTexture && File.Exists(alternativeTexture))
+                        if (File.Exists(alternativeTexture))
                         {
                             DDSLib.DDSFromFile(alternativeTexture, GraphicsDevice, true, out texture);
                         }

Source/RunActivity/Viewer3D/Materials.cs

@@ -1509,7 +1509,7 @@ protected override Texture2D GetTexture(Game game)
                 {
                     var alternativeTexture = Path.ChangeExtension(path, ".dds");
 
-                    if (File.Exists(alternativeTexture) && game.Settings.PreferDDSTexture)
+                    if (File.Exists(alternativeTexture))
                     {
                         DDSLib.DDSFromFile(alternativeTexture, gd, true, out texture);
                     }