Introducing a getter for cutoff distance, by Ryan

Author: Csantucci

Source/RunActivity/Viewer3D/Sound.cs

@@ -496,7 +496,15 @@ public class SoundSource : SoundSourceBase
         /// Squared cutoff distance. No sound is audible above that, except for the actual player train,
         /// where cutoff occurs at a distance wich is higher than the train length
         /// </summary>
-        private const int CUTOFFDISTANCE = 4000000;
+        private int CutOffDistanceM2
+        {
+            get
+            {
+                const int staticDistanceM2 = 4000000;
+                var isPlayer = Car?.Train?.IsActualPlayerTrain ?? false;
+                return (int)Math.Max(staticDistanceM2, isPlayer ? Car.Train.Length * Car.Train.Length : 0);
+            }
+        }
         /// <summary>
         /// Max distance for OpenAL inverse distance model. Equals to Math.Sqrt(CUTOFFDISTANCE)
         /// </summary>
@@ -660,9 +668,9 @@ public override void Uninitialize()
         public bool MstsMonoTreatment;
 
         /// <summary>
-        /// Current distance to camera, squared meter. Is used for comparision to <see cref="CUTOFFDISTANCE"/>, to determine if is out-of-scope
+        /// Current distance to camera, squared meter. Is used for comparision to <see cref="CutOffDistanceM2"/>, to determine if is out-of-scope
         /// </summary>
-        public float DistanceSquared = CUTOFFDISTANCE + 1;
+        public float DistanceSquared = float.MaxValue;
         /// <summary>
         /// Out-of-scope state in previous <see cref="Update"/> loop
         /// </summary>
@@ -995,7 +1003,7 @@ public override bool Update()
         } // Update
 
         /// <summary>
-        /// Calculate current distance to camera, and compare it to <see cref="CUTOFFDISTANCE"/>
+        /// Calculate current distance to camera, and compare it to <see cref="CutOffDistanceM2"/>
         /// </summary>
         /// <returns>True, if is now out-of-scope</returns>
         public bool isOutOfDistance()
@@ -1010,15 +1018,13 @@ public bool isOutOfDistance()
                 float.IsNaN(WorldLocation.Location.Y) ||
                 float.IsNaN(WorldLocation.Location.Z))
             {
-                DistanceSquared = (Car != null && Car.Train != null && Car.Train.IsActualPlayerTrain ?
-                Math.Max(CUTOFFDISTANCE, Car.Train.Length * Car.Train.Length) : CUTOFFDISTANCE) + 1;
+                DistanceSquared = float.MaxValue;
                 return true;
             }
 
             DistanceSquared = WorldLocation.GetDistanceSquared(WorldLocation, Viewer.Camera.CameraWorldLocation);
 
-            return DistanceSquared > (Car != null && Car.Train != null && Car.Train.IsActualPlayerTrain ? 
-                Math.Max (CUTOFFDISTANCE, Car.Train.Length * Car.Train.Length) +2500f : CUTOFFDISTANCE);
+            return DistanceSquared > CutOffDistanceM2;
         }
 
         /// <summary>
@@ -1037,8 +1043,7 @@ public bool Activate()
                 {
                     // (ActivationConditions.Distance == 0) means distance checking disabled
                     if ((ActivationConditions.Distance == 0 || DistanceSquared < ActivationConditions.Distance * ActivationConditions.Distance) &&
-                        DistanceSquared < (Car != null && Car.Train != null && Car.Train.IsActualPlayerTrain ?
-                        Math.Max(CUTOFFDISTANCE, Car.Train.Length * Car.Train.Length) +2500f : CUTOFFDISTANCE))
+                        DistanceSquared < CutOffDistanceM2)
                         return true;
                 }
                 else
@@ -1063,8 +1068,7 @@ public bool DeActivate()
             if (WorldLocation != WorldLocation.None)
             {
                 if (DeactivationConditions.Distance != 0 && DistanceSquared > DeactivationConditions.Distance * DeactivationConditions.Distance ||
-                    DistanceSquared > (Car != null && Car.Train != null && Car.Train.IsActualPlayerTrain ?
-                    Math.Max(CUTOFFDISTANCE, Car.Train.Length * Car.Train.Length) + 2500f : CUTOFFDISTANCE))
+                    DistanceSquared > CutOffDistanceM2)
                     return true;
             }