Changed HsvColor and HslColor to use float instead of double

Author: Avid29

components/Helpers/src/ColorHelper/ColorExtensions.cs

@@ -64,7 +64,7 @@ public static Color AlphaOver(this Color @base, Color overlay, double alpha)
     /// <param name="original">The original color.</param>
     /// <param name="hue">The new hue.</param>
     /// <returns>A <see cref="HsvColor"/> with a new hue and the same saturation and value.</returns>
-    public static HsvColor WithHue(this Color original, double hue)
+    public static HsvColor WithHue(this Color original, float hue)
     {
         var hsv = (HsvColor)original;
         hsv.Hue = hue;
@@ -77,7 +77,7 @@ public static HsvColor WithHue(this Color original, double hue)
     /// <param name="original">The original color.</param>
     /// <param name="saturation">The new saturation.</param>
     /// <returns>A <see cref="HsvColor"/> with a new saturation and the same hue and value.</returns>
-    public static HsvColor WithSaturation(this Color original, double saturation)
+    public static HsvColor WithSaturation(this Color original, float saturation)
     {
         var hsv = (HsvColor)original;
         hsv.Saturation = saturation;
@@ -90,7 +90,7 @@ public static HsvColor WithSaturation(this Color original, double saturation)
     /// <param name="original">The original color.</param>
     /// <param name="value">The new value.</param>
     /// <returns>A <see cref="HsvColor"/> with a new value and the same hue and saturation.</returns>
-    public static HsvColor WithValue(this Color original, double value)
+    public static HsvColor WithValue(this Color original, float value)
     {
         var hsv = (HsvColor)original;
         hsv.Value = value;
@@ -103,7 +103,7 @@ public static HsvColor WithValue(this Color original, double value)
     /// <param name="original">The original color.</param>
     /// <param name="lightness">The new lightness.</param>
     /// <returns>A <see cref="HsvColor"/> with a new lightness and the same hue and saturation.</returns>
-    public static HslColor WithLightness(this Color original, double lightness)
+    public static HslColor WithLightness(this Color original, float lightness)
     {
         var hsl = (HslColor)original;
         hsl.Lightness = lightness;
@@ -183,7 +183,7 @@ private static Color MixColors(Color color1, Color color2, double factor)
         /// <param name="l">The color's lightness.</param>
         /// <param name="a">The color's alpha value.</param>
         /// <returns>The color as a <see cref="HslColor"/>.</returns>
-        public static HslColor FromAhsl(double a, double h, double s, double l) => HslColor.Create(h, s, l, a);
+        public static HslColor FromAhsl(float a, float h, float s, float l) => HslColor.Create(h, s, l, a);
 
         /// <summary>
         /// Gets a <see cref="HsvColor"/> from alpha, hue, saturation, and value channel info.
@@ -197,7 +197,7 @@ private static Color MixColors(Color color1, Color color2, double factor)
         /// <param name="v">The color's value.</param>
         /// <param name="a">The color's alpha value.</param>
         /// <returns>The color as a <see cref="HsvColor"/>.</returns>
-        public static HsvColor FromAhsv(double a, double h, double s, double v) => HsvColor.Create(h, s, v, a);
+        public static HsvColor FromAhsv(float a, float h, float s, float v) => HsvColor.Create(h, s, v, a);
 
         /// <summary>
         /// Mixes two colors using a factor for deciding how much influence each color has.

components/Helpers/src/ColorHelper/ColorHelper.Obsolete.cs

@@ -27,7 +27,7 @@ public static partial class ColorHelper
     /// <returns>The created <see cref="Color"/>.</returns>
     [Obsolete("This method is marked deprecated, and will be removed in a future version. Please replace with (Color)HslColor.Create().")]
     public static Color FromHsl(double hue, double saturation, double lightness, double alpha = 1.0)
-        => HslColor.Create(hue, saturation, lightness, alpha);
+        => HslColor.Create((float)hue, (float)saturation, (float)lightness, alpha);
 
     /// <summary>
     /// Creates a <see cref="Color"/> from the specified hue, saturation, value, and alpha values.
@@ -39,7 +39,7 @@ public static Color FromHsl(double hue, double saturation, double lightness, dou
     /// <returns>The created <see cref="Color"/>.</returns>
     [Obsolete("This method is marked deprecated, and will be removed in a future version. Please replace with (Color)HsvColor.Create().")]
     public static Color FromHsv(double hue, double saturation, double value, double alpha = 1.0)
-        => HsvColor.Create(hue, saturation, value, alpha);
+        => HsvColor.Create((float)hue, (float)saturation, (float)value, (float)alpha);
 
     /// <summary>
     /// Converts a <see cref="Color"/> to a hexadecimal string representation.

components/Helpers/src/ColorHelper/ColorHelper.cs

@@ -299,21 +299,21 @@ public static Color ParseColorName(string colorName)
         throw new FormatException($"The name '{colorName}' not a valid color");
     }
 
-    internal static (double h1, double chroma) CalculateHueAndChroma(Color color, out double min, out double max, out double alpha)
+    internal static (float h1, float chroma) CalculateHueAndChroma(Color color, out float min, out float max, out float alpha)
     {
         // This code is shared between both the conversion
         // to both HSL and HSV from RGB.
 
-        var r = (double)color.R / 255;
-        var g = (double)color.G / 255;
-        var b = (double)color.B / 255;
-        alpha = (double)color.A / 255;
+        var r = (float)color.R / 255;
+        var g = (float)color.G / 255;
+        var b = (float)color.B / 255;
+        alpha = (float)color.A / 255;
 
         max = Math.Max(Math.Max(r, g), b);
         min = Math.Min(Math.Min(r, g), b);
         var chroma = max - min;
 
-        double h1;
+        float h1;
         if (chroma == 0)
         {
             // No max
@@ -338,20 +338,20 @@ internal static (double h1, double chroma) CalculateHueAndChroma(Color color, ou
         return (h1, chroma);
     }
 
-    internal static Color FromHueChroma(double h1, double chroma, double x, double m, double alpha)
+    internal static Color FromHueChroma(float h1, float chroma, float x, float m, float alpha)
     {
         // This code is shared between both the conversion
         // from both HSL and HSV to RGB.
 
-        double r1, g1, b1;
+        float r1, g1, b1;
         (r1, g1, b1) = h1 switch
         {
-            < 1 => (chroma, x, 0d),
-            < 2 => (x, chroma, 0d),
-            < 3 => (0d, chroma, x),
-            < 4 => (0d, x, chroma),
-            < 5 => (x, 0d, chroma),
-            _ => (chroma, 0d, x),
+            < 1 => (chroma, x, 0f),
+            < 2 => (x, chroma, 0f),
+            < 3 => (0f, chroma, x),
+            < 4 => (0f, x, chroma),
+            < 5 => (x, 0f, chroma),
+            _ => (chroma, 0f, x),
         };
 
         byte r = (byte)(255 * (r1 + m));
@@ -365,7 +365,7 @@ internal static Color FromHueChroma(double h1, double chroma, double x, double m
     /// <summary>
     /// Parses a string to match the argument pattern "<paramref name="funcName"/>(args[0], args[1], ...)"
     /// </summary>
-    private static bool MatchArgPattern(string value, string funcName, out double[] args)
+    private static bool MatchArgPattern(string value, string funcName, out float[] args)
     {
         args = [];
 
@@ -388,10 +388,10 @@ private static bool MatchArgPattern(string value, string funcName, out double[]
         var argStrings = value.Split(',');
 
         // Parse the args into an array of doubles
-        args = new double[argStrings.Length];
+        args = new float[argStrings.Length];
         for (var i = 0; i < argStrings.Length; i++)
         {
-            if (!double.TryParse(argStrings[i], null, out args[i]))
+            if (!float.TryParse(argStrings[i], null, out args[i]))
                 return false;
         }
 

components/Helpers/src/ColorHelper/HslColor.cs

@@ -47,11 +47,11 @@ public struct HslColor
     private HslColor(Color color)
     {
         // Calculate hue, chroma, and supplementary values
-        (double h1, double chroma) = ColorHelper.CalculateHueAndChroma(color, out var min, out var max, out var alpha);
+        (float h1, float chroma) = ColorHelper.CalculateHueAndChroma(color, out var min, out var max, out var alpha);
 
         // Calculate saturation and lightness
-        double lightness = 0.5 * (max + min);
-        double saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs((2 * lightness) - 1));
+        float lightness = 0.5f * (max + min);
+        float saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs((2 * lightness) - 1));
 
         // Set hsl properties
         Hue = 60 * h1;
@@ -68,7 +68,7 @@ private HslColor(Color color)
     /// <param name="lightness">The color's lightness.</param>
     /// <param name="alpha">The alpha/opacity.</param>
     /// <returns>The new <see cref="HslColor"/>.</returns>
-    public static HslColor Create(double hue, double saturation, double lightness, double alpha = 1)
+    public static HslColor Create(float hue, float saturation, float lightness, double alpha = 1)
     {
         HslColor color = default;
 #pragma warning disable 0618
@@ -90,9 +90,9 @@ public static HslColor Create(double hue, double saturation, double lightness, d
     /// <remarks>
     /// This value is clamped between 0 and 360.
     /// </remarks>
-    public double Hue
+    public float Hue
     {
-        readonly get => Math.Clamp(H, 0, 360);
+        readonly get => (float)H;
         set => H = Math.Clamp(value, 0, 360);
     }
 
@@ -102,9 +102,9 @@ public double Hue
     /// <remarks>
     /// This value is clamped between 0 and 1.
     /// </remarks>
-    public double Saturation
+    public float Saturation
     {
-        readonly get => Math.Clamp(S, 0, 1);
+        readonly get => (float)S;
         set => S = Math.Clamp(value, 0, 1);
     }
 
@@ -114,9 +114,9 @@ public double Saturation
     /// <remarks>
     /// This value is clamped between 0 and 1.
     /// </remarks>
-    public double Lightness
+    public float Lightness
     {
-        readonly get => Math.Clamp(L, 0, 1);
+        readonly get => (float)L;
         set => L = Math.Clamp(value, 0, 1);
     }
 
@@ -126,9 +126,9 @@ public double Lightness
     /// <remarks>
     /// This value is clamped between 0 and 1.
     /// </remarks>
-    public double Alpha
+    public float Alpha
     {
-        readonly get => Math.Clamp(A, 0, 1);
+        readonly get => (float)A;
         set => A = Math.Clamp(value, 0, 1);
     }
 
@@ -140,10 +140,10 @@ public double Alpha
     /// <returns>The <see cref="HslColor"/> as a <see cref="Color"/>.</returns>
     public readonly Color ToColor()
     {
-        double chroma = (1 - Math.Abs((2 * Lightness) - 1)) * Saturation;
-        double h1 = Hue / 60;
-        double x = chroma * (1 - Math.Abs((h1 % 2) - 1));
-        double m = Lightness - (0.5 * chroma);
+        float chroma = (1 - Math.Abs((2 * Lightness) - 1)) * Saturation;
+        float h1 = Hue / 60;
+        float x = chroma * (1 - Math.Abs((h1 % 2) - 1));
+        float m = Lightness - (0.5f * chroma);
 
         return ColorHelper.FromHueChroma(h1, chroma, x, m, Alpha);
     }

components/Helpers/src/ColorHelper/HsvColor.cs

@@ -47,11 +47,11 @@ public struct HsvColor
     private HsvColor(Color color)
     {
         // Calculate hue, chroma, and supplementary values
-        (double h1, double chroma) = ColorHelper.CalculateHueAndChroma(color, out var _, out var max, out var alpha);
+        (float h1, float chroma) = ColorHelper.CalculateHueAndChroma(color, out var _, out var max, out var alpha);
 
         // Calculate saturation and value
-        double saturation = chroma == 0 ? 0 : chroma / max;
-        double value = max;
+        float saturation = chroma == 0 ? 0 : chroma / max;
+        float value = max;
 
         // Set hsv properties
         Hue = 60 * h1;
@@ -68,7 +68,7 @@ private HsvColor(Color color)
     /// <param name="value">The color's value.</param>
     /// <param name="alpha">The alpha/opacity.</param>
     /// <returns>The new <see cref="HsvColor"/>.</returns>
-    public static HsvColor Create(double hue, double saturation, double value, double alpha = 1)
+    public static HsvColor Create(float hue, float saturation, float value, float alpha = 1)
     {
         HsvColor color = default;
 #pragma warning disable 0618
@@ -80,7 +80,6 @@ public static HsvColor Create(double hue, double saturation, double value, doubl
         return color;
     }
 
-
     // This class contains deprecated public backing fields to be removed in a future version.
     // Suppress the warnings from using them in their new wrapping properties.
 #pragma warning disable 0618
@@ -91,9 +90,9 @@ public static HsvColor Create(double hue, double saturation, double value, doubl
     /// <remarks>
     /// This value is clamped between 0 and 360.
     /// </remarks>
-    public double Hue
+    public float Hue
     {
-        readonly get => Math.Clamp(H, 0, 360);
+        readonly get => (float)H;
         set => H = Math.Clamp(value, 0, 360);
     }
 
@@ -103,9 +102,9 @@ public double Hue
     /// <remarks>
     /// This value is clamped between 0 and 1.
     /// </remarks>
-    public double Saturation
+    public float Saturation
     {
-        readonly get => Math.Clamp(S, 0, 1);
+        readonly get => (float)S;
         set => S = Math.Clamp(value, 0, 1);
     }
 
@@ -115,9 +114,9 @@ public double Saturation
     /// <remarks>
     /// This value is clamped between 0 and 1.
     /// </remarks>
-    public double Value
+    public float Value
     {
-        readonly get => Math.Clamp(V, 0, 1);
+        readonly get => (float)V;
         set => V = Math.Clamp(value, 0, 1);
     }
 
@@ -127,9 +126,9 @@ public double Value
     /// <remarks>
     /// This value is clamped between 0 and 1.
     /// </remarks>
-    public double Alpha
+    public float Alpha
     {
-        readonly get => Math.Clamp(A, 0, 1);
+        readonly get => (float)A;
         set => A = Math.Clamp(value, 0, 1);
     }
 
@@ -142,10 +141,10 @@ public double Alpha
     /// <returns>The <see cref="HsvColor"/> as a <see cref="Color"/>.</returns>
     public readonly Color ToColor()
     {
-        double chroma = Value * Saturation;
-        double h1 = Hue / 60;
-        double x = chroma * (1 - Math.Abs((h1 % 2) - 1));
-        double m = Value - chroma;
+        float chroma = Value * Saturation;
+        float h1 = Hue / 60;
+        float x = chroma * (1 - Math.Abs((h1 % 2) - 1));
+        float m = Value - chroma;
 
         return ColorHelper.FromHueChroma(h1, chroma, x, m, Alpha);
     }

components/Helpers/tests/Test_ColorHelper.cs

@@ -196,14 +196,14 @@ public void Test_ColorHelper_ToHsv_MaxR()
     [TestMethod]
     public void Test_ColorHelper_CreateHsl()
     {
-        Assert.AreEqual(HslColor.Create(0.0, 1.0, 0.5), Colors.Red);
+        Assert.AreEqual(HslColor.Create(0.0f, 1.0f, 0.5f), Colors.Red);
     }
 
     [TestCategory("Helpers")]
     [TestMethod]
     public void Test_ColorHelper_CreateHsv()
     {
-        Assert.AreEqual(HsvColor.Create(0.0, 1.0, 1.0), Colors.Red);
+        Assert.AreEqual(HsvColor.Create(0.0f, 1.0f, 1.0f), Colors.Red);
     }
 
     [TestCategory("Helpers")]