Automatic merge of T1.5.1-913-g91804456c and 16 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 1a5693d: Blueprint/train car operations UI window
- 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 f588e31: Downloading route content (Github, zip)
- Pull request #910 at 97d4569: Allow building code using .NET 6 (Windows)
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2
- Pull request #919 at 5040910: 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 e0f3c55: Add curve squeal to route
- Pull request #924 at 6c2c3cd: Default Asset Improvements
- Pull request #925 at e3b1688: Fix brakeshoe force bug

Author: openrails-bot

Source/RunActivity/Viewer3D/Popups/ControlRectangle.cs

@@ -15,73 +15,112 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Orts.Simulation.RollingStocks;
 using Orts.Viewer3D.RollingStock;
+using SpriteBatch = Microsoft.Xna.Framework.Graphics.SpriteBatch;
 
 namespace Orts.Viewer3D.Popups
 {
     public class ControlRectangle : Window
     {
         private readonly Texture2D Line;
-        private readonly int Thickness = 3;
+        private int Thickness = 1;
         private readonly Color Color = Color.Yellow;
         private readonly Viewer Viewer;
+        private bool CabViewFront;
+        private bool IsOverRectangle = false;
+        private class ListRect
+        {
+            public bool Front;
+            public Rectangle CabRectangle;
+            public string Name;
+        }
+        private List<ListRect> ListRectangles = new List<ListRect>();
+        private ListRect ListRects;
 
         public ControlRectangle(WindowManager owner, Viewer viewer) : base(owner)
         {
             Line = new Texture2D(Owner.Viewer.GraphicsDevice, 1, 1, false, SurfaceFormat.Color);
             Line.SetData(new[] { Color });
             Viewer = viewer;
         }
-
         public override void Draw(SpriteBatch spriteBatch)
         {
             if (Viewer.Camera is CabCamera && (Viewer.PlayerLocomotiveViewer as MSTSLocomotiveViewer)._hasCabRenderer)
             {
                 var cabRenderer = (Viewer.PlayerLocomotiveViewer as MSTSLocomotiveViewer)._CabRenderer;
 
                 var loco = Viewer.PlayerLocomotive as MSTSLocomotive;
-                var cabViewFrontRear = loco.UsingRearCab ? 1 : 0;
+                CabViewFront = !loco.UsingRearCab;
+
                 var itemsFrontCount = loco.CabViewList[(int)CabViewType.Front].CVFFile.CabViewControls.Count();
                 var itemsRearCount = loco.CabViewList.Count > 1 ? loco.CabViewList[(int)CabViewType.Rear].CVFFile.CabViewControls.Count() : 0;
-                
-                foreach (var controlRenderer in cabRenderer.ControlMap.Values.Skip(cabViewFrontRear == 0 ? 0 : itemsFrontCount).Take(cabViewFrontRear == 0 ? itemsFrontCount : itemsRearCount))
+
+                foreach (var controlRenderer in cabRenderer.ControlMap.Values.Skip(CabViewFront ? 0 : itemsFrontCount).Take(CabViewFront ? itemsFrontCount : itemsRearCount))
                 {
                     if ((Viewer.Camera as CabCamera).SideLocation == controlRenderer.Control.CabViewpoint && controlRenderer is ICabViewMouseControlRenderer mouseRenderer)
-                    {                        
+                    {
                         if (mouseRenderer.isMouseControl())
                         {
                             Rectangle rectangle = mouseRenderer.DestinationRectangleGet();
-
                             int width = rectangle.Width;
                             int height = rectangle.Height;
 
                             if (width > 0)
                             {
                                 // do not know why rectangles with width and height = 0 are there
+                                ListRects = ListRectangles.FirstOrDefault(c => c.Name == mouseRenderer.GetControlName() && c.Front == CabViewFront);
+                                if (ListRects == null)
+                                {
+                                    ListRectangles.Add(new ListRect
+                                    {
+                                        CabRectangle = rectangle,
+                                        Front = CabViewFront,
+                                        Name = mouseRenderer.GetControlName(),
+                                    });
+                                }
+                                else
+                                {
+                                    ListRects.CabRectangle = rectangle;
+                                }
 
-                                // top line
-                                DrawLine(spriteBatch, rectangle.X, rectangle.Y, width, Thickness, 0);
-
-                                // bottom line
-                                DrawLine(spriteBatch, rectangle.X, rectangle.Y + height - Thickness, width, Thickness, 0);
+                                Thickness = 1; // default
+                                if (mouseRenderer.IsMouseWithin())
+                                {
+                                    ListRects = ListRectangles.FirstOrDefault(c => c.CabRectangle == rectangle && c.Front == CabViewFront);
 
-                                // left line
-                                DrawLine(spriteBatch, rectangle.X + Thickness, rectangle.Y, height, Thickness, 90);
+                                    if (ListRects != null && rectangle.Intersects(ListRects.CabRectangle) && ListRects.Name == mouseRenderer.GetControlName() && !IsOverRectangle)
+                                    {
+                                        Thickness = 3; // Highlights the currently selected rectangle
+                                        IsOverRectangle = true;
+                                    }
+                                }
 
-                                // right line
-                                DrawLine(spriteBatch, rectangle.X + width, rectangle.Y, height, Thickness, 90);
+                                DrawRectangle(spriteBatch, rectangle.X, rectangle.Y, width, height, Thickness, Color);
                             }
                         }
                     }
                 }
+                IsOverRectangle = false;
             }
         }
 
-        private void DrawLine(SpriteBatch spriteBatch, int X, int Y, int width, int height, int degrees)
+        private void DrawRectangle(SpriteBatch spriteBatch, int newX, int newY, int width, int height, int Thickness, Color Color)
+        {   // top line
+            DrawLine(spriteBatch, newX, newY, width, Thickness, 0, Color);
+            // bottom line
+            DrawLine(spriteBatch, newX, newY + height - Thickness, width, Thickness, 0, Color);
+            // left line
+            DrawLine(spriteBatch, newX + Thickness, newY, height, Thickness, 90, Color);
+            // right line
+            DrawLine(spriteBatch, newX + width, newY, height, Thickness, 90, Color);
+        }
+
+        private void DrawLine(SpriteBatch spriteBatch, int X, int Y, int width, int height, int degrees, Color Color)
         {
             spriteBatch.Draw(
                 Line,