Automatic merge of T1.5.1-905-gaf8fb30c5 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 9c456aa: 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 #903 at 9bead33: Downloading route content (Github, zip)
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #916 at 992cc97: Distributed Power Air Brake Synchronization
- Pull request #919 at b90e3b9: Added mouse wheel support for controls which can be moved by pressing t…
- Pull request #920 at a94e403: Update RailDriver in Manual
- Pull request #923 at d0208cd: Add curve squeal to route

Author: openrails-bot

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -59,6 +59,13 @@ public class MSTSLocomotiveViewer : MSTSWagonViewer
         public bool lemergencybuttonpressed = false;
         CruiseControlViewer CruiseControlViewer;
 
+        public Dictionary<CABViewControlTypes, UserCommand[]> UserCommandControlTypes = new Dictionary<CABViewControlTypes, UserCommand[]>();
+
+        private bool IsMouseWheelChanged;
+        private DateTime MouseWheelChangedTime;
+        private int MouseWheelClicks;
+        private UserCommand MouseWheelCommand;
+        
         public MSTSLocomotiveViewer(Viewer viewer, MSTSLocomotive car)
             : base(viewer, car)
         {
@@ -142,19 +149,33 @@ public override void InitializeUserInputCommands()
             // Steam locomotives handle these differently, and might have set them already
             if (!UserInputCommands.ContainsKey(UserCommand.ControlForwards))
                 UserInputCommands.Add(UserCommand.ControlForwards, new Action[] { Noop, () => ReverserControlForwards() });
+
             if (!UserInputCommands.ContainsKey(UserCommand.ControlBackwards))
+            {
                 UserInputCommands.Add(UserCommand.ControlBackwards, new Action[] { Noop, () => ReverserControlBackwards() });
+                UserCommandControlTypes.Add(CABViewControlTypes.DIRECTION, new UserCommand[] { UserCommand.ControlForwards, UserCommand.ControlBackwards });
+            }
 
             UserInputCommands.Add(UserCommand.ControlThrottleIncrease, new Action[] { () => Locomotive.StopThrottleIncrease(), () => Locomotive.StartThrottleIncrease() });
             UserInputCommands.Add(UserCommand.ControlThrottleDecrease, new Action[] { () => Locomotive.StopThrottleDecrease(), () => Locomotive.StartThrottleDecrease() });
+            UserCommandControlTypes.Add(CABViewControlTypes.THROTTLE, new UserCommand[] { UserCommand.ControlThrottleIncrease, UserCommand.ControlThrottleDecrease});
+            UserCommandControlTypes.Add(CABViewControlTypes.CP_HANDLE, new UserCommand[] { UserCommand.ControlThrottleIncrease, UserCommand.ControlThrottleDecrease });
+
             UserInputCommands.Add(UserCommand.ControlThrottleZero, new Action[] { Noop, () => Locomotive.ThrottleToZero() });
+
             UserInputCommands.Add(UserCommand.ControlGearUp, new Action[] { () => StopGearBoxIncrease(), () => StartGearBoxIncrease() });
             UserInputCommands.Add(UserCommand.ControlGearDown, new Action[] { () => StopGearBoxDecrease(), () => StartGearBoxDecrease() });
+
             UserInputCommands.Add(UserCommand.ControlTrainBrakeIncrease, new Action[] { () => Locomotive.StopTrainBrakeIncrease(), () => Locomotive.StartTrainBrakeIncrease(null) });
             UserInputCommands.Add(UserCommand.ControlTrainBrakeDecrease, new Action[] { () => Locomotive.StopTrainBrakeDecrease(), () => Locomotive.StartTrainBrakeDecrease(null) });
+            UserCommandControlTypes.Add(CABViewControlTypes.TRAIN_BRAKE, new UserCommand[] { UserCommand.ControlTrainBrakeIncrease, UserCommand.ControlTrainBrakeDecrease});
+
             UserInputCommands.Add(UserCommand.ControlTrainBrakeZero, new Action[] { Noop, () => Locomotive.StartTrainBrakeDecrease(0, true) });
+
             UserInputCommands.Add(UserCommand.ControlEngineBrakeIncrease, new Action[] { () => Locomotive.StopEngineBrakeIncrease(), () => Locomotive.StartEngineBrakeIncrease(null) });
             UserInputCommands.Add(UserCommand.ControlEngineBrakeDecrease, new Action[] { () => Locomotive.StopEngineBrakeDecrease(), () => Locomotive.StartEngineBrakeDecrease(null) });
+            UserCommandControlTypes.Add(CABViewControlTypes.ENGINE_BRAKE, new UserCommand[] { UserCommand.ControlEngineBrakeIncrease, UserCommand.ControlEngineBrakeDecrease });
+
             UserInputCommands.Add(UserCommand.ControlBrakemanBrakeIncrease, new Action[] { () => Locomotive.StopBrakemanBrakeIncrease(), () => Locomotive.StartBrakemanBrakeIncrease(null) });
             UserInputCommands.Add(UserCommand.ControlBrakemanBrakeDecrease, new Action[] { () => Locomotive.StopBrakemanBrakeDecrease(), () => Locomotive.StartBrakemanBrakeDecrease(null) });
             UserInputCommands.Add(UserCommand.ControlDynamicBrakeIncrease, new Action[] { () => Locomotive.StopDynamicBrakeIncrease(), () => Locomotive.StartDynamicBrakeIncrease(null) });
@@ -313,7 +334,7 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
 
             foreach (var command in UserInputCommands.Keys)
             {
-                if (UserInput.IsPressed(command))
+                if (UserInput.IsPressed(command) || IsMouseWheelRotated(command))
                 {
                     UserInputCommands[command][1]();
                     //Debrief eval
@@ -332,7 +353,59 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
                     //Debrief eval
                     if (lemergencybuttonpressed && !Locomotive.EmergencyButtonPressed) lemergencybuttonpressed = false;
                 }
+                else if (IsMouseWheelChanged && (DateTime.Now.Subtract(MouseWheelChangedTime).TotalMilliseconds > (500 * MouseWheelClicks)) && (command == MouseWheelCommand))
+                {
+                    UserInputCommands[command][0]();
+                    //Debrief eval
+                    if (lemergencybuttonpressed && !Locomotive.EmergencyButtonPressed) lemergencybuttonpressed = false;
+                    IsMouseWheelChanged = false;
+            }
+        }
+        }
+
+        bool IsMouseWheelRotated(UserCommand command)
+        {
+            if (UserInput.IsMouseWheelChanged)
+            {
+                if (Viewer.Camera is CabCamera && (this as MSTSLocomotiveViewer)._hasCabRenderer)
+                {
+                    var cabRenderer = (this as MSTSLocomotiveViewer)._CabRenderer;
+                    foreach (var controlRenderer in cabRenderer.ControlMap.Values)
+                    {
+                        if ((Viewer.Camera as CabCamera).SideLocation == controlRenderer.Control.CabViewpoint && controlRenderer is ICabViewMouseControlRenderer mouseRenderer)
+                        {
+                            if (mouseRenderer.IsMouseWithin())
+                            {
+                                UserCommand [] userCommands;
+                                UserCommandControlTypes.TryGetValue(controlRenderer.Control.ControlType.Type, out userCommands);
+                                if (userCommands != null)
+                                {
+                                    // check if user command (e.g. ControlThrottleIncrease) equals control type (e.g. THROTTLE)
+                                    if (((command == userCommands[0]) && (UserInput.MouseWheelChange > 0)) ||
+                                        ((command == userCommands[1]) && (UserInput.MouseWheelChange < 0)))
+                                    {
+                                        if (!IsMouseWheelChanged)
+                                        {
+                                            IsMouseWheelChanged = true;
+                                            MouseWheelChangedTime = DateTime.Now;
+                                            MouseWheelClicks = 1;
+                                            MouseWheelCommand = command;
+                                        }
+                                        else
+                                        {
+                                            MouseWheelClicks += 1;
+                                        }
+                                        return true;
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
             }
+
+            return false;
         }
 
         /// <summary>

Source/RunActivity/Viewer3D/Viewer.cs

@@ -1420,7 +1420,13 @@ void HandleUserInput(ElapsedTime elapsedTime)
                         if ((Camera as CabCamera).SideLocation == controlRenderer.Control.CabViewpoint && controlRenderer is ICabViewMouseControlRenderer mouseRenderer)
                         {
                             if (mouseRenderer.IsMouseWithin())
-                        {
+                            {
+                                var UserCommandControlTypes = (PlayerLocomotiveViewer as MSTSLocomotiveViewer).UserCommandControlTypes;
+                                if (UserCommandControlTypes.ContainsKey(controlRenderer.Control.ControlType.Type))
+                                {
+                                    continue;
+                                }
+
                             if ((controlRenderer.Control.Screens == null || controlRenderer.Control.Screens[0] == "all"))
                             {
                                 MouseChangingControl = mouseRenderer;