Merge remote-tracking branch 'upstream/master' into docs-move-online

Author: cjakeman

Source/Documentation/Manual/appendices.rst

@@ -678,6 +678,19 @@ The value speed is the required speed value in dimension as set by the relevant
 Inclusion of speed definition is optional and need not be set if only approach control position functions
 are used.
 
+Signal light parameters
+-----------------------
+
+.. index::
+  single: ORTSSignalLightTex
+
+It is possible to have different light textures in the same signal, by inserting
+the following parameter in the signal light definition::
+
+    ORTSSignalLightTex ( "name" )
+
+Where **name** is the name of the texture to be used for the signal light.
+
 Signal aspect parameters
 ------------------------
 The following parameters can be included in signal aspect definitions.

Source/Orts.Formats.Msts/SignalConfigurationFile.cs

@@ -889,6 +889,8 @@ public class SignalLight
         public float Radius { get; private set; }
         /// <summary>is the SIGLIGHT flag SEMAPHORE_CHANGE set?</summary>
         public bool SemaphoreChange { get; private set; }
+        /// <summary> The name of the texture to use for this light, overriding signal's default </summary>
+        public string LightTextureName { get; private set; } = String.Empty;
 
         /// <summary>
         /// Default constructor used during file parsing.
@@ -917,6 +919,9 @@ public SignalLight(STFReader stf)
                             default: stf.StepBackOneItem(); STFException.TraceInformation(stf, "Skipped unknown SignalLight flag " + stf.ReadString()); break;
                         }
                 }),
+                new STFReader.TokenProcessor("ortssignallighttex", ()=>{
+                    LightTextureName = stf.ReadStringBlock("").ToLowerInvariant();
+                }),
             });
         }
 

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -1522,13 +1522,11 @@ public void ReverseCars()
             // Reverse brake hose connections and angle cocks
             for (var i = 0; i < Cars.Count; i++)
             {
-                var ac = Cars[i].BrakeSystem.AngleCockAOpen;
-                Cars[i].BrakeSystem.AngleCockAOpen = Cars[i].BrakeSystem.AngleCockBOpen;
-                Cars[i].BrakeSystem.AngleCockBOpen = ac;
-                if (i == Cars.Count - 1)
-                    Cars[i].BrakeSystem.FrontBrakeHoseConnected = false;
-                else
-                    Cars[i].BrakeSystem.FrontBrakeHoseConnected = Cars[i + 1].BrakeSystem.FrontBrakeHoseConnected;
+                var bs = Cars[i].BrakeSystem;
+                (bs.AngleCockBOpen, bs.AngleCockAOpen) = (bs.AngleCockAOpen, bs.AngleCockBOpen);
+                (bs.AngleCockBOpenAmount, bs.AngleCockAOpenAmount) = (bs.AngleCockAOpenAmount, bs.AngleCockBOpenAmount);
+                (bs.AngleCockBOpenTime, bs.AngleCockAOpenTime) = (bs.AngleCockAOpenTime, bs.AngleCockBOpenTime);
+                (bs.RearBrakeHoseConnected, bs.FrontBrakeHoseConnected) = (bs.FrontBrakeHoseConnected, bs.RearBrakeHoseConnected);
             }
             // Reverse the actual order of the cars in the train.
             Cars.Reverse();
@@ -21666,7 +21664,7 @@ public void UpdateRemoteTrainPos(float elapsedClockSeconds)
                 {
                     car.SpeedMpS = SpeedMpS;
                     if (car.Flipped) car.SpeedMpS = -car.SpeedMpS;
-                    car.AbsSpeedMpS = car.AbsSpeedMpS * (1 - elapsedClockSeconds ) + targetSpeedMpS * elapsedClockSeconds;
+                    car.AbsSpeedMpS = car.AbsSpeedMpS * (1 - elapsedClockSeconds ) + Math.Abs(targetSpeedMpS) * elapsedClockSeconds;
                     if (car.IsDriveable && car is MSTSWagon)
                     {
                         (car as MSTSWagon).WheelSpeedMpS = SpeedMpS;
@@ -21685,7 +21683,7 @@ public void UpdateRemoteTrainPos(float elapsedClockSeconds)
                             else if (car is MSTSSteamLocomotive)
                             {
                                 (car as MSTSSteamLocomotive).Variable1 = car.AbsSpeedMpS / car.DriverWheelRadiusM / MathHelper.Pi * 5;
-                                (car as MSTSSteamLocomotive).Variable2 = 0.7f;
+                                (car as MSTSSteamLocomotive).Variable2 = 70f;
                             }
                         }
                         else if (car is MSTSLocomotive)

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/ManualBraking.cs

@@ -128,7 +128,7 @@ public override void Update(float elapsedClockSeconds)
             SteamBrakeCompensation = 1.0f;
 
             // Process manual braking on all cars
-            if (lead != null)
+            if (lead != null && lead.BrakemanBrakeController != null)
             {
                 BrakemanBrakeSettingValue = lead.BrakemanBrakeController.CurrentValue;
             }

Source/RunActivity/Content/TrainOperations/TrainOperationsMap.png

@@ -29,6 +29,7 @@
 using Orts.Simulation.Physics;
 using Orts.Simulation.RollingStocks;
 using Orts.Simulation.Signalling;
+using Orts.Viewer3D.Popups;
 using ORTS.Common;
 using ORTS.Common.Input;
 using ORTS.Settings;
@@ -129,7 +130,10 @@ public virtual void Reset()
         public void Activate()
         {
             ScreenChanged();
-            OnActivate(Viewer.Camera == this);
+            if (!Viewer.IsFormationReversed)// Avoids flickering
+            {
+                OnActivate(Viewer.Camera == this);
+            }
             Viewer.Camera = this;
             Viewer.Simulator.PlayerIsInCab = Style == Styles.Cab || Style == Styles.ThreeDimCab;
             Update(ElapsedTime.Zero);
@@ -266,7 +270,7 @@ protected void ZoomByMouseWheel(float speed)
         {
             // Will not zoom-in-out when help windows is up.
             // TODO: Property input processing through WindowManager.
-            if (UserInput.IsMouseWheelChanged && !Viewer.HelpWindow.Visible)
+            if (UserInput.IsMouseWheelChanged && !Viewer.HelpWindow.Visible && !Viewer.RenderProcess.IsMouseVisible)
             {
                 var fieldOfView = MathHelper.Clamp(FieldOfView - speed * UserInput.MouseWheelChange / 10, 1, 135);
                 new FieldOfViewCommand(Viewer.Log, fieldOfView);
@@ -1076,7 +1080,7 @@ protected override void OnActivate(bool sameCamera)
             }
             else
             {
-                isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
+                isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
             }
 
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)

Source/RunActivity/Content/TrainOperations/TrainOperationsMap32.png

@@ -78,11 +78,17 @@ public override void PrepareFrame(RenderFrame frame, ORTS.Common.ElapsedTime ela
                 var newLabels = new Dictionary<TrainCar, LabelPrimitive>(labels.Count);
                 var cars = Owner.Viewer.World.Trains.Cars;
                 var cameraLocation = Owner.Viewer.Camera.CameraWorldLocation;
-                var carID = Owner.Viewer.TrainCarOperationsViewerWindow.CurrentCarID;
+
                 //data from Webpage
                 var trainCarWebpage = Owner.Viewer.TrainCarOperationsWebpage;
+                var trainCarWebpageActive = trainCarWebpage != null && trainCarWebpage.Connections > 0 && trainCarWebpage.TrainCarSelected;
                 var carIDWebpage = trainCarWebpage != null && trainCarWebpage.Connections > 0 ? trainCarWebpage.CurrentCarID : "";
-                bool isVisibleTrainCarViewerOrWebpage = Owner.Viewer.TrainCarOperationsViewerWindow.Visible || (trainCarWebpage != null && trainCarWebpage.Connections > 0 && Owner.Viewer.TrainCarOperationsWebpage.TrainCarSelected);
+
+                //shows only one CarID label when traincaroperationsviewer is not visible
+                var trainCarOperationsViewer = Owner.Viewer.TrainCarOperationsViewerWindow;
+                var carID = Owner.Viewer.TrainCarOperationsViewerWindow.Visible ? trainCarOperationsViewer.CurrentCarID : trainCarWebpageActive ? trainCarWebpage.CurrentCarID : Owner.Viewer.TrainCarOperationsViewerWindow.CurrentCarID;
+
+                bool isVisibleTrainCarViewerOrWebpage = (Owner.Viewer.TrainCarOperationsWindow.Visible && !trainCarOperationsViewer.Visible) || trainCarOperationsViewer.Visible || trainCarWebpageActive;
                 foreach (var car in cars.Keys)
                 {
                     // Calculates distance between camera and platform label.