Add target FPS option

Author: Rampastring

src/TSMapEditor/UI/MapUI.cs

@@ -59,7 +59,7 @@ public interface ICursorActionTarget : IMapView
     /// </summary>
     public class MapUI : XNAControl, ICursorActionTarget, IMutationTarget
     {
-        private const float RightClickScrollRateDivisor = 64f;
+        private const float RightClickScrollRateDivisor = 48f;
         private const double ZoomStep = 0.1;
 
         private static Color[] MarbleMadnessTileHeightLevelColors = new Color[]
@@ -482,19 +482,6 @@ public override void OnMouseOnControl()
                 }
             }
 
-            if (isRightClickScrolling)
-            {
-                if (Cursor.RightDown)
-                {
-                    var newCursorPosition = GetCursorPoint();
-                    var result = newCursorPosition - rightClickScrollInitPos;
-                    float rightClickScrollRate = (float)((scrollRate / RightClickScrollRateDivisor) / Camera.ZoomLevel);
-
-                    Camera.FloatTopLeftPoint = new Vector2(Camera.FloatTopLeftPoint.X + result.X * rightClickScrollRate,
-                        Camera.FloatTopLeftPoint.Y + result.Y * rightClickScrollRate);
-                }
-            }
-
             pressedDownPoint = GetCursorPoint();
 
             base.OnMouseOnControl();
@@ -619,9 +606,23 @@ public override void Update(GameTime gameTime)
             // 1000 ms (1 second) divided by 60 frames =~ 16.667 ms / frame
             int scrollRate = (int)(this.scrollRate * (gameTime.ElapsedGameTime.TotalMilliseconds / 16.667));
 
-            if (IsActive && !(WindowManager.SelectedControl is XNATextBox))
+            if (IsActive)
             {
-                Camera.KeyboardUpdate(Keyboard, scrollRate);
+                if (!(WindowManager.SelectedControl is XNATextBox))
+                    Camera.KeyboardUpdate(Keyboard, scrollRate);
+
+                if (isRightClickScrolling)
+                {
+                    if (Cursor.RightDown)
+                    {
+                        var newCursorPosition = GetCursorPoint();
+                        var result = newCursorPosition - rightClickScrollInitPos;
+                        float rightClickScrollRate = (float)((scrollRate / RightClickScrollRateDivisor) / Camera.ZoomLevel);
+
+                        Camera.FloatTopLeftPoint = new Vector2(Camera.FloatTopLeftPoint.X + result.X * rightClickScrollRate,
+                            Camera.FloatTopLeftPoint.Y + result.Y * rightClickScrollRate);
+                    }
+                }
             }
 
             if (leftPressedDownOnControl && !Cursor.LeftDown)

src/TSMapEditor/UI/SettingsPanel.cs

@@ -75,6 +75,7 @@ public SettingsPanel(WindowManager windowManager) : base(windowManager)
         }
 
         private XNADropDown ddRenderScale;
+        private XNADropDown ddTargetFPS;
         private XNACheckBox chkBorderless;
         private XNADropDown ddTheme;
         private XNADropDown ddScrollRate;
@@ -129,11 +130,28 @@ public override void Initialize()
                 }
             }
 
+            var lblTargetFPS = new XNALabel(WindowManager);
+            lblTargetFPS.Name = nameof(lblTargetFPS);
+            lblTargetFPS.Text = "Target FPS:";
+            lblTargetFPS.X = Constants.UIEmptySideSpace;
+            lblTargetFPS.Y = ddRenderScale.Bottom + Constants.UIEmptyTopSpace + 1;
+            AddChild(lblTargetFPS);
+
+            ddTargetFPS = new XNADropDown(WindowManager);
+            ddTargetFPS.Name = nameof(ddTargetFPS);
+            ddTargetFPS.X = ddRenderScale.X;
+            ddTargetFPS.Y = lblTargetFPS.Y - 1;
+            ddTargetFPS.Width = ddRenderScale.Width;
+            AddChild(ddTargetFPS);
+            var targetFramerates = new int[] { 1000, 480, 240, 144, 120, 90, 75, 60, 30, 20 };
+            foreach (int frameRate in targetFramerates)
+                ddTargetFPS.AddItem(new XNADropDownItem() { Text = frameRate.ToString(CultureInfo.InvariantCulture), Tag = frameRate });
+
             var lblTheme = new XNALabel(WindowManager);
             lblTheme.Name = nameof(lblTheme);
             lblTheme.Text = "Theme:";
             lblTheme.X = lblRenderScale.X;
-            lblTheme.Y = ddRenderScale.Bottom + Constants.UIEmptyTopSpace;
+            lblTheme.Y = ddTargetFPS.Bottom + Constants.UIEmptyTopSpace;
             AddChild(lblTheme);
 
             ddTheme = new XNADropDown(WindowManager);
@@ -218,6 +236,7 @@ private void LoadSettings()
             var userSettings = UserSettings.Instance;
 
             ddRenderScale.SelectedIndex = ddRenderScale.Items.FindIndex(i => (double)i.Tag == userSettings.RenderScale.GetValue());
+            ddTargetFPS.SelectedIndex = ddTargetFPS.Items.FindIndex(item => (int)item.Tag == userSettings.TargetFPS.GetValue());
 
             int selectedTheme = ddTheme.Items.FindIndex(i => i.Text == userSettings.Theme);
             if (selectedTheme == -1)
@@ -249,8 +268,12 @@ public void ApplySettings()
             userSettings.FullscreenWindowed.UserDefinedValue = chkBorderless.Checked;
 
             if (ddRenderScale.SelectedItem != null)
-            {
                 userSettings.RenderScale.UserDefinedValue = (double)ddRenderScale.SelectedItem.Tag;
+
+            if (ddTargetFPS.SelectedItem != null)
+            {
+                userSettings.TargetFPS.UserDefinedValue = (int)ddTargetFPS.SelectedItem.Tag;
+                WindowManager.Game.TargetElapsedTime = TimeSpan.FromMilliseconds(1000.0 / UserSettings.Instance.TargetFPS);
             }
 
             userSettings.TextEditorPath.UserDefinedValue = tbTextEditorPath.Text;