Automatic merge of T1.5.1-799-gb02a6e5d3 and 14 pull requests

- Pull request #570 at 3539862: 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 #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at f9f6804: Blueprint/train car operations UI window
- Pull request #885 at 8f94333: feat: Add notifications to Menu
- Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #897 at 42f1dd9: feat: Improved system information collection
- Pull request #899 at b227eec: Duplex steam engines - Booster Engine addition
- Pull request #903 at 0d6d045: Downloading route content (Github, zip)
- Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
- Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR

Author: openrails-bot

Source/RunActivity/Viewer3D/Materials.cs

@@ -1618,6 +1618,7 @@ public class Label3DMaterial : SpriteBatchMaterial
     {
         public readonly Texture2D Texture;
         public readonly WindowTextFont Font;
+        public readonly WindowTextFont BigFont;
 
         readonly List<Rectangle> TextBoxes = new List<Rectangle>();
 
@@ -1627,6 +1628,7 @@ public Label3DMaterial(Viewer viewer)
             Texture = new Texture2D(SpriteBatch.GraphicsDevice, 1, 1, false, SurfaceFormat.Color);
             Texture.SetData(new[] { Color.White });
             Font = Viewer.WindowManager.TextManager.GetScaled("Arial", 12, System.Drawing.FontStyle.Bold, 1);
+            BigFont = Viewer.WindowManager.TextManager.GetScaled("Arial", 24, System.Drawing.FontStyle.Bold, 2);
         }
 
         public override void SetState(GraphicsDevice graphicsDevice, Material previousMaterial)

Source/RunActivity/Viewer3D/Popups/LabelPrimitive.cs

@@ -34,7 +34,7 @@ public class LabelPrimitive : RenderPrimitive
 
         readonly Viewer Viewer;
         readonly float OffsetY;
-
+        public bool InsideBox { set; get; }
         public LabelPrimitive(Label3DMaterial material, Color color, Color outline, float offsetY)
         {
             Material = material;
@@ -43,6 +43,15 @@ public LabelPrimitive(Label3DMaterial material, Color color, Color outline, floa
             Outline = outline;
             OffsetY = offsetY;
         }
+        public LabelPrimitive(Label3DMaterial material, Color color, Color outline, float offsetY, bool insideBox)
+        {
+            Material = material;
+            Viewer = material.Viewer;
+            Color = color;
+            Outline = outline;
+            OffsetY = offsetY;
+            InsideBox = insideBox;
+        }
 
         public override void Draw(GraphicsDevice graphicsDevice)
         {
@@ -55,13 +64,17 @@ public override void Draw(GraphicsDevice graphicsDevice)
             if (lineLocation2DStart.Z > 1 || lineLocation2DStart.Z < 0)
                 return; // Out of range or behind the camera
 
-            lineLocation3D.Y += 10;
+            lineLocation3D.Y += InsideBox ? 0 : 10;
             var lineLocation2DEndY = Viewer.GraphicsDevice.Viewport.Project(lineLocation3D, Viewer.Camera.XnaProjection, Viewer.Camera.XnaView, Matrix.Identity).Y;
 
             var labelLocation2D = Material.GetTextLocation((int)lineLocation2DStart.X, (int)lineLocation2DEndY - Material.Font.Height, Text);
             lineLocation2DEndY = labelLocation2D.Y + Material.Font.Height;
 
-            Material.Font.Draw(Material.SpriteBatch, labelLocation2D, Text, Color, Outline);
+            if (InsideBox)
+                Material.BigFont.Draw(Material.SpriteBatch, labelLocation2D, Text, Color, Outline);
+            else
+                Material.Font.Draw(Material.SpriteBatch, labelLocation2D, Text, Color, Outline);
+
             Material.SpriteBatch.Draw(Material.Texture, new Vector2(lineLocation2DStart.X - 1, lineLocation2DEndY), null, Outline, 0, Vector2.Zero, new Vector2(4, lineLocation2DStart.Y - lineLocation2DEndY), SpriteEffects.None, lineLocation2DStart.Z);
             Material.SpriteBatch.Draw(Material.Texture, new Vector2(lineLocation2DStart.X, lineLocation2DEndY), null, Color, 0, Vector2.Zero, new Vector2(2, lineLocation2DStart.Y - lineLocation2DEndY), SpriteEffects.None, lineLocation2DStart.Z);
         }

Source/RunActivity/Viewer3D/Popups/OSDCars.cs

@@ -78,32 +78,54 @@ 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 carIDWebpage = trainCarWebpage != null && trainCarWebpage.Connections > 0 ? trainCarWebpage.CurrentCarID : "";
+                bool isVisibleTrainCarViewerOrWebpage = Owner.Viewer.TrainCarOperationsViewerWindow.Visible || (trainCarWebpage != null && trainCarWebpage.Connections > 0 && Owner.Viewer.TrainCarOperationsWebpage.TrainCarSelected);
                 foreach (var car in cars.Keys)
                 {
                     // Calculates distance between camera and platform label.
                     var distance = WorldLocation.GetDistance(car.WorldPosition.WorldLocation, cameraLocation).Length();
-                    if (distance <= MaximumDistance)
+                    var carBodyLength = car.CarBodyLengthM < 21 ? 21 : car.CarBodyLengthM;
+                    if ((!isVisibleTrainCarViewerOrWebpage || !car.IsPlayerTrain) && distance <= MaximumDistance)
                     {
                         if ((State == DisplayState.Cars) || (State == DisplayState.Trains && (car.Train == null || car.Train.FirstCar == car)))
                         {
                             if (labels.ContainsKey(car))
                                 newLabels[car] = labels[car];
                             else
-                                newLabels[car] = new LabelPrimitive(Owner.Label3DMaterial, Color.Blue, Color.White, car.CarHeightM) { Position = car.WorldPosition };
+                                newLabels[car] = new LabelPrimitive(Owner.Label3DMaterial, Color.Blue, Color.White, car.CarHeightM, false) { Position = car.WorldPosition };
 
+                            newLabels[car].InsideBox = false;
                             newLabels[car].Text = State == DisplayState.Cars || car.Train == null ? car.CarID : car.Train.Name;
 
                             // Change color with distance.
                             var ratio = (MathHelper.Clamp(distance, MinimumDistance, MaximumDistance) - MinimumDistance) / (MaximumDistance - MinimumDistance);
                             newLabels[car].Color.A = newLabels[car].Outline.A = (byte)MathHelper.Lerp(255, 0, ratio);
                         }
                     }
+                    else if (car.IsPlayerTrain && isVisibleTrainCarViewerOrWebpage && (car.CarID == carID || car.CarID == carIDWebpage) && distance <= carBodyLength)
+                    {
+                        if ((State == DisplayState.Cars) || (State == DisplayState.Trains && (car.Train == null || car.Train.FirstCar == car)))
+                        {
+                            if (labels.ContainsKey(car))
+                                newLabels[car] = labels[car];
+                            else
+                                newLabels[car] = new LabelPrimitive(Owner.Label3DMaterial, Color.Blue, Color.White, car.CarHeightM, true) { Position = car.WorldPosition };
+
+                            newLabels[car].InsideBox = true;
+                            newLabels[car].Text = State == DisplayState.Cars || car.Train == null ? car.CarID : car.Train.Name;
+                        }
+                    }
                 }
                 Labels = newLabels;
             }
 
             foreach (var primitive in Labels.Values)
+            {
                 frame.AddPrimitive(Owner.Label3DMaterial, primitive, RenderPrimitiveGroup.Labels, ref Identity);
+            }
         }
 
         public DisplayState CurrentDisplayState

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

@@ -91,7 +91,12 @@ public int CarPosition
             set;
             get;
         }
-        public int NewCarPosition
+        public string CurrentCarID
+        {
+            set;
+            get;
+        }
+    public int NewCarPosition
         {
             set;
             get;
@@ -270,6 +275,7 @@ protected override ControlLayout Layout(ControlLayout layout)
                         : $"  {Viewer.Catalog.GetString(wagon.WagonType.ToString())}";
 
                     Vbox.Add(buttonClose = new Label(Vbox.RemainingWidth, Owner.TextFontDefault.Height, $"{Viewer.Catalog.GetString("Car ID")} {(CarPosition >= PlayerTrain.Cars.Count ? " " : PlayerTrain.Cars[CarPosition].CarID + wagonType)}", LabelAlignment.Center));
+                    CurrentCarID = CarPosition >= PlayerTrain.Cars.Count ? " " : PlayerTrain.Cars[CarPosition].CarID;
                     buttonClose.Click += new Action<Control, Point>(buttonClose_Click);
                     buttonClose.Color = Owner.Viewer.TrainCarOperationsWindow.WarningCarPosition.Find(x => x == true) ? Color.Cyan : Color.White;
                     Vbox.AddHorizontalSeparator();

Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs

@@ -82,6 +82,7 @@ public OperationsStatus(int amountOfCars)
 
         public bool TrainCarSelected;
         public int TrainCarSelectedPosition;
+        public string CurrentCarID { get; set; }
 
         public int Connections = 0;
 
@@ -352,6 +353,8 @@ private string getCarId(TrainCar trainCar, int carPosition)
             var isElectric = trainCar is MSTSElectricLocomotive;
             var isSteam = trainCar is MSTSSteamLocomotive;
             var isEngine = isDiesel || isElectric || isSteam;
+            // Required by OSDCar.cs
+            CurrentCarID = Viewer.PlayerTrain.Cars[TrainCarSelectedPosition].CarID;
             var wagonType = isEngine ?
                 $"  {Viewer.Catalog.GetString(locomotive.WagonType.ToString())}" + $":{Viewer.Catalog.GetString(locomotive.EngineType.ToString())}" :
                 $"  {Viewer.Catalog.GetString(trainCar.WagonType.ToString())}";