Add access to a curve squeal sms file

Author: peternewell

Source/Orts.Formats.Msts/SoundManagmentFile.cs

@@ -36,6 +36,7 @@ public class SharedSMSFileManager
         public static int SwitchSMSNumber;
         public static int CurveSMSNumber;
         public static int CurveSwitchSMSNumber;
+        public static int CurveSquealSMSNumber;
         public static bool AutoTrackSound = false;
 
         public static SoundManagmentFile Get(string path)
@@ -198,7 +199,7 @@ public struct CurvePoint
 
     public class VolumeCurve
     {
-        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
+        public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled, AngleofAttackControlled, CarFrictionControlled };
 
         public Controls Control = Controls.None;
         public float Granularity = 1.0f;
@@ -222,6 +223,8 @@ public VolumeCurve(STFReader stf)
                 case "variable3controlled": Control = Controls.Variable3Controlled; break;
                 case "brakecylcontrolled": Control = Controls.BrakeCylControlled; break;
                 case "curveforcecontrolled": Control = Controls.CurveForceControlled; break;
+                case "angleofattackcontrolled": Control = Controls.AngleofAttackControlled; break;
+                case "carfrictioncontrolled": Control = Controls.CarFrictionControlled; break;
                 default: STFException.TraceWarning(stf, "Crash expected: Skipped unknown VolumeCurve/Frequencycurve type " + type); stf.SkipRestOfBlock(); return;
             }
             stf.ParseBlock(new STFReader.TokenProcessor[] {

Source/RunActivity/Viewer3D/Sound.cs

@@ -424,7 +424,14 @@ public bool UpdateCarOnSwitchAndCurve()
                     // here check for curve
                     var carPreviouslyOnCurve = CarOnCurve;
                     CarOnCurve = false;
-                    if ((Car.CurrentCurveRadiusM > 0 && (Car.CurrentCurveRadiusM < 301
+
+                    // Uses newer AoA approach
+                    if (SharedSMSFileManager.CurveSquealSMSNumber != -1 && Car.CurrentCurveRadiusM > 0)
+                    {
+                        CarOnCurve = true;
+                    }
+                    // Uses original curve sound system
+                    else if (SharedSMSFileManager.CurveSwitchSMSNumber != -1 && (Car.CurrentCurveRadiusM > 0 && (Car.CurrentCurveRadiusM < 301
                          || (Car.CurrentCurveRadiusM < 350 && Car.WagonType == TrainCar.WagonTypes.Freight))) ||
                         (CarBehind.CurrentCurveRadiusM > 0 && (CarBehind.CurrentCurveRadiusM < 301
                          || (CarBehind.CurrentCurveRadiusM < 350 && Car.WagonType == TrainCar.WagonTypes.Freight))))
@@ -444,6 +451,12 @@ public bool UpdateCarOnSwitchAndCurve()
                         {
                             _curTType = SharedSMSFileManager.CurveSwitchSMSNumber;
                         }
+                        // newer curve squeal sounds
+                        else if (CarOnCurve && SharedSMSFileManager.CurveSquealSMSNumber != -1)
+                        {
+                            _curTType = SharedSMSFileManager.CurveSquealSMSNumber;
+                        }
+                        // original curve squeal
                         else if (CarOnCurve && SharedSMSFileManager.CurveSMSNumber != -1)
                         {
                             _curTType = SharedSMSFileManager.CurveSMSNumber;
@@ -1502,6 +1515,8 @@ private float ReadValue(Orts.Formats.Msts.VolumeCurve.Controls control, MSTSWago
                 case Orts.Formats.Msts.VolumeCurve.Controls.Variable3Controlled: return car.Variable3;
                 case Orts.Formats.Msts.VolumeCurve.Controls.BrakeCylControlled: return car.BrakeSystem.GetCylPressurePSI();
                 case Orts.Formats.Msts.VolumeCurve.Controls.CurveForceControlled: return car.CurveForceNFiltered;
+                case Orts.Formats.Msts.VolumeCurve.Controls.AngleofAttackControlled: return car.AngleOfAttackmRad;
+                case Orts.Formats.Msts.VolumeCurve.Controls.CarFrictionControlled: return car.Train.WagonCoefficientFriction;
                 default: return 0;
             }
         }

Source/RunActivity/Viewer3D/Viewer.cs

@@ -611,6 +611,14 @@ public void InitializeAutomaticTrackSounds()
             }
             if (SharedSMSFileManager.CurveSMSNumber != -1) SharedSMSFileManager.AutoTrackSound = true;
 
+            SharedSMSFileManager.CurveSquealSMSNumber = Simulator.TRK.Tr_RouteFile.CurveSquealSMSNumber;
+            if (SharedSMSFileManager.CurveSquealSMSNumber < -1 || SharedSMSFileManager.CurveSquealSMSNumber >= TrackTypes.Count)
+            {
+                SharedSMSFileManager.CurveSquealSMSNumber = -1;
+                Trace.TraceInformation("Curve Squeal SMS Number out of range");
+            }
+            if (SharedSMSFileManager.CurveSMSNumber != -1) SharedSMSFileManager.AutoTrackSound = true;
+
             SharedSMSFileManager.CurveSwitchSMSNumber = Simulator.TRK.Tr_RouteFile.CurveSwitchSMSNumber;
             if (SharedSMSFileManager.CurveSwitchSMSNumber < -1 || SharedSMSFileManager.CurveSwitchSMSNumber >= TrackTypes.Count)
             {