diff --git a/Control/TabTSCB.xaml.cs b/Control/TabTSCB.xaml.cs index 877929e..caa9cd7 100644 --- a/Control/TabTSCB.xaml.cs +++ b/Control/TabTSCB.xaml.cs @@ -412,7 +412,7 @@ namespace BOTWToolset.Control if (float.TryParse(textSender.Text, out float overrideValue)) { // Clamp value between 0 and 1 - overrideValue = MathExt.Clamp(overrideValue, 0.0f, 1.0f); + overrideValue = Math.Clamp(overrideValue, 0.0f, 1.0f); BOTWConsole.Log($"Overriding {textSender.Name} with value {overrideValue}"); diff --git a/IO/TSCB/TSCB.cs b/IO/TSCB/TSCB.cs index 18a36a9..2e19b05 100644 --- a/IO/TSCB/TSCB.cs +++ b/IO/TSCB/TSCB.cs @@ -23,10 +23,10 @@ namespace BOTWToolset.IO.TSCB public uint FileBaseOffset { get => _fileBaseOffset; set => _fileBaseOffset = value; } private uint _fileBaseOffset; - public float WorldScale { get => _worldScale; set => _worldScale = value.Clamp(0f, 800.0f); } + public float WorldScale { get => _worldScale; set => _worldScale = Math.Clamp(value, 0f, 800.0f); } private float _worldScale; - public float TerrainMaxHeight { get => _terrainMaxHeight; set => _terrainMaxHeight = value.Clamp(0f, 800.0f); } + public float TerrainMaxHeight { get => _terrainMaxHeight; set => _terrainMaxHeight = Math.Clamp(value, 0f, 800.0f); } private float _terrainMaxHeight; public byte[] MaterialInfoOffsets; diff --git a/MathExt.cs b/MathExt.cs index 571b594..03b4b36 100644 --- a/MathExt.cs +++ b/MathExt.cs @@ -1,27 +1,10 @@ -using System; - -namespace BOTWToolset +namespace BOTWToolset { /// /// Extensions for Math. /// static class MathExt { - /// - /// Clamps a value into a minimum and maximum range. - /// - /// - /// Value to clamp. - /// The minimum value to use. - /// The maximum value to use. - /// - public static T Clamp(this T val, T min, T max) where T : IComparable - { - if (val.CompareTo(min) < 0) return min; - else if (val.CompareTo(max) > 0) return max; - else return val; - } - /// /// Linearly interpolates a value. ///