Revert the public decorations

Author: pzgulyas

Source/Contrib/TrackViewer/SceneViewer.cs

@@ -64,6 +64,7 @@ public class SceneViewer
         float DeltaX, DeltaY, DeltaZ;
         UndoDataSet DeltaContext;
         WorldLocation CursorLocation;
+        readonly List<(int TileX, int TileZ)> FlaggedTiles = new List<(int, int)>();
 
         public SceneViewer(TrackViewer trackViewer, string[] args)
         {
@@ -87,7 +88,10 @@ public SceneViewer(TrackViewer trackViewer, string[] args)
                 RenderTargetUsage.PlatformContents,
                 PresentInterval.Two);
 
-            SceneWindow = new SceneWindow(new SceneViewerHwndHost(Game.SwapChainWindow.Handle));
+            SceneWindow = new SceneWindow(new SceneViewerHwndHost(Game.SwapChainWindow.Handle))
+            {
+                DataContext = this,
+            };
 
             // The primary window activation events should not affect RunActivity
             Game.Activated -= Game.ActivateRunActivity;
@@ -99,8 +103,6 @@ public SceneViewer(TrackViewer trackViewer, string[] args)
             SceneWindow.Deactivated += Game.DeactivateRunActivity;
             SceneWindow.Deactivated += new System.EventHandler((sender, e) => SetKeyboardInput(false));
 
-            SceneWindow.DataContext = this;
-
             Game.ReplaceState(new GameStateRunActivity(new[] { "-start", "-viewer", Game.CurrentRoute.Path + "\\dummy\\.pat", "", "10:00", "1", "0" }));
         }
 
@@ -138,12 +140,10 @@ public void Update(GameTime gameTime)
                 }
                 if (UserInput.IsPressed(UserCommand.EditorUndo))
                 {
-                    SetDefaultMode();
                     UndoCommand();
                 }
                 if (UserInput.IsPressed(UserCommand.EditorRedo))
                 {
-                    SetDefaultMode();
                     RedoCommand();
                 }
             }
@@ -436,15 +436,16 @@ void UpdateViewUndoState()
             }
         }
 
-        void SetDefaultMode()
+        public void SetDefaultMode()
         {
             SelectedObject = null;
             SelectedObjectChanged();
             EditorState = EditorState.Default;
         }
 
-        void UndoCommand()
+        public void UndoCommand()
         {
+            SetDefaultMode();
             if (UndoStack.Count > 1)
             {
                 var undoDataSet = UndoStack.Pop();
@@ -453,8 +454,9 @@ void UndoCommand()
             }
         }
 
-        void RedoCommand()
+        public void RedoCommand()
         {
+            SetDefaultMode();
             if (RedoStack.Count > 0)
             {
                 var undoDataSet = RedoStack.Pop();
@@ -477,10 +479,13 @@ void UndoRedo(UndoDataSet undoDataSet, bool undo)
                 var newPosition = new WorldPosition(undoDataSet.ChangedStaticShape.Location);
                 undoDataSet.ChangedStaticShape.Location.CopyFrom(undoDataSet.OldPosition);
                 undoDataSet.OldPosition.CopyFrom(newPosition);
+                var flag = (undoDataSet.ChangedStaticShape.Location.TileX, undoDataSet.ChangedStaticShape.Location.TileZ);
+                if (!FlaggedTiles.Contains(flag))
+                    FlaggedTiles.Add(flag);
             }
         }
 
-        void StartObjectMove()
+        public void StartObjectMove()
         {
             MovedObject = SelectedObject;
             MovedObjectOriginalPosition = new WorldPosition(MovedObject.Location);
@@ -516,7 +521,7 @@ void ApplyObjectMove()
             EditorState = EditorState.ObjectSelected;
         }
 
-        void StartHandleMove()
+        public void StartHandleMove()
         {
             HandlePosition = new WorldPosition(SelectedObject.Location);
             HandleOriginalPosition = new WorldPosition(HandlePosition);

Source/Contrib/TrackViewer/UserInterface/SceneWindow.xaml

@@ -5,13 +5,25 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ORTS.TrackViewer"
         mc:Ignorable="d"
+        Name="window"
         d:DataContext="{d:DesignInstance local:SceneViewer, IsDesignTimeCreatable=False}"
         Title="Scene View" SizeToContent="WidthAndHeight">
     <DockPanel LastChildFill="True">
         <Menu DockPanel.Dock="Top" Height="22" Name="menuMain" Width="Auto">
-            <MenuItem Header="_Menu" Name="menuMenu">
+            <MenuItem Header="_File">
                 <MenuItem Header="Nothing to see here" Name="menuNothing" />
             </MenuItem>
+            <MenuItem Header="_Edit">
+                <MenuItem Header="_Undo" Name="menuUndo" Command="Undo" InputGestureText="Ctrl+Z"/>
+                <MenuItem Header="_Redo" Name="menuRedo" Command="Redo" InputGestureText="Ctrl+Y"/>
+                <Separator/>
+                <MenuItem Header="_Move" Name="menuName" InputGestureText="M"/>
+                <MenuItem Header="_Rotate" Name="menuRotate" InputGestureText="R"/>
+                <MenuItem Header="Move _handle" Name="menuHandle" InputGestureText="H"/>
+            </MenuItem>
+            <MenuItem Header="_View">
+                <MenuItem Header="Nothing to see here" Name="menuNothing3" />
+            </MenuItem>
         </Menu>
         <StatusBar DockPanel.Dock="Bottom" Name="tvStatusbar" Height="22" VerticalAlignment="Bottom">
             <StatusBar.ItemsPanel>
@@ -167,4 +179,8 @@
         </Border>
         <Grid DockPanel.Dock="Bottom" x:Name="GraphicsHostElement" />
     </DockPanel>
+    <Window.CommandBindings>
+        <!--CommandBinding Command="Undo" Executed="{Binding UndoCommand}"/>
+        <CommandBinding Command="Redo" Executed="{Binding RedoCommand}"/-->
+    </Window.CommandBindings>
 </Window>

Source/Contrib/TrackViewer/UserInterface/SceneWindow.xaml.cs

@@ -51,5 +51,15 @@ private void FloatValidationTextBox(object sender, TextCompositionEventArgs e)
         {
             e.Handled = float.TryParse(e.Text, out var _);
         }
+
+        private void UndoCommandBinding_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            (DataContext as SceneViewer).UndoCommand();
+        }
+
+        private void RedoCommandBinding_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            (DataContext as SceneViewer).RedoCommand();
+        }
     }
 }

Source/RunActivity/Viewer3D/Processes/GameState.cs

@@ -52,7 +52,7 @@ internal virtual void EndRender(RenderFrame frame)
         /// <param name="frame">The new <see cref="RenderFrame"/> that needs populating.</param>
         /// <param name="totalRealSeconds">The total number of real-world seconds which have elapsed since the game was started.</param>
         [CallOnThread("Updater")]
-        public virtual void Update(RenderFrame frame, double totalRealSeconds)
+        internal virtual void Update(RenderFrame frame, double totalRealSeconds)
         {
             // By default, every update tries to trigger a load.
             if (Game.LoaderProcess.Finished)

Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs

@@ -118,7 +118,7 @@ internal override void Dispose()
             base.Dispose();
         }
 
-        public override void Update(RenderFrame frame, double totalRealSeconds)
+        internal override void Update(RenderFrame frame, double totalRealSeconds)
         {
             UpdateLoading();
 

Source/RunActivity/Viewer3D/Processes/GameStateViewer3D.cs

@@ -82,7 +82,7 @@ internal override void EndRender(RenderFrame frame)
         double[] AverageElapsedRealTime = new double[10];
         int AverageElapsedRealTimeIndex;
 
-        public override void Update(RenderFrame frame, double totalRealSeconds)
+        internal override void Update(RenderFrame frame, double totalRealSeconds)
         {
             // Every 250ms, check for new things to load and kick off the loader.
             if (LastLoadRealTime + 0.25 < totalRealSeconds && Game.LoaderProcess.Finished)

Source/RunActivity/Viewer3D/Processes/RenderProcess.cs

@@ -157,7 +157,7 @@ void GDM_PreparingDeviceSettings(object sender, PreparingDeviceSettingsEventArgs
             pp.RenderTargetUsage = RenderTargetUsage.PreserveContents;
         }
 
-        public void Start()
+        internal void Start()
         {
             Game.WatchdogProcess.Register(WatchdogToken);