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 90255fb: 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/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -3260,6 +3260,7 @@ public class ThreeDimentionCabViewer : TrainCarViewer
         //Dictionary<int, DigitalDisplay> DigitParts = null;
         Dictionary<(CabViewControlType, int), ThreeDimCabDigit> DigitParts3D = null;
         Dictionary<(CabViewControlType, int), ThreeDimCabDPI> DPIDisplays3D = null;
+        Dictionary<(CabViewControlType, int), ThreeDimCabScreen> ScreenDisplays3D = null;
         AnimatedPart ExternalWipers = null; // setting to zero to prevent a warning. Probably this will be used later. TODO
         protected MSTSLocomotive MSTSLocomotive { get { return (MSTSLocomotive)Car; } }
         MSTSLocomotiveViewer LocoViewer;
@@ -3283,6 +3284,7 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
             DigitParts3D = new Dictionary<(CabViewControlType, int), ThreeDimCabDigit>();
             Gauges = new Dictionary<(CabViewControlType, int), ThreeDimCabGaugeNative>();
             DPIDisplays3D = new Dictionary<(CabViewControlType, int), ThreeDimCabDPI>();
+            ScreenDisplays3D = new Dictionary<(CabViewControlType, int), ThreeDimCabScreen>();
             OnDemandAnimateParts = new Dictionary<(CabViewControlType, int), AnimatedPart>();
 
             // Find the animated parts
@@ -3377,6 +3379,10 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
                     {
                         DPIDisplays3D.Add(key, new ThreeDimCabDPI(viewer, iMatrix, parameter1, parameter2, this.TrainCarShape, locoViewer.ThreeDimentionCabRenderer.ControlMap[key]));
                     }
+                    else if (style is CircularSpeedGaugeRenderer || style is DriverMachineInterfaceRenderer)
+                    {
+                        ScreenDisplays3D.Add(key, new ThreeDimCabScreen(viewer, iMatrix, TrainCarShape, locoViewer.ThreeDimentionCabRenderer.ControlMap[key]));
+                    }
                     else
                     {
                         //if there is a part already, will insert this into it, otherwise, create a new
@@ -3529,6 +3535,24 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                 p.Value.PrepareFrame(frame, elapsedTime);
             }
 
+            foreach (var p in ScreenDisplays3D)
+            {
+                var dpdisplay = p.Value.CVFR.Control;
+                if (dpdisplay.Screens != null && dpdisplay.Screens[0] != "all")
+                {
+                    foreach (var screen in dpdisplay.Screens)
+                    {
+                        if (LocoViewer.ThreeDimentionCabRenderer.ActiveScreen[dpdisplay.Display] == screen)
+                        {
+                            p.Value.PrepareFrame(frame, elapsedTime);
+                            break;
+                        }
+                    }
+                    continue;
+                }
+                p.Value.PrepareFrame(frame, elapsedTime);
+            }
+
             foreach (var p in Gauges)
             {
                 var gauge = p.Value.CVFR.Control;
@@ -3582,6 +3606,10 @@ internal override void Mark()
             {
                 threeDimCabDPI.Mark();
             }
+            foreach (var threeDimCabControl in ScreenDisplays3D.Values)
+            {
+                threeDimCabControl.Mark();
+            }
         }
     }
 

Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/DriverMachineInterface.cs

@@ -754,7 +754,8 @@ public override void Draw(SpriteBatch spriteBatch, Point drawPosition)
 
     public class CircularSpeedGaugeRenderer : CabViewDigitalRenderer
     {
-        DriverMachineInterface DMI;
+        public DriverMachineInterface DMI;
+
         [CallOnThread("Loader")]
         public CircularSpeedGaugeRenderer(Viewer viewer, MSTSLocomotive locomotive, CVCDigital control, CabShader shader)
             : base(viewer, locomotive, control, shader)
@@ -864,4 +865,79 @@ public override void Draw(GraphicsDevice graphicsDevice)
             ControlView.SpriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied, null, DepthStencilState.Default, null, Shader);
         }
     }
+
+    public class ScreenMaterial : SceneryMaterial
+    {
+        CircularSpeedGaugeRenderer CircularSpeedGaugeRenderer;
+        SpriteBatch SpriteBatch;
+
+        public ScreenMaterial(Viewer viewer, string key, CircularSpeedGaugeRenderer circularSpeedGaugeRenderer)
+            : base(viewer, key, SceneryMaterialOptions.ShaderFullBright, 0)
+        {
+            CircularSpeedGaugeRenderer = circularSpeedGaugeRenderer;
+            Texture = new RenderTarget2D(viewer.GraphicsDevice,
+                CircularSpeedGaugeRenderer.DMI.Width, CircularSpeedGaugeRenderer.DMI.Height, false, SurfaceFormat.Color, DepthFormat.None);
+            SpriteBatch = new SpriteBatch(viewer.GraphicsDevice);
+        }
+
+        public override void Render(GraphicsDevice graphicsDevice, IEnumerable<RenderItem> renderItems, ref Matrix XNAViewMatrix, ref Matrix XNAProjectionMatrix)
+        {
+            var originalRenderTargets = graphicsDevice.GetRenderTargets();
+            graphicsDevice.SetRenderTarget(Texture as RenderTarget2D);
+            SpriteBatch.Begin(); // Dummy Begin(), gets closed immediately
+            CircularSpeedGaugeRenderer.Draw(graphicsDevice);
+            SpriteBatch.End();
+            graphicsDevice.SetRenderTargets(originalRenderTargets);
+
+            base.Render(graphicsDevice, renderItems, ref XNAViewMatrix, ref XNAProjectionMatrix);
+        }
+    }
+
+    public class ThreeDimCabScreen
+    {
+        PoseableShape TrainCarShape;
+        Matrix XNAMatrix;
+        Viewer Viewer;
+        ShapePrimitive ShapePrimitive;
+        public CircularSpeedGaugeRenderer CVFR;
+        ScreenMaterial Material;
+        public ThreeDimCabScreen(Viewer viewer, int iMatrix, PoseableShape trainCarShape, CabViewControlRenderer c)
+        {
+            CVFR = (CircularSpeedGaugeRenderer)c;
+            Viewer = viewer;
+            TrainCarShape = trainCarShape;
+            XNAMatrix = TrainCarShape.SharedShape.Matrices[iMatrix];
+            Material = new ScreenMaterial(viewer, "ETCS_SCREEN", CVFR);
+
+            var vertices = new[]
+            {
+                new VertexPositionNormalTexture(new Vector3(0, 0, 0), new Vector3(0, 0, -1), new Vector2(0, 0)),
+                new VertexPositionNormalTexture(new Vector3(0, 0, 1), new Vector3(0, 0, -1), new Vector2(0, 1)),
+                new VertexPositionNormalTexture(new Vector3(1, 0, 0), new Vector3(0, 0, -1), new Vector2(1, 0)),
+                new VertexPositionNormalTexture(new Vector3(1, 0, 1), new Vector3(0, 0, -1), new Vector2(1, 1)),
+            };
+            var indices = new short[] { 0, 1, 2, 2, 1, 3 };
+            var indexBuffer = new IndexBuffer(viewer.GraphicsDevice, IndexElementSize.SixteenBits, indices.Length, BufferUsage.WriteOnly);
+            indexBuffer.SetData(indices);
+            ShapePrimitive = new ShapePrimitive(Material, new SharedShape.VertexBufferSet(vertices, viewer.GraphicsDevice), indexBuffer, 2, new[] { -1 }, 0);
+        }
+
+        public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
+        {
+            if (!CVFR.IsPowered && CVFR.Control.HideIfDisabled)
+                return;
+
+            Matrix mx = TrainCarShape.Location.XNAMatrix;
+            mx.M41 += (TrainCarShape.Location.TileX - Viewer.Camera.TileX) * 2048;
+            mx.M43 += (-TrainCarShape.Location.TileZ + Viewer.Camera.TileZ) * 2048;
+            Matrix m = XNAMatrix * mx;
+
+            frame.AddPrimitive(ShapePrimitive.Material, ShapePrimitive, RenderPrimitiveGroup.Interior, ref m, ShapeFlags.None);
+        }
+
+        internal void Mark()
+        {
+            ShapePrimitive.Mark();
+        }
+    }
 }

Source/RunActivity/Viewer3D/RollingStock/SubSystems/ETCS/SpeedDistanceMonitoring.cs

@@ -53,7 +53,7 @@ public class CircularSpeedGauge : DMIArea
         readonly Point ReleaseSpeedPosition = new Point(26 - 6, 274 - 8);
         readonly int[] UnitCenterPosition = new int[] { 140, 204 };
         // 240 and 260 are non-standard scales by ETA, but national railways often use one of these instead of 250
-        readonly int[] StandardScalesKMpH = new int[] { 140, 180, 240, 250, 260, 400 };
+        readonly int[] StandardScalesKMpH = new int[] { 140, 180, 240, 250, 260, 280, 400 };
         readonly int[] StandardScalesMpH = new int[] { 87, 111, 155, 248 };
 
         const string UnitMetricString = "km/h";
@@ -222,21 +222,38 @@ public void SetRange(int maxSpeed)
                             y -= textHeight / 2f * (1f - (float)Math.Cos(angle));
                             // Cheating for better outlook:
                             if (UnitMetric && 240 <= MaxSpeed && MaxSpeed <= 260)
+                            {
                                 switch (speed)
                                 {
                                     case 100: x -= textWidth / 4f; break;
                                     case 120: x -= textWidth / 10f; y -= textHeight / 6f; break;
                                     case 140: x += textWidth / 6f; y -= textHeight / 6f; break;
                                 }
-
+                            }
                             DialSpeeds.Add(new TextPrimitive(new Point((int)x, (int)y), Color.White, speed.ToString(), FontDialSpeeds));
                         }
                     }
                     else
+                    {
                         DialLineCoords.Add(new Vector4(x, y, LineHalf, angle + MathHelper.PiOver2));
+                    }
+
+                    var longLineEach = 2;
+                    if (MaxSpeed == 280 && UnitMetric)
+                    {
+                        longLineEach = 4;
+                    }
+                    if (MaxSpeed > 300 && UnitMetric)
+                    {
+                        longLineEach = 5;
+                    }
+                    if (MaxSpeed > 200 && !UnitMetric)
+                    {
+                        longLineEach = (speed + 5 > MidSpeed) ? 4 : 2;
+                    }
 
                     longLine++;
-                    longLine %= MaxSpeed != StandardScales[StandardScales.Length - 1] ? 2 : UnitMetric ? 5 : (speed + 5 > MidSpeed) ? 4 : 2;
+                    longLine %= longLineEach;
                 }
                 else if (UnitMetric && (MaxSpeed == 240 || MaxSpeed == 260))
                 {