feat: Remove precipitation customisation

Author: twpol

Source/ORTS.Settings/UserSettings.cs

@@ -315,12 +315,6 @@ public enum DirectXFeature
         public bool AdhesionProportionalToWeather { get; set; }
         [Default(false)]
         public bool NoForcedRedAtStationStops { get; set; }
-        [Default(100)]
-        public int PrecipitationBoxHeight { get; set; }
-        [Default(500)]
-        public int PrecipitationBoxWidth { get; set; }
-        [Default(500)]
-        public int PrecipitationBoxLength { get; set; }
         [Default(false)]
         public bool CorrectQuestionableBrakingParams { get; set; }
         [Default(false)]

Source/RunActivity/Viewer3D/Precipitation.cs

@@ -1,4 +1,4 @@
-// COPYRIGHT 2010, 2011, 2012, 2013, 2014 by the Open Rails project.
+// COPYRIGHT 2009 - 2023 by the Open Rails project.
 //
 // This file is part of Open Rails.
 //
@@ -33,13 +33,7 @@ public class PrecipitationViewer
     {
         public const float MinIntensityPPSPM2 = 0;
 
-        // 16 bit version.
-        public const float MaxIntensityPPSPM2_16 = 0.010f;
-
-        // Default 32 bit version.
-        public const float MaxIntensityPPSPM2 = 0.035f;
-
-        public static bool IndexesAre32bit;
+        public const float MaxIntensityPPSPM2 = 0.015f;
 
         readonly Viewer Viewer;
         readonly Weather Weather;
@@ -51,8 +45,6 @@ public class PrecipitationViewer
 
         public PrecipitationViewer(Viewer viewer)
         {
-            IndexesAre32bit = viewer.Settings.IsDirectXFeatureLevelIncluded(ORTS.Settings.UserSettings.DirectXFeature.Level10_0);
-
             Viewer = viewer;
             Weather = viewer.Simulator.Weather;
 
@@ -114,14 +106,9 @@ public class PrecipitationPrimitive : RenderPrimitive
         // This is a fiddle factor because the above values feel too slow. Alternative suggestions welcome.
         const float ParticleVelocityFactor = 10.0f;
 
-        readonly float ParticleBoxLengthM;
-        readonly float ParticleBoxWidthM;
-        readonly float ParticleBoxHeightM;
-
-        // 16bit Box Parameters
-        const float ParticleBoxLengthM_16 = 500;
-        const float ParticleBoxWidthM_16 = 500;
-        const float ParticleBoxHeightM_16 = 43;
+        const float ParticleBoxLengthM = 500;
+        const float ParticleBoxWidthM = 500;
+        const float ParticleBoxHeightM = 43;
 
         const int IndicesPerParticle = 6;
         const int VerticiesPerParticle = 4;
@@ -170,51 +157,14 @@ struct ParticleVertex
         public PrecipitationPrimitive(GraphicsDevice graphicsDevice)
         {
             // Snow is the slower particle, hence longer duration, hence more particles in total.
-            // Setting the precipitation box size based on GraphicsDeviceCapabilities.
-            if (PrecipitationViewer.IndexesAre32bit)
-            {
-                ParticleBoxLengthM = (float)Program.Simulator.Settings.PrecipitationBoxLength;
-                ParticleBoxWidthM = (float)Program.Simulator.Settings.PrecipitationBoxWidth;
-                ParticleBoxHeightM = (float)Program.Simulator.Settings.PrecipitationBoxHeight;
-            }
-            else
-            {
-                ParticleBoxLengthM = ParticleBoxLengthM_16;
-                ParticleBoxWidthM = ParticleBoxWidthM_16;
-                ParticleBoxHeightM = ParticleBoxHeightM_16;
-            }
-
-            if (PrecipitationViewer.IndexesAre32bit)
-            {
-                MaxParticles = (int)(PrecipitationViewer.MaxIntensityPPSPM2 * ParticleBoxLengthM * ParticleBoxWidthM * ParticleBoxHeightM / SnowVelocityMpS / ParticleVelocityFactor);
-            }
-
-            // Processing 16bit device
-            else
-            {
-                MaxParticles = (int)(PrecipitationViewer.MaxIntensityPPSPM2_16 * ParticleBoxLengthM * ParticleBoxWidthM * ParticleBoxHeightM / SnowVelocityMpS / ParticleVelocityFactor);
-            }
-
-            // Checking if graphics device is 16bit.
-            if (!PrecipitationViewer.IndexesAre32bit)
-            {
-                Debug.Assert(MaxParticles * VerticiesPerParticle < ushort.MaxValue, "The maximum number of precipitation verticies must be able to fit in a ushort (16bit unsigned) index buffer.");
-            }
+            MaxParticles = (int)(PrecipitationViewer.MaxIntensityPPSPM2 * ParticleBoxLengthM * ParticleBoxWidthM * ParticleBoxHeightM / SnowVelocityMpS / ParticleVelocityFactor);
+            Debug.Assert(MaxParticles * VerticiesPerParticle < ushort.MaxValue, "The maximum number of precipitation verticies must be able to fit in a ushort (16bit unsigned) index buffer.");
 
             Vertices = new ParticleVertex[MaxParticles * VerticiesPerParticle];
             VertexDeclaration = new VertexDeclaration(ParticleVertex.SizeInBytes, ParticleVertex.VertexElements);
             VertexStride = Marshal.SizeOf(typeof(ParticleVertex));
             VertexBuffer = new DynamicVertexBuffer(graphicsDevice, VertexDeclaration, MaxParticles * VerticiesPerParticle, BufferUsage.WriteOnly);
-
-            // Processing either 32bit or 16bit InitIndexBuffer depending on GraphicsDeviceCapabilities.
-            if (PrecipitationViewer.IndexesAre32bit)
-            {
-                IndexBuffer = InitIndexBuffer(graphicsDevice, MaxParticles * IndicesPerParticle);
-            }
-            else
-            {
-                IndexBuffer = InitIndexBuffer16(graphicsDevice, MaxParticles * IndicesPerParticle);
-            }
+            IndexBuffer = InitIndexBuffer(graphicsDevice, MaxParticles * IndicesPerParticle);
 
             Heights = new HeightCache(8);
 
@@ -227,31 +177,7 @@ void VertexBuffer_ContentLost()
             VertexBuffer.SetData(0, Vertices, 0, Vertices.Length, VertexStride, SetDataOptions.NoOverwrite);
         }
 
-        // IndexBuffer for 32bit process.
         static IndexBuffer InitIndexBuffer(GraphicsDevice graphicsDevice, int numIndices)
-        {
-            var indices = new uint[numIndices];
-            var index = 0;
-            for (var i = 0; i < numIndices; i += IndicesPerParticle)
-            {
-                indices[i] = (uint)index;
-                indices[i + 1] = (uint)(index + 1);
-                indices[i + 2] = (uint)(index + 2);
-
-                indices[i + 3] = (uint)(index + 2);
-                indices[i + 4] = (uint)(index + 3);
-                indices[i + 5] = (uint)index;
-
-                index += VerticiesPerParticle;
-            }
-
-            var indexBuffer = new IndexBuffer(graphicsDevice, typeof(uint), numIndices, BufferUsage.WriteOnly);
-            indexBuffer.SetData(indices);
-            return indexBuffer;
-        }
-
-        // IndexBuffer for computers that still use 16bit graphics.
-        static IndexBuffer InitIndexBuffer16(GraphicsDevice graphicsDevice, int numIndices)
         {
             var indices = new ushort[numIndices];
             var index = 0;
@@ -347,7 +273,6 @@ public void Update(float currentTime, ElapsedTime elapsedTime, float particlesPe
             var tiles = viewer.Tiles;
             var scenery = viewer.World.Scenery;
             var worldLocation = viewer.Camera.CameraWorldLocation;
-            //var worldLocation = Program.Viewer.PlayerLocomotive.WorldPosition.WorldLocation;  // This is used to test overall precipitation position.
 
             if (TimeParticlesLastEmitted == 0)
             {

Source/RunActivity/Viewer3D/Weather.cs

@@ -206,29 +206,14 @@ void UpdateSoundSources()
 
         void UpdateVolume()
         {
-            if (PrecipitationViewer.IndexesAre32bit)
+            foreach (var soundSource in RainSound)
             {
-                foreach (var soundSource in RainSound)
-                {
-                    soundSource.Volume = Weather.PrecipitationIntensityPPSPM2 / PrecipitationViewer.MaxIntensityPPSPM2;
-                }
-
-                foreach (var soundSource in SnowSound)
-                {
-                    soundSource.Volume = Weather.PrecipitationIntensityPPSPM2 / PrecipitationViewer.MaxIntensityPPSPM2;
-                }
+                soundSource.Volume = Weather.PrecipitationIntensityPPSPM2 / PrecipitationViewer.MaxIntensityPPSPM2;
             }
-            else
-            {
-                foreach (var soundSource in RainSound)
-                {
-                    soundSource.Volume = Weather.PrecipitationIntensityPPSPM2 / PrecipitationViewer.MaxIntensityPPSPM2_16;
-                }
 
-                foreach (var soundSource in SnowSound)
-                {
-                    soundSource.Volume = Weather.PrecipitationIntensityPPSPM2 / PrecipitationViewer.MaxIntensityPPSPM2_16;
-                }
+            foreach (var soundSource in SnowSound)
+            {
+                soundSource.Volume = Weather.PrecipitationIntensityPPSPM2 / PrecipitationViewer.MaxIntensityPPSPM2;
             }
         }
 
@@ -733,18 +718,9 @@ public void WeatherChange_Init(ORTSWeatherChange eventWeatherChange, WeatherCont
                     ORTSPrecipitationIntensityTransitionTimeS = eventWeatherChange.ORTSPrecipitationIntensityTransitionTimeS;
                     precipitationIntensityTimer = (float)ORTSPrecipitationIntensityTransitionTimeS;
 
-                    // Pricipitation ranges from 0 to max PrecipitationViewer.MaxIntensityPPSPM2 if 32bit.
-                    // 16bit uses PrecipitationViewer.MaxIntensityPPSPM2_16
-                    if (PrecipitationViewer.IndexesAre32bit)
-                    {
-                        precipitationIntensityChangeRate = precipitationIntensityTimer > 0 ? (MathHelper.Clamp(ORTSPrecipitationIntensity, 0, PrecipitationViewer.MaxIntensityPPSPM2)
-                            - weatherControl.Weather.PrecipitationIntensityPPSPM2) / ORTSPrecipitationIntensityTransitionTimeS : 0;
-                    }
-                    else
-                    {
-                        precipitationIntensityChangeRate = precipitationIntensityTimer > 0 ? (MathHelper.Clamp(ORTSPrecipitationIntensity, 0, PrecipitationViewer.MaxIntensityPPSPM2_16)
-                            - weatherControl.Weather.PrecipitationIntensityPPSPM2) / ORTSPrecipitationIntensityTransitionTimeS : 0;
-                    }
+                    // Precipitation ranges from 0 to max PrecipitationViewer.MaxIntensityPPSPM2 if 32bit.
+                    precipitationIntensityChangeRate = precipitationIntensityTimer > 0 ? (MathHelper.Clamp(ORTSPrecipitationIntensity, 0, PrecipitationViewer.MaxIntensityPPSPM2)
+                        - weatherControl.Weather.PrecipitationIntensityPPSPM2) / ORTSPrecipitationIntensityTransitionTimeS : 0;
 
                     wChangeOn = true;
                 }