Automatic merge of T1.5.1-1695-gade019506 and 17 pull requests

- Pull request #570 at f4a7495: glTF 2.0 support with PBR lighting
- Pull request #900 at 4629736: DMI in 3D cab + two more dials
- Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter
- Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes
- Pull request #1052 at 5bbc476: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at de91cc4: Train Forces popup Window.
- Pull request #1064 at 9b3415e: Add Train Info tab to Help window (F1)
- Pull request #1066 at 62c89c1: Log derailment, using TraceInformation.
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #1000 at d8d9709: Locomotive operation from control car
- Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes
- Pull request #1057 at 50c3789: Switchable brake system
- Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051
- Pull request #1070 at 3a66597: Fix a NullReferenceException in TCS scripts
- Pull request #1055 at bab8b3e: Route Based TTrack Sounds
- Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #1049 at 4dd8c4f: Re-organise document storage and access

Author: openrails-bot

Source/Orts.Formats.Msts/SoundManagmentFile.cs

@@ -393,7 +393,7 @@ public class Variable_Trigger : Trigger
     {
         public enum Events { Speed_Inc_Past, Speed_Dec_Past, Distance_Inc_Past, Distance_Dec_Past,
         Variable1_Inc_Past, Variable1_2_Inc_Past, Variable1_3_Inc_Past, Variable1_4_Inc_Past, Variable1_Dec_Past, Variable1_2_Dec_Past, Variable1_3_Dec_Past, Variable1_4_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past, AngleofAttack_Inc_Past, AngleofAttack_Dec_Past, WheelRpM_Dec_Past, WheelRPM_Inc_Past, TrackJoints_Inc_Past, TrackJoints_Dec_Past, CarOnSwitch_Inc_Past, CarOnSwitch_Dec_Past, CarOnXover_Inc_Past, CarOnXover_Dec_Past, WagonAxles_Inc_Past, WagonAxles_Dec_Past,
-            ConcreteSleepers_Inc_Past, ConcreteSleepers_Dec_Past, CarInTunnel_Inc_Past, CarInTunnel_Dec_Past
+            ConcreteSleepers_Inc_Past, ConcreteSleepers_Dec_Past, CarInTunnel_Inc_Past, CarInTunnel_Dec_Past,CarCameraDistance_Inc_Past, CarCameraDistance_Dec_Past
         };
 
         public Events Event;
@@ -456,6 +456,8 @@ public Variable_Trigger(STFReader f)
                 case "concretesleepers_dec_past": Event = Events.ConcreteSleepers_Dec_Past; break;
                 case "carintunnel_inc_past": Event = Events.CarInTunnel_Inc_Past; break;
                 case "carintunnel_dec_past": Event = Events.CarInTunnel_Dec_Past; break;
+                case "carcameradistance_inc_past": Event = Events.CarCameraDistance_Inc_Past; break;
+                case "carcameradistance_dec_past": Event = Events.CarCameraDistance_Dec_Past; break;
             }
 
 

Source/RunActivity/Viewer3D/Sound.cs

@@ -1988,6 +1988,7 @@ public override void TryTrigger( )
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarOnXover_Dec_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.ConcreteSleepers_Dec_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Dec_Past:
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Dec_Past:
                     if (newValue < SMS.Threshold)
                     {
                         Signaled = true;
@@ -2013,6 +2014,7 @@ public override void TryTrigger( )
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarOnXover_Inc_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.ConcreteSleepers_Inc_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Inc_Past:
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Inc_Past:
                     if (newValue > SMS.Threshold)
                     {
                         Signaled = true;
@@ -2124,7 +2126,9 @@ private float ReadValue()
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Dec_Past:
                 case Orts.Formats.Msts.Variable_Trigger.Events.CarInTunnel_Inc_Past:
                     return car.TrackSoundInTunnelTriggered;
-
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Dec_Past:
+                case Orts.Formats.Msts.Variable_Trigger.Events.CarCameraDistance_Inc_Past:
+                    return car.CarTrackControlledDistanceM;
 
                 default:
                     return 0;