Automatic merge of T1.5.1-689-g9d41208f0 and 19 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 67014b7: 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 #878 at 8a6acee: Implement Polach Adhesion
- Pull request #882 at 753b622: Blueprint/train car operations UI window
- Pull request #883 at edcc2dd: SwitchPanel disconnect/connect handling
- Pull request #885 at c81447b: feat: Add notifications to Menu
- Pull request #886 at 52c3c82: Scene viewer extension to TrackViewer
- Pull request #888 at d7daf62: docs: Document player application model
- Pull request #889 at 43341cf: No speed update
- 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 64a29c8: feat: Improved system information collection

Author: openrails-bot

Source/ORTS.Common/Input/UserCommand.cs

@@ -255,5 +255,7 @@ public enum UserCommand
 
         // Editor
         [GetString("Editor Unselect All")] EditorUnselectAll,
+        [GetString("Editor Undo")] EditorUndo,
+        [GetString("Editor Redo")] EditorRedo,
     }
 }

Source/ORTS.Settings/InputSettings.cs

@@ -542,6 +542,8 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.GameUncoupleWithMouse] = new UserCommandKeyInput(0x16);
 
             Commands[(int)UserCommand.EditorUnselectAll] = new UserCommandKeyInput(0x01);
+            Commands[(int)UserCommand.EditorUndo] = new UserCommandKeyInput(Keys.Z, KeyModifiers.Control); // Not assigning by scan code, because on German influenced keyboard layounts
+            Commands[(int)UserCommand.EditorRedo] = new UserCommandKeyInput(Keys.Y, KeyModifiers.Control); // the Y and Z keys are exchanged, and we want these to match the o/s
         }
         #endregion
 

Source/RunActivity/Viewer3D/Cameras.cs

@@ -844,7 +844,11 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
 
         public override void ZoomByMouseWheel(float speed)
         {
-            ZoomIn(speed * UserInput.MouseWheelChange * ZoomFactor);
+            // Zoom/move towards the mouse cursor instead of the camera forward
+            var movement = speed * -UserInput.MouseWheelChange * ZoomFactor * Vector3.Normalize(Viewer.NearPoint - Viewer.FarPoint);
+            movement.Z *= -1;
+            cameraLocation.Location += movement;
+            cameraLocation.Normalize();
         }
 
         public override void RotateByMouse()
@@ -855,8 +859,9 @@ public override void RotateByMouse()
             var deltaAngleX = MathHelper.WrapAngle(RotationXRadians - StoredAngleX);
             var deltaAngleY = MathHelper.WrapAngle(RotationYRadians - StoredAngleY);
 
-            var dax = StoredForward.Z * deltaAngleX;
-            var daz = StoredForward.X * deltaAngleX;
+            var dax = Vector3.Dot(StoredForward, Vector3.UnitZ) * deltaAngleX;
+            var daz = Vector3.Dot(StoredForward, Vector3.UnitX) * deltaAngleX;
+
             var transform = Matrix.CreateRotationX(dax);
             transform *= Matrix.CreateRotationZ(daz);
             transform *= Matrix.CreateRotationY(-deltaAngleY);
@@ -870,7 +875,7 @@ public override void RotateByMouse()
             cameraLocation = newWorldLocation;
         }
 
-        public void StoreRotationOrigin(Vector3 rotationOrigin)
+        void StoreRotationOrigin(Vector3 rotationOrigin)
         {
             StoredOrigin = Viewer.TerrainPoint;
             StoredLocation = CameraWorldLocation;
@@ -882,7 +887,9 @@ public void StoreRotationOrigin(Vector3 rotationOrigin)
             StoredForward = xnaView.Forward;
         }
 
-        public void SetOrientation(float rotationXRadians, float rotationYRadians)
+        public float GetRotationX() { return RotationXRadians; }
+        public float GetRotationY() { return RotationYRadians; }
+        public void SetRotation(float rotationXRadians, float rotationYRadians)
         {
             RotationXRadians = rotationXRadians;
             RotationYRadians = rotationYRadians;

Source/RunActivity/Viewer3D/EditorPrimitives.cs

@@ -176,8 +176,8 @@ public MouseCrosshair(Viewer viewer, Color color)
             {
                 new VertexPositionColor(new Vector3(-5, 0, 0), color),
                 new VertexPositionColor(new Vector3(5, 0, 0), color),
-                new VertexPositionColor(new Vector3(0, 0, -5), color),
-                new VertexPositionColor(new Vector3(0, 0, 5), color),
+                new VertexPositionColor(new Vector3(0, 0, -5), Color.Red),
+                new VertexPositionColor(new Vector3(0, 0, 5), Color.Cyan),
                 new VertexPositionColor(new Vector3(0, 0, 0), color),
                 new VertexPositionColor(new Vector3(0, 20, 0), color)
             };