WIP 2

scripts/util/colors.ts

@@ -84,25 +84,15 @@ function rgbaStringLerp(colorA: string, colorB: string, alpha: number, useHsv: b
 
 	const newRgb: RgbaTuple = HSVToLinearRGB(newHsv) as RgbaTuple;
 
-	return tupleToRgbaString(newHsv);
+	return tupleToRgbaString(newRgb);
 }
 /** Converts an HSV color to a linear space RGB color */
 function HSVToLinearRGB([h, s, v, a]: RgbaTuple): number[] {
-	// In this color, R = H, G = S, B = V
-	const Hue = h;
-	const Saturation = s;
-	const Value = v;
-
-	const HDiv60 = Hue / 60;
-	const HDiv60_Floor = Math.floor(HDiv60);
-	const HDiv60_Fraction = HDiv60 - HDiv60_Floor;
-
-	const RGBValues: RgbaTuple = [
-		Value,
-		Value * (1 - Saturation),
-		Value * (1 - HDiv60_Fraction * Saturation),
-		Value * (1 - (1 - HDiv60_Fraction) * Saturation)
-	];
+	const hueDir = h / 60;
+	const hueDir_Floor = Math.floor(hueDir);
+	const hueDir_Fraction = hueDir - hueDir_Floor;
+
+	const RGBValues: RgbaTuple = [v, v * (1 - s), v * (1 - hueDir_Fraction * s), v * (1 - (1 - hueDir_Fraction) * s)];
 	const RGBSwizzle = [
 		[0, 3, 1],
 		[2, 0, 1],
@@ -111,7 +101,7 @@ function HSVToLinearRGB([h, s, v, a]: RgbaTuple): number[] {
 		[3, 1, 0],
 		[0, 1, 2]
 	];
-	const SwizzleIndex = HDiv60_Floor % 6;
+	const SwizzleIndex = hueDir_Floor % 6;
 
 	return [
 		RGBValues[RGBSwizzle[SwizzleIndex][0]] * 255,