GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Mathf.Map usage to Mathf.Remap

Browse Source 
#1008
This commit is contained in:
Wojtek Figat
2023-04-19 13:11:52 +02:00
parent c2117f0254
commit 1b278f5c56
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/GUI/Input/SliderControl.cs
View File

@@ -196,7 +196,7 @@ namespace FlaxEditor.GUI.Input
{ {
// Update sliding // Update sliding
var slidePosition = location + Root.TrackingMouseOffset; 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 else
{ {
@@ -380,7 +380,7 @@ namespace FlaxEditor.GUI.Input
if (_valueIsChanging) if (_valueIsChanging)
return; 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() private void OnTextBoxEditEnd()
@@ -434,7 +434,7 @@ namespace FlaxEditor.GUI.Input
/// </summary> /// </summary>
protected virtual void UpdateSlider() 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);
} }
/// <summary> /// <summary>

12
Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs
View File

@@ -206,14 +206,14 @@ namespace FlaxEditor.Surface.Archetypes
if (_is2D) if (_is2D)
{ {
pos = new Float2( 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),
Mathf.Map(pos.Y, pointsArea.Bottom, pointsArea.Top, _rangeY.X, _rangeY.Y) Mathf.Remap(pos.Y, pointsArea.Bottom, pointsArea.Top, _rangeY.X, _rangeY.Y)
); );
} }
else else
{ {
pos = new Float2( 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 0
); );
} }
@@ -231,14 +231,14 @@ namespace FlaxEditor.Surface.Archetypes
if (_is2D) if (_is2D)
{ {
pos = new Float2( 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),
Mathf.Map(pos.Y, _rangeY.X, _rangeY.Y, pointsArea.Bottom, pointsArea.Top) Mathf.Remap(pos.Y, _rangeY.X, _rangeY.Y, pointsArea.Bottom, pointsArea.Top)
); );
} }
else else
{ {
pos = new Float2( 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 pointsArea.Center.Y
); );
} }