Automatic merge of T1.5.1-976-g502cbbef0 and 15 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- 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 b3f83ed: Blueprint/train car operations UI window
- Pull request #891 at 9a1d6b2: Auto save
- 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 #900 at c27f32d: DMI updates
- Pull request #903 at 3e390b8: Downloading route content (Github, zip)
- Pull request #912 at cda1d74: New Triple Valve Features Vol. 2
- Pull request #922 at abe2e52: Autopilot for timetable mode
- Pull request #943 at fb1f454: Dynamic Brakes Behavior & Display Improvements
- Pull request #945 at f5872fd: Display tractive force instead of compensated out force
- Pull request #946 at 47fcd1c: Advanced track sounds
- Pull request #948 at a687981: Fix Cycling Lights

Author: openrails-bot

Source/Documentation/Manual/driving.rst

@@ -81,11 +81,8 @@ printable version of the command set as described in paragraph
 immediately get the scrollable F1 Information Window as shown and 
 described :ref:`below <driving-help>`.
 
-Alternatively, you can operate the cabview controls by left mouse click 
-(buttons) and left mouse button drag (levers and rotary switches). For 2D cabs
-instead of dragging you can also use the mouse scroll wheel. 
-The Display Control Rectangle command ``<Ctrl+F5>`` shows the rectangles in which
-a control is mouse sensitive.
+Alternatively, you can operate the cabview controls by mouse click 
+(buttons) and mouse drag (levers and rotary switches).
 
 Throttle Control
 ----------------

Source/ORTS.Common/Input/UserCommand.cs

@@ -1,22 +1,4 @@
-// COPYRIGHT 2024 by the Open Rails project.
-//
-// This file is part of Open Rails.
-//
-// Open Rails is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Open Rails is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-namespace ORTS.Common.Input
+namespace ORTS.Common.Input
 {
     /// <summary>
     /// Specifies game commands.
@@ -68,7 +50,6 @@ public enum UserCommand
         [GetString("Display Compass Window")] DisplayCompassWindow,
         [GetString("Display Train List Window")] DisplayTrainListWindow,
         [GetString("Display EOT List Window")] DisplayEOTListWindow,
-        [GetString("Display Control Rectangles")] DisplayControlRectangle,
 
         [GetString("Debug Speed Up")] DebugSpeedUp,
         [GetString("Debug Speed Down")] DebugSpeedDown,

Source/ORTS.Settings/InputSettings.cs

@@ -516,7 +516,6 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.DisplayTrainOperationsWindow] = new UserCommandKeyInput(0x43);
             Commands[(int)UserCommand.DisplayTrainDpuWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Shift);
             Commands[(int)UserCommand.DisplayEOTListWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Control);
-            Commands[(int)UserCommand.DisplayControlRectangle] = new UserCommandKeyInput(0x3F, KeyModifiers.Control);
 
             Commands[(int)UserCommand.GameAutopilotMode] = new UserCommandKeyInput(0x1E, KeyModifiers.Alt);
             Commands[(int)UserCommand.GameChangeCab] = new UserCommandKeyInput(0x12, KeyModifiers.Control);

Source/RunActivity/Viewer3D/Popups/ControlRectangle.cs

@@ -59,13 +59,6 @@ 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)
         {
@@ -149,34 +142,19 @@ 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() });
-            UserCommandControlTypes.Add(CABViewControlTypes.GEARS, new UserCommand[] { UserCommand.ControlGearUp, UserCommand.ControlGearDown });
-
             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) });
@@ -335,7 +313,7 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
 
             foreach (var command in UserInputCommands.Keys)
             {
-                if (UserInput.IsPressed(command) || IsMouseWheelRotated(command))
+                if (UserInput.IsPressed(command))
                 {
                     UserInputCommands[command][1]();
                     //Debrief eval
@@ -354,59 +332,7 @@ 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>
@@ -1773,8 +1699,6 @@ public interface ICabViewMouseControlRenderer
         void HandleUserInput();
         string GetControlName();
         string ControlLabel { get; }
-        Rectangle DestinationRectangleGet();
-        bool isMouseControl();
     }
 
     /// <summary>
@@ -2110,24 +2034,11 @@ public CabViewDiscreteRenderer(Viewer viewer, MSTSLocomotive locomotive, CVCWith
                     ChangedValue = (value) =>
                     {
                         IntermediateValue %= 0.5f;
-                        if (UserInput.IsMouseLeftButtonDown)
-                        {
                         IntermediateValue += NormalizedMouseMovement();
-                        } 
-                        else
-                        {
-                            // mousewheel
-                            IntermediateValue += (float)UserInput.MouseWheelChange / 700;
-                        }
                         return IntermediateValue > 0.5f ? 1 : IntermediateValue < -0.5f ? -1 : 0;
                     };
                     break;
-                default:
-                    ChangedValue = (value) =>
-                    {
-                        return value + NormalizedMouseMovement();
-                    };
-                    break;
+                default: ChangedValue = (value) => value + NormalizedMouseMovement(); break;
             }
             // Determine the cab view control index shown when combined control is at the split position
             // Find the index of the next value LARGER than the split value
@@ -2422,22 +2333,11 @@ public virtual int GetDrawIndex()
         /// </summary>
         float NormalizedMouseMovement()
         {
-            if (UserInput.IsMouseLeftButtonDown)
-            {
             return (ControlDiscrete.Orientation > 0
                 ? (float)UserInput.MouseMoveY / (float)Control.Height
                 : (float)UserInput.MouseMoveX / (float)Control.Width)
                 * (ControlDiscrete.Direction > 0 ? -1 : 1);
         }
-            else
-            {
-                // mousewheel
-                return (ControlDiscrete.Orientation > 0
-                    ? (float)UserInput.MouseWheelChange / (float)1500
-                    : (float)UserInput.MouseWheelChange / (float)1500)
-                    * (ControlDiscrete.Direction > 0 ? -1 : 1);
-            }
-        }
 
         public bool IsMouseWithin()
         {
@@ -2955,16 +2855,6 @@ protected int PercentToIndex(float percent)
 
             return index;
         }
-
-        public Rectangle DestinationRectangleGet()
-        {
-            return DestinationRectangle;
-        }
-
-        public bool isMouseControl()
-        {
-            return ControlDiscrete.MouseControl;
-        }
     }
 
     /// <summary>