Object movement changes

Author: pzgulyas

Source/Contrib/TrackViewer/SceneViewer.cs

@@ -53,6 +53,7 @@ public class SceneViewer
         OrbitingCamera Camera;
 
         EditorState EditorState;
+        EditorMoveState EditorMoveState;
         StaticShape SelectedObject;
         WorldFile SelectedWorldFile;
         Orts.Formats.Msts.WorldObject SelectedWorldObject;
@@ -109,11 +110,6 @@ public void Show()
             SceneWindow.Activate();
         }
 
-        /// <summary>
-        /// Allows the game to run logic such as updating the world,
-        /// checking for collisions, gathering input, and playing audio.
-        /// </summary>
-        /// <param name="gameTime">Provides a snapshot of timing values.</param>
         public void Update(GameTime gameTime)
         {
             Viewer = Viewer ?? Game.RenderProcess?.Viewer;
@@ -155,19 +151,29 @@ public void Update(GameTime gameTime)
             {
                 if (UserInput.IsPressed(UserCommand.EditorMove))
                 {
+                    EditorMoveState = EditorMoveState.Move;
+                    StartObjectMove();
+                }
+                if (UserInput.IsPressed(UserCommand.EditorRotate))
+                {
+                    EditorMoveState = EditorMoveState.Rotate;
                     StartObjectMove();
                 }
                 if (UserInput.IsPressed(UserCommand.EditorMoveHandle))
                 {
+                    EditorMoveState = EditorMoveState.Move;
                     StartHandleMove();
                 }
             }
             if (EditorState == EditorState.HandleMoving)
             {
                 if (UserInput.IsPressed(UserCommand.EditorMove))
                 {
-                    CancelHandleMove();
-                    StartObjectMove();
+                    EditorMoveState = EditorMoveState.Move;
+                }
+                if (UserInput.IsPressed(UserCommand.EditorRotate))
+                {
+                    EditorMoveState = EditorMoveState.Rotate;
                 }
                 if (UserInput.IsPressed(UserCommand.EditorCancel))
                 {
@@ -180,10 +186,13 @@ public void Update(GameTime gameTime)
             }
             if (EditorState == EditorState.ObjectMoving)
             {
-                if (UserInput.IsPressed(UserCommand.EditorMoveHandle))
+                if (UserInput.IsPressed(UserCommand.EditorMove))
                 {
-                    CancelObjectMove();
-                    StartHandleMove();
+                    EditorMoveState = EditorMoveState.Move;
+                }
+                if (UserInput.IsPressed(UserCommand.EditorRotate))
+                {
+                    EditorMoveState = EditorMoveState.Rotate;
                 }
                 if (UserInput.IsPressed(UserCommand.EditorCancel))
                 {
@@ -315,7 +324,7 @@ Matrix GetMovingMatrix(in WorldPosition originalPosition, in WorldPosition handl
             var handle = handleOriginalPosition ?? originalPosition;
             var xnaMatrix = originalPosition.XNAMatrix;
 
-            if (UserInput.IsDown(UserCommand.EditorLockRotation))
+            if (EditorMoveState == EditorMoveState.Rotate)
             {
                 var distance = WorldLocation.GetDistance(handle.WorldLocation, CursorLocation);
                 distance.Z *= -1;
@@ -337,8 +346,12 @@ Matrix GetMovingMatrix(in WorldPosition originalPosition, in WorldPosition handl
                     handleMatrix.Translation += translation;
                     handlePosition.XNAMatrix = handleMatrix;
                 }
+
+                DeltaX = 0;
+                DeltaY = MathHelper.ToDegrees(angle);
+                DeltaZ = 0;
             }
-            else
+            else if (EditorMoveState == EditorMoveState.Move)
             {
                 var distance = WorldLocation.GetDistance(originalPosition.WorldLocation, CursorLocation);
                 distance.Z *= -1;
@@ -461,16 +474,9 @@ void UndoRedo(UndoDataSet undoDataSet, bool undo)
             }
             else if (undoDataSet.UndoEvent == UndoEvent.WorldObjectChanged)
             {
-                if (undo)
-                {
-                    var newPosition = new WorldPosition(undoDataSet.ChangedStaticShape.Location);
-                    undoDataSet.ChangedStaticShape.Location.CopyFrom(undoDataSet.OldPosition);
-                    undoDataSet.OldPosition.CopyFrom(newPosition);
-                }
-                else
-                {
-
-                }
+                var newPosition = new WorldPosition(undoDataSet.ChangedStaticShape.Location);
+                undoDataSet.ChangedStaticShape.Location.CopyFrom(undoDataSet.OldPosition);
+                undoDataSet.OldPosition.CopyFrom(newPosition);
             }
         }
 
@@ -500,8 +506,8 @@ void ApplyObjectMove()
                 TileZ = MovedObject.Location.TileZ,
                 Uid = MovedObject.Uid,
                 ChangedStaticShape = MovedObject,
-                OldPosition = MovedObjectOriginalPosition,
-                MovedWithRespectTo = HandlePosition ?? MovedObject.Location,
+                OldPosition = new WorldPosition(MovedObjectOriginalPosition),
+                MoveOrigin = HandlePosition,
             });
             RedoStack.Clear();
 
@@ -593,7 +599,7 @@ public class UndoDataSet
         public int Uid;
         public StaticShape ChangedStaticShape;
         public WorldPosition OldPosition;
-        public WorldPosition MovedWithRespectTo;
+        public WorldPosition MoveOrigin;
         public Orts.Formats.Msts.WorldObject OldWorldObject;
         public Orts.Formats.Msts.WorldObject NewWorldObject;
 
@@ -620,6 +626,12 @@ public enum EditorState
         HandleMoving,
     }
 
+    public enum EditorMoveState
+    {
+        Move,
+        Rotate,
+    }
+
     public class SceneViewerHwndHost : HwndHost
     {
         readonly IntPtr HwndChildHandle;

Source/ORTS.Common/Coordinates.cs

@@ -186,7 +186,7 @@ public void CopyFrom(WorldPosition copy)
         {
             TileX = copy.TileX;
             TileZ = copy.TileZ;
-            Location = copy.Location;
+            XNAMatrix = copy.XNAMatrix;
         }
     }
 

Source/ORTS.Common/Input/UserCommand.cs

@@ -259,6 +259,6 @@ public enum UserCommand
         [GetString("Editor Move Handle")] EditorMoveHandle,
         [GetString("Editor Move Orthogonal")] EditorLockOrthogonal,
         [GetString("Editor Move Orthogonal")] EditorLockElevation,
-        [GetString("Editor Move Orthogonal")] EditorLockRotation,
+        [GetString("Editor Move Orthogonal")] EditorRotate,
     }
 }

Source/ORTS.Settings/InputSettings.cs

@@ -546,7 +546,7 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.EditorMoveHandle] = new UserCommandKeyInput(Keys.M, KeyModifiers.Alt);
             Commands[(int)UserCommand.EditorLockOrthogonal] = new UserCommandModifierInput(KeyModifiers.Shift);
             Commands[(int)UserCommand.EditorLockElevation] = new UserCommandModifierInput(KeyModifiers.Control);
-            Commands[(int)UserCommand.EditorLockRotation] = new UserCommandKeyInput(Keys.R);
+            Commands[(int)UserCommand.EditorRotate] = new UserCommandKeyInput(Keys.R);
         }
         #endregion