Cleanups

Author: papadanku

shaders/cChromaticity.fx

@@ -67,13 +67,17 @@ float4 PS_Chromaticity(CShade_VS2PS_Quad Input) : SV_TARGET0
             Chromaticity.rg = CColor_GetHSVfromRGB(Color).rg;
             break;
         case 13: // CoCg (XY)
-            Chromaticity.rg = CColor_GetYCOCGfromRGB(Gamma, true).yz + 0.5;
+            Chromaticity.rg = CColor_GetYCOCGfromRGB(Gamma, true).yz;
             break;
         case 14: // OKLab (AB)
-            Chromaticity.rg = CColor_GetOKLABfromRGB(Color).yz + 0.5;
+            Chromaticity.rg = CColor_GetOKLABfromRGB(Color).yz;
+            Chromaticity.rg = (Chromaticity.rg + 0.4) / 0.8;
             break;
         case 15: // OKLch (CH)
-            Chromaticity.rg = CColor_GetOKLCHfromRGB(Color, true).yz;
+            const float Pi2 = CMath_GetPi() * 2.0;
+            Chromaticity.rg = CColor_GetOKLCHfromRGB(Color).yz;
+            Chromaticity.r /= length(float2(0.4, 0.4));
+            Chromaticity.g /= Pi2;
             break;
         default: // No Chromaticity
             Chromaticity.rgb = 0.0;

shaders/shared/cColor.fxh

@@ -393,14 +393,12 @@
         return LMS;
     }
 
-    float3 CColor_GetOKLCHfromOKLAB(float3 OKLab, bool Normalize)
+    float3 CColor_GetOKLCHfromOKLAB(float3 OKLab)
     {
-        const float Pi2 = CMath_GetPi() * 2.0;
         float3 OKLch = 0.0;
         OKLch.x = OKLab.x;
         OKLch.y = length(OKLab.yz);
         OKLch.z = atan2(OKLab.z, OKLab.y);
-        OKLch.z = (Normalize) ? OKLch.z / Pi2 : OKLch.z;
         return OKLch;
     }
 
@@ -413,9 +411,9 @@
         return OKLab;
     }
 
-    float3 CColor_GetOKLCHfromRGB(float3 Color, bool Normalize)
+    float3 CColor_GetOKLCHfromRGB(float3 Color)
     {
-        return CColor_GetOKLCHfromOKLAB(CColor_GetOKLABfromRGB(Color), Normalize);
+        return CColor_GetOKLCHfromOKLAB(CColor_GetOKLABfromRGB(Color));
     }
 
     float3 CColor_GetRGBfromOKLCH(float3 OKLch)
@@ -569,7 +567,7 @@
         Color.y += Tint;
 
         // Convert OKLab to OKLch
-        Color = CColor_GetOKLCHfromOKLAB(Color, false);
+        Color = CColor_GetOKLCHfromOKLAB(Color);
 
         // Apply lightness
         Color.x *= Lightness;