From 1b278f5c565f25ec1590c1df193e61938e8b4641 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 19 Apr 2023 13:11:52 +0200 Subject: [PATCH] Update `Mathf.Map` usage to `Mathf.Remap` #1008 --- Source/Editor/GUI/Input/SliderControl.cs | 6 +++--- .../Surface/Archetypes/Animation.MultiBlend.cs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Editor/GUI/Input/SliderControl.cs b/Source/Editor/GUI/Input/SliderControl.cs index c08afc829..01705dbb2 100644 --- a/Source/Editor/GUI/Input/SliderControl.cs +++ b/Source/Editor/GUI/Input/SliderControl.cs @@ -196,7 +196,7 @@ namespace FlaxEditor.GUI.Input { // Update sliding var slidePosition = location + Root.TrackingMouseOffset; - Value = Mathf.Map(slidePosition.X, 4, TrackSize - 4, Minimum, Maximum); + Value = Mathf.Remap(slidePosition.X, 4, TrackSize - 4, Minimum, Maximum); } else { @@ -380,7 +380,7 @@ namespace FlaxEditor.GUI.Input if (_valueIsChanging) return; - Value = Mathf.Map(_slider.Value, Slider.Minimum, Slider.Maximum, MinValue, MaxValue); + Value = Mathf.Remap(_slider.Value, Slider.Minimum, Slider.Maximum, MinValue, MaxValue); } private void OnTextBoxEditEnd() @@ -434,7 +434,7 @@ namespace FlaxEditor.GUI.Input /// protected virtual void UpdateSlider() { - _slider.Value = Mathf.Map(_value, MinValue, MaxValue, Slider.Minimum, Slider.Maximum); + _slider.Value = Mathf.Remap(_value, MinValue, MaxValue, Slider.Minimum, Slider.Maximum); } /// diff --git a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs index 9cb7d9332..4d3239205 100644 --- a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs +++ b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs @@ -206,14 +206,14 @@ namespace FlaxEditor.Surface.Archetypes if (_is2D) { pos = new Float2( - Mathf.Map(pos.X, pointsArea.Left, pointsArea.Right, _rangeX.X, _rangeX.Y), - Mathf.Map(pos.Y, pointsArea.Bottom, pointsArea.Top, _rangeY.X, _rangeY.Y) + Mathf.Remap(pos.X, pointsArea.Left, pointsArea.Right, _rangeX.X, _rangeX.Y), + Mathf.Remap(pos.Y, pointsArea.Bottom, pointsArea.Top, _rangeY.X, _rangeY.Y) ); } else { pos = new Float2( - Mathf.Map(pos.X, pointsArea.Left, pointsArea.Right, _rangeX.X, _rangeX.Y), + Mathf.Remap(pos.X, pointsArea.Left, pointsArea.Right, _rangeX.X, _rangeX.Y), 0 ); } @@ -231,14 +231,14 @@ namespace FlaxEditor.Surface.Archetypes if (_is2D) { pos = new Float2( - Mathf.Map(pos.X, _rangeX.X, _rangeX.Y, pointsArea.Left, pointsArea.Right), - Mathf.Map(pos.Y, _rangeY.X, _rangeY.Y, pointsArea.Bottom, pointsArea.Top) + Mathf.Remap(pos.X, _rangeX.X, _rangeX.Y, pointsArea.Left, pointsArea.Right), + Mathf.Remap(pos.Y, _rangeY.X, _rangeY.Y, pointsArea.Bottom, pointsArea.Top) ); } else { pos = new Float2( - Mathf.Map(pos.X, _rangeX.X, _rangeX.Y, pointsArea.Left, pointsArea.Right), + Mathf.Remap(pos.X, _rangeX.X, _rangeX.Y, pointsArea.Left, pointsArea.Right), pointsArea.Center.Y ); }