Automatic merge of T1.5.1-722-g01614a154 and 18 pull requests

- Pull request #570 at c59c788: Experimental glTF 2.0 support with PBR lighting
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #865 at 3b5a2fe: Dispatcher window improvements
- Pull request #874 at f8dbeab: Dynamic brake controller refactoring
- Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at 481ed9d: Blueprint/train car operations UI window
- Pull request #885 at c81447b: feat: Add notifications to Menu
- Pull request #886 at 697a4b6: Scene viewer extension to TrackViewer
- Pull request #888 at d7daf62: docs: Document player application model
- Pull request #890 at 39a9fa4: Allow depart early
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #893 at bf8876b: Signal errors
- Pull request #894 at 794fddf: Correct Decrease Colour
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #897 at 0a9d939: feat: Improved system information collection
- Pull request #898 at e271395: Extra line with all the arguments for debugging purposes in logfile
- Pull request #900 at 42ea7ad: DMI updates

Author: openrails-bot

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

@@ -340,6 +340,7 @@ public override void Save(BinaryWriter outf)
             outf.Write(FullServPressurePSI);
             outf.Write((int)TripleValveState);
             outf.Write(FrontBrakeHoseConnected);
+            outf.Write(RearBrakeHoseConnected);
             outf.Write(AngleCockAOpen);
             outf.Write(AngleCockAOpenAmount);
             outf.Write(AngleCockBOpen);
@@ -368,6 +369,7 @@ public override void Restore(BinaryReader inf)
             FullServPressurePSI = inf.ReadSingle();
             TripleValveState = (ValveState)inf.ReadInt32();
             FrontBrakeHoseConnected = inf.ReadBoolean();
+            RearBrakeHoseConnected = inf.ReadBoolean();
             AngleCockAOpen = inf.ReadBoolean();
             AngleCockAOpenAmount = inf.ReadSingle();
             AngleCockBOpen = inf.ReadBoolean();

Source/RunActivity/Viewer3D/Cameras.cs

@@ -1284,7 +1284,17 @@ protected override void OnActivate(bool sameCamera)
             var carPosition = !(TrainCarViewer.CarPosition < trainCars.Count()) ? TrainCarViewer.CarPosition - 1 : TrainCarViewer.CarPosition;
             var isDownCameraOutsideFront = UserInput.IsDown(UserCommand.CameraOutsideFront);
             var isDownCameraOutsideRear = UserInput.IsDown(UserCommand.CameraOutsideRear);
-            var isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage.TrainCarSelected);
+
+            bool isVisibleTrainCarViewerOrWebpage;
+            if (Viewer.TrainCarOperationsWebpage == null) 
+            {
+                // when starting Open Rails by means of a restore Viewer.TrainCarOperationsWebpage not yet available
+                isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible;
+            }
+            else
+            {
+                isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage.TrainCarSelected);
+            }
 
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition || isDownCameraOutsideFront || isDownCameraOutsideRear)
             {

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -144,6 +144,8 @@ protected internal override void Save(BinaryWriter outf)
             outf.Write(Location.Y);
             outf.Write(Location.Width);
             outf.Write(Location.Height);
+
+            outf.Write(CarPosition);
         }
         protected internal override void Restore(BinaryReader inf)
         {
@@ -154,6 +156,8 @@ protected internal override void Restore(BinaryReader inf)
             LocationRestore.Width = inf.ReadInt32();
             LocationRestore.Height = inf.ReadInt32();
 
+            CarPosition = inf.ReadInt32();
+
             // Display window
             SizeTo(LocationRestore.Width, LocationRestore.Height);
             MoveTo(LocationRestore.X, LocationRestore.Y);

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

@@ -133,9 +133,6 @@ public struct ListLabel
         }
         public List<ListLabel> Labels = new List<ListLabel>();
 
-        public List<bool> RearBrakes = new List<bool>();
-        public bool RefreshRestoredData = false;
-
         Train PlayerTrain;
         int LastPlayerTrainCars;
         bool LastPlayerLocomotiveFlippedState;
@@ -157,13 +154,7 @@ protected internal override void Save(BinaryWriter outf)
             outf.Write(Location.Width);
             outf.Write(Location.Height);
 
-            // Saves brake hose state
-            var carsCount = PlayerTrain.Cars.Count();
-            outf.Write(carsCount);
-            foreach (var data in RearBrakes)
-            {
-                outf.Write(data);
-            }
+            outf.Write(SelectedCarPosition);
         }
         protected internal override void Restore(BinaryReader inf)
         {
@@ -174,13 +165,7 @@ protected internal override void Restore(BinaryReader inf)
             LocationRestore.Width = inf.ReadInt32();
             LocationRestore.Height = inf.ReadInt32();
 
-            // Restores brake hose state
-            var carsCount = inf.ReadInt32();
-            for (int i = 0; i < carsCount; i++)
-            {
-                RearBrakes.Add(inf.ReadBoolean());
-            }
-            RefreshRestoredData = true;
+            SelectedCarPosition = inf.ReadInt32();
 
             // Display window
             SizeTo(LocationRestore.Width, LocationRestore.Height);
@@ -334,19 +319,6 @@ void AddSpace()
                         line.AddSpace(textHeight / 2, line.RemainingHeight);
                     }
 
-                    if (RefreshRestoredData)
-                    {   // Restores brake hose
-                        RefreshRestoredData = false;
-                        for (var i = 0; i < PlayerTrain.Cars.Count; i++)
-                        {
-                            (PlayerTrain.Cars[i] as MSTSWagon).BrakeSystem.RearBrakeHoseConnected = RearBrakes[i];
-                        }
-                    }
-                    if (RearBrakes.Count == 0)
-                    {   // Init brake hose
-                        RearBrakes = Enumerable.Repeat(true, PlayerTrain.Cars.Count).ToList();
-                    }
-
                     if (LabelPositionTop.Count == 0)
                     {
                         var n = scrollbox.Position.Y;// first row
@@ -864,7 +836,6 @@ public buttonRearBrakeHose(int x, int y, int size, Viewer viewer, TrainCar car,
             {
                 trainCarOperations.updateWarningCarPosition(carPosition, Texture, BrakeHoseDis);
             }
-            Viewer.TrainCarOperationsWindow.RearBrakes[carPosition] = (viewer.PlayerTrain.Cars[carPosition] as MSTSWagon).BrakeSystem.RearBrakeHoseConnected;
         }
     }
     class buttonFrontAngleCock : Image

Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs

@@ -424,6 +424,8 @@ public static void Save()
                 if (MPManager.IsMultiPlayer() && MPManager.IsServer())
                     MPManager.OnlineTrains.Save (outf);
 
+                Viewer.TrainCarOperationsWebpage.Save(outf);
+
                 SaveEvaluation(outf);
 
                 // Write out position within file so we can check when restoring.
@@ -504,6 +506,8 @@ void Resume(UserSettings settings, string[] args)
                     if (MPManager.IsMultiPlayer() && MPManager.IsServer())
                         MPManager.OnlineTrains.Restore(inf);
 
+                    WebServices.TrainCarOperationsWebpage.Restore(inf);
+
                     ResumeEvaluation(inf);
 
                     var restorePosition = inf.BaseStream.Position;

Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs

@@ -30,6 +30,7 @@
 using Orts.Common;
 using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
 using ORTS.Scripting.Api;
+using System.IO;
 
 namespace Orts.Viewer3D.WebServices
 {
@@ -74,7 +75,12 @@ public OperationsStatus(int amountOfCars)
 
         private readonly Viewer Viewer;
 
-        public bool TrainCarSelected = false;
+        // static fields because during the restore this objcet not yet created
+        public static bool TrainCarFromRestore;
+        public static bool TrainCarSelectedFromRestore;
+        public static int TrainCarSelectedPositionFromRestore;
+
+        public bool TrainCarSelected;
         public int TrainCarSelectedPosition;
 
         public int Connections = 0;
@@ -204,6 +210,20 @@ public void handleReceiveAndSend()
             }
         }
 
+        public void Save(BinaryWriter outf) 
+        {
+            outf.Write(TrainCarSelected);
+            outf.Write(TrainCarSelectedPosition);
+        }
+
+        public static void Restore(BinaryReader inf)
+        {
+            TrainCarSelectedFromRestore = inf.ReadBoolean();
+            TrainCarSelectedPositionFromRestore = inf.ReadInt32();
+
+            TrainCarFromRestore = true;
+        }
+
         private void handleReceive()
         {
             if (MessageReceived)
@@ -428,9 +448,16 @@ private void fillStatusArrowLeft(int carPosition)
         {
             string filename;
 
-            if (Viewer.TrainCarOperationsWindow.CarIdClicked) {
-                // on the train operations window wagon has been clicked
-                // wagon on webpage gets selected also
+            if (TrainCarFromRestore)
+            {
+                TrainCarSelected = TrainCarSelectedFromRestore;
+                TrainCarSelectedPosition = TrainCarSelectedPositionFromRestore;
+
+                TrainCarFromRestore = false;
+            }
+
+            if (Viewer.TrainCarOperationsWindow.Visible) { 
+                // take the carposition of the Traincar Operations Window
                 TrainCarSelected = true;
                 TrainCarSelectedPosition = Viewer.TrainCarOperationsWindow.SelectedCarPosition;
             }

Source/RunActivity/Viewer3D/WebServices/Web/TrainCarOperations/index.js

@@ -22,7 +22,10 @@
 // socket functions
 //
 
-let initStillToBeDone = true;
+// scrolling
+const windowHeight = (window.innerHeight || document.documentElement.clientHeight);
+const possibleRows = Math.floor((windowHeight - 35) / 36);
+let rowToScrollToPrevious = 0;
 
 function createSocket() {
 
@@ -84,16 +87,17 @@ function handleMessage(json) {
     console.log("handleMessage: ", json);
 
     if (json.Type == "init") {
-        var html = document.body;
+        const html = document.body;
         while (html.firstChild) {
             html.removeChild(html.firstChild);
         }
-        var elemDiv = document.createElement('div');
+        const elemDiv = document.createElement('div');
         elemDiv.id = "overlay";
         document.body.appendChild(elemDiv);
 
         const tbl = document.createElement("table");
         const th = document.createElement("th");
+        th.setAttribute("id", "th");
         const thText = document.createTextNode("Train Car Operations");
         th.appendChild(thText);
         th.colSpan = json.Columns + 1;
@@ -125,28 +129,44 @@ function handleMessage(json) {
     }
 
     for (let i = 0; i < json.Operations.length; i++) {
-        let row = json.Operations[i].Row;
-        let column = json.Operations[i].Column;
-        let id = "button:" + row + ":" + column;
-        let button = document.getElementById(id);
+        const row = json.Operations[i].Row;
+        const column = json.Operations[i].Column;
+        const id = "button:" + row + ":" + column;
+        const button = document.getElementById(id);
         button.innerHTML = "<img src='" + json.Operations[i].Filename + "' />";
+
         if (json.Operations[i].Filename.includes("Arrow")) {
-            if (!isInView(button)) {
-                console.log("scrollTo");
-                button.scrollIntoView({ behavior: "smooth" });
+            const rowToScrollTo = Math.floor(row - (possibleRows / 2));
+            if (rowToScrollTo < 0) {
+                const thToScrollTo = document.getElementById("th");
+                thToScrollTo.scrollIntoView({ behavior: "smooth" });
+                rowToScrollToPrevious = 0;
+            } else {
+                const tst1Boven = rowToScrollTo < rowToScrollToPrevious - 8;
+                console.log("tst1Boven:" + tst1Boven);
+                const tst1Onder = rowToScrollTo > rowToScrollToPrevious + (possibleRows / 2) - 5;
+                console.log("tst1Onder:" + tst1Onder);
+                if ((rowToScrollTo < rowToScrollToPrevious - 8) ||
+                    (rowToScrollTo > rowToScrollToPrevious + (possibleRows / 2) - 5)) {
+                    console.log("ScrollTo");
+                    const idToScrollTo = "button:" + rowToScrollTo + ":" + 0;
+                    const buttonToScrollTo = document.getElementById(idToScrollTo);
+                    buttonToScrollTo.scrollIntoView({ behavior: "smooth" });
+                    rowToScrollToPrevious = rowToScrollTo;
+                }
             }
         }
         button.disabled = !json.Operations[i].Enabled;
         button.style.cursor = json.Operations[i].Enabled ? "pointer" : "";
     }
 
     for (let i = 0; i < json.CarIdColor.length; i++) {
-        let id = "label:" + i;
-        let label = document.getElementById(id);
+        const id = "label:" + i;
+        const label = document.getElementById(id);
         label.style.color = json.CarIdColor[i];
     }
 
-    // turn off the dark overlay if it's still on
+    // turn off the dark overlay if it's still on after a reconnect
     document.getElementById("overlay").style.display = "none";
 }
 
@@ -163,28 +183,7 @@ function sleep(time) {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
 
-function isInView(el) {
-
-    var rect = el.getBoundingClientRect(),
-        vWidth = window.innerWidth || document.documentElement.clientWidth,
-        vHeight = window.innerHeight || document.documentElement.clientHeight,
-        efp = function (x, y) { return document.elementFromPoint(x, y) };
-
-    // Return false if it's not in the viewport
-    if (rect.right < 0 || rect.bottom < 0
-        || rect.left > vWidth || rect.top > vHeight)
-        return false;
-
-    // Return true if any of its four corners are visible
-    return (
-        el.contains(efp(rect.left, rect.top))
-        || el.contains(efp(rect.right, rect.top))
-        || el.contains(efp(rect.right, rect.bottom))
-        || el.contains(efp(rect.left, rect.bottom))
-    );
-}
-
 //
 // main
 //
-let websocket = createSocket();
+const websocket = createSocket();