Automatic merge of T1.5.1-687-gd279e384a and 11 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 25f5e06: Implement Polach Adhesion
- Pull request #882 at d8a1c4d: 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 44d1055: Scene viewer extension to TrackViewer

Author: openrails-bot

Source/Contrib/TrackViewer/Drawing/Labels/DrawLabels.cs

@@ -24,6 +24,7 @@
 using Newtonsoft.Json;
 
 using ORTS.Common;
+using ORTS.TrackViewer.UserInterface;
 
 namespace ORTS.TrackViewer.Drawing.Labels
 {
@@ -34,7 +35,7 @@ namespace ORTS.TrackViewer.Drawing.Labels
     /// The list of labels can be saved or loaded to .json. This will not be done automatically.
     /// The labels can be modified either w.r.t. to their location (dragging) or w.r.t. their text.
     /// </summary>
-    class DrawLabels
+    public class DrawLabels
     {
         #region private fields
         /// <summary>This is the list of labels that we need to draw and possibly modify </summary>
@@ -56,6 +57,15 @@ class DrawLabels
         private WorldLocation draggingStartLocation;
         /// <summary>Are we currently dragging?</summary>
         private bool dragging = false;   // draggingLabelToReplace is not nullable, so we cannot use that
+
+        private TrackViewer TrackViewer;
+
+        private ContextMenu ContextMenu;
+
+        private MenuItem EditLabelMenuItem;
+
+        public MenuItem SetLocationMenuItem;
+
         #endregion
 
         #region Constructor
@@ -64,9 +74,12 @@ class DrawLabels
         /// Constructor
         /// </summary>
         /// <param name="fontHeight">The height of the font so we can correct during drawing</param>
-        public DrawLabels(int fontHeight)
+        public DrawLabels(TrackViewer trackViewer, int fontHeight)
         {
             this.fontHeight = fontHeight;
+            TrackViewer = trackViewer;
+
+            CreateContextMenu();
         }
         #endregion
 
@@ -88,7 +101,7 @@ public void Draw(DrawArea drawArea)
                     DrawLabel(label);
                 }
                 float distanceSquared = WorldLocation.GetDistanceSquared2D(label.WorldLocation, drawArea.MouseLocation);
-                if (distanceSquared < closestDistanceSquared )
+                if (distanceSquared < closestDistanceSquared)
                 {
                     closestDistanceSquared = distanceSquared;
                     closestToMouseLabel = label;
@@ -107,7 +120,7 @@ public void Draw(DrawArea drawArea)
         /// <param name="label">The lable to draw</param>
         private void DrawLabel(StorableLabel label)
         {
-            drawArea.DrawExpandingString(label.WorldLocation, label.LabelText, 0, -fontHeight/2);
+            drawArea.DrawExpandingString(label.WorldLocation, label.LabelText, 0, -fontHeight / 2);
         }
 
         #endregion
@@ -120,36 +133,56 @@ private void DrawLabel(StorableLabel label)
         /// <param name="mouseY">Current Y-location of the mouse to determine popu location</param>
         internal void AddLabel(int mouseX, int mouseY)
         {
-            var labelInputPopup = new EditLabel("<label>", mouseX, mouseY, 
+            var labelInputPopup = new EditLabel("<label>", mouseX, mouseY,
                 (newLabelText) => labels.Add(drawArea.MouseLocation, newLabelText),
                 allowDelete: false);
             TrackViewer.Localize(labelInputPopup);
             labelInputPopup.ShowDialog();
         }
 
+        private void CreateContextMenu()
+        {
+            ContextMenu = new ContextMenu();
+            EditLabelMenuItem = new MenuItem
+            {
+                Header = "Edit label",
+                IsCheckable = false
+            };
+            EditLabelMenuItem.Click += new RoutedEventHandler((sender, e) => ModifyLabel(closestToMouseLabel,
+                TrackViewer.Window.ClientBounds.Left + TVUserInput.MouseLocationX,
+                TrackViewer.Window.ClientBounds.Left + TVUserInput.MouseLocationY));
+
+            ContextMenu.Items.Add(EditLabelMenuItem);
+
+            SetLocationMenuItem = new MenuItem() { Header = "View scene here" };
+            SetLocationMenuItem.Click += new RoutedEventHandler((sender, e) => TrackViewer.menuControl.MenuSceneWindow_Click(sender, e));
+            SetLocationMenuItem.Click += new RoutedEventHandler(async (sender, e) => await TrackViewer.SceneViewer?.SetCameraLocation());
+            ContextMenu.Items.Add(SetLocationMenuItem);
+        }
+
         /// <summary>
         /// Popup a context menu that allows you to edit the text of a label
         /// </summary>
         /// <param name="mouseX">Current X-location of the mouse to determine popup location</param>
-        /// <param name="mouseY">Current Y-location of the mouse to determine popu location</param>
-        internal void PopupContextMenu(int mouseX, int mouseY)
+        /// <param name="mouseY">Current Y-location of the mouse to determine popup location</param>
+        internal void PopupContextMenu(int mouseX, int mouseY, WorldLocation mouseLocation)
         {
-            if (!Properties.Settings.Default.showLabels) return;
-            if (labels.Labels.Count() == 0) return;
-            var editingLabel = closestToMouseLabel;
+            if (!Properties.Settings.Default.showLabels || labels.Labels.Count() == 0)
+                EditLabelMenuItem.Visibility = Visibility.Collapsed;
+            else
+                EditLabelMenuItem.Visibility = Visibility.Visible;
 
-            var contextMenu = new ContextMenu();
+            SetLocationMenuItem.CommandParameter = mouseLocation;
 
-            var editLabelMenuItem = new MenuItem
-            {
-                Header = "Edit label",
-                IsCheckable = false
-            };
-            editLabelMenuItem.Click += new RoutedEventHandler((sender, e) => ModifyLabel(closestToMouseLabel, mouseX, mouseY));
+            var visible = false;
+            foreach (MenuItem item in ContextMenu.Items)
+                visible |= item.Visibility == Visibility.Visible;
 
-            contextMenu.Items.Add(editLabelMenuItem);
-            contextMenu.PlacementRectangle = new Rect((double)mouseX, (double)mouseY, 20, 20);
-            contextMenu.IsOpen = true;
+            if (visible)
+            {
+                ContextMenu.PlacementRectangle = new Rect((double)mouseX, (double)mouseY, 20, 20);
+                ContextMenu.IsOpen = true;
+            }
         }
 
         /// <summary>
@@ -266,7 +299,7 @@ private void LoadJson(string fileName)
                 MessageBox.Show(TrackViewer.catalog.GetString("The .json file could not be read properly."));
                 return;
             }
-            
+
             bool itemsWereRemoved = labelsNew.Sanitize();
             int itemsLeft = labelsNew.Labels.Count();
             string message = string.Empty;
@@ -320,8 +353,8 @@ internal void OnLeftMouseMoved()
             //The new location is then 'original' + 'current' - 'start'.
             draggingStartLocation.NormalizeTo(drawArea.MouseLocation.TileX, drawArea.MouseLocation.TileZ);
             WorldLocation shiftedLocation = new WorldLocation(
-                draggingLabelToReplace.WorldLocation.TileX      + drawArea.MouseLocation.TileX      - draggingStartLocation.TileX,
-                draggingLabelToReplace.WorldLocation.TileZ      + drawArea.MouseLocation.TileZ      - draggingStartLocation.TileZ,
+                draggingLabelToReplace.WorldLocation.TileX + drawArea.MouseLocation.TileX - draggingStartLocation.TileX,
+                draggingLabelToReplace.WorldLocation.TileZ + drawArea.MouseLocation.TileZ - draggingStartLocation.TileZ,
                 draggingLabelToReplace.WorldLocation.Location.X + drawArea.MouseLocation.Location.X - draggingStartLocation.Location.X,
                 0,
                 draggingLabelToReplace.WorldLocation.Location.Z + drawArea.MouseLocation.Location.Z - draggingStartLocation.Location.Z

Source/Contrib/TrackViewer/NativeMethods.txt

@@ -0,0 +1,8 @@
+// This is the controlling file of the Microsoft.Windows.CsWin32 package's
+// source code generator, telling that what native functions to generate.
+// Check the result in the project/Dependencies/Analyzers/Microsoft.Windows.CsWin32
+// in the Visual Studio Solution Explorer.
+
+SetParent
+SetWindowLong
+WINDOW_STYLE