Camera behavior changes

Author: pzgulyas

Source/ORTS.Common/Input/UserCommand.cs

@@ -251,5 +251,7 @@ public enum UserCommand
 
         // Editor
         [GetString("Editor Unselect All")] EditorUnselectAll,
+        [GetString("Editor Undo")] EditorUndo,
+        [GetString("Editor Redo")] EditorRedo,
     }
 }

Source/ORTS.Settings/InputSettings.cs

@@ -538,6 +538,8 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.GameUncoupleWithMouse] = new UserCommandKeyInput(0x16);
 
             Commands[(int)UserCommand.EditorUnselectAll] = new UserCommandKeyInput(0x01);
+            Commands[(int)UserCommand.EditorUndo] = new UserCommandKeyInput(Keys.Z, KeyModifiers.Control); // Not assigning by scan code, because on German influenced keyboard layounts
+            Commands[(int)UserCommand.EditorRedo] = new UserCommandKeyInput(Keys.Y, KeyModifiers.Control); // the Y and Z keys are exchanged, and we want these to match the o/s
         }
         #endregion
 

Source/RunActivity/Viewer3D/Cameras.cs

@@ -820,7 +820,11 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
 
         public override void ZoomByMouseWheel(float speed)
         {
-            ZoomIn(speed * UserInput.MouseWheelChange * ZoomFactor);
+            // Zoom/move towards the mouse cursor instead of the camera forward
+            var movement = speed * -UserInput.MouseWheelChange * ZoomFactor * Vector3.Normalize(Viewer.NearPoint - Viewer.FarPoint);
+            movement.Z *= -1;
+            cameraLocation.Location += movement;
+            cameraLocation.Normalize();
         }
 
         public override void RotateByMouse()
@@ -831,8 +835,9 @@ public override void RotateByMouse()
             var deltaAngleX = MathHelper.WrapAngle(RotationXRadians - StoredAngleX);
             var deltaAngleY = MathHelper.WrapAngle(RotationYRadians - StoredAngleY);
 
-            var dax = StoredForward.Z * deltaAngleX;
-            var daz = StoredForward.X * deltaAngleX;
+            var dax = Vector3.Dot(StoredForward, Vector3.UnitZ) * deltaAngleX;
+            var daz = Vector3.Dot(StoredForward, Vector3.UnitX) * deltaAngleX;
+
             var transform = Matrix.CreateRotationX(dax);
             transform *= Matrix.CreateRotationZ(daz);
             transform *= Matrix.CreateRotationY(-deltaAngleY);
@@ -846,7 +851,7 @@ public override void RotateByMouse()
             cameraLocation = newWorldLocation;
         }
 
-        public void StoreRotationOrigin(Vector3 rotationOrigin)
+        void StoreRotationOrigin(Vector3 rotationOrigin)
         {
             StoredOrigin = Viewer.TerrainPoint;
             StoredLocation = CameraWorldLocation;
@@ -858,7 +863,9 @@ public void StoreRotationOrigin(Vector3 rotationOrigin)
             StoredForward = xnaView.Forward;
         }
 
-        public void SetOrientation(float rotationXRadians, float rotationYRadians)
+        public float GetRotationX() { return RotationXRadians; }
+        public float GetRotationY() { return RotationYRadians; }
+        public void SetRotation(float rotationXRadians, float rotationYRadians)
         {
             RotationXRadians = rotationXRadians;
             RotationYRadians = rotationYRadians;

Source/RunActivity/Viewer3D/EditorPrimitives.cs

@@ -176,8 +176,8 @@ public MouseCrosshair(Viewer viewer, Color color)
             {
                 new VertexPositionColor(new Vector3(-5, 0, 0), color),
                 new VertexPositionColor(new Vector3(5, 0, 0), color),
-                new VertexPositionColor(new Vector3(0, 0, -5), color),
-                new VertexPositionColor(new Vector3(0, 0, 5), color),
+                new VertexPositionColor(new Vector3(0, 0, -5), Color.Red),
+                new VertexPositionColor(new Vector3(0, 0, 5), Color.Cyan),
                 new VertexPositionColor(new Vector3(0, 0, 0), color),
                 new VertexPositionColor(new Vector3(0, 20, 0), color)
             };