Changeset 2195Tweet

Timestamp:

Jan 2, 2013, 7:08:51 PM (10 years ago)

Author:

sam

Message:

color: add HSL/HSV conversions, fix XYZ/RGB conversions that I mixed up,
add XYZ to xyY conversion (which gives us a pretty accurate xy graph of
the sRGB gamut), and normalise XYZ using a D65 white point.

File:

• trunk/src/lol/image/color.h (modified) (4 diffs)

trunk/src/lol/image/color.h

@@ -81 +81 @@
 
     /*
+     * Convert linear HSV to linear HSL
+     */
+    static vec3 HSVToHSL(vec3 src)
+    {
+        float tmp = (2 - src.y) * src.z;
+        return vec3(src.x, src.y * src.z / (1.f - abs(1.f - tmp)), 0.5f * tmp);
+    }
+
+    static vec4 HSVToHSL(vec4 src)
+    {
+        return vec4(HSVToHSL(src.rgb), src.a);
+    }
+
+    /*
+     * Convert linear HSL to linear HSV
+     */
+    static vec3 HSLToHSV(vec3 src)
+    {
+        float tmp = src.y * (0.5f - abs(0.5f - src.z));
+        return vec3(src.x, 2.f * tmp / (src.z + tmp), src.z + tmp);
+    }
+
+    static vec4 HSLToHSV(vec4 src)
+    {
+        return vec4(HSLToHSV(src.rgb), src.a);
+    }
+
+    /*
      * Convert linear RGB to CIE XYZ
      */
     static vec3 LinearRGBToCIEXYZ(vec3 src)
+    {
+        mat3 m(vec3(0.4124f, 0.2126f, 0.0193f),
+               vec3(0.3576f, 0.7152f, 0.1192f),
+               vec3(0.1805f, 0.0722f, 0.9505f));
+        return m * src;
+    }
+
+    static vec4 LinearRGBToCIEXYZ(vec4 src)
+    {
+        return vec4(LinearRGBToCIEXYZ(src.rgb), src.a);
+    }
+
+    /*
+     * Convert CIE XYZ to linear RGB
+     */
+    static vec3 CIEXYZToLinearRGB(vec3 src)
     {
         mat3 m(vec3(3.2406f, -0.9689f, 0.0557f),
@@ -91 +135 @@
     }
 
-    static vec4 LinearRGBToCIEXYZ(vec4 src)
-    {
-        return vec4(LinearRGBToCIEXYZ(src.rgb), src.a);
-    }
-
-    /*
-     * Convert CIE XYZ to linear RGB
-     */
-    static vec3 CIEXYZToLinearRGB(vec3 src)
-    {
-        mat3 m(vec3(0.4124f, 0.2126f, 0.0193f),
-               vec3(0.3576f, 0.7152f, 0.1192f),
-               vec3(0.1805f, 0.0722f, 0.9505f));
-        return m * src;
-    }
-
     static vec4 CIEXYZToLinearRGB(vec4 src)
     {
@@ -113 +141 @@
 
     /*
+     * Convert CIE XYZ to CIE xyY
+     */
+    static vec3 CIEXYZToCIExyY(vec3 src)
+    {
+        float tmp = 1.0f / (src.x + src.y + src.z);
+        return vec3(src.x * tmp, src.y * tmp, src.y);
+    }
+
+    static vec4 CIEXYZToCIExyY(vec4 src)
+    {
+        return vec4(CIEXYZToCIExyY(src.rgb), src.a);
+    }
+
+    /*
      * Convert CIE XYZ to CIE L*a*b*
-     * Note: XYZ values should be normalised, ie. divided by the
-     * corresponding components for white.
+     * Note: XYZ values are normalised using a D65 illuminant.
      */
     static vec3 CIEXYZToCIELab(vec3 src)
@@ -123 +164 @@
         float const c = 4.0 / 29;
         float const d = 1.0 / 3;
+
+        /* Normalise XYZ using D65 illuminant */
+        src *= vec3(1.f / 95.047f, 1.f / 100.f, 1.f / 108.883f);
 
         vec3 f = b * src + vec3(c);