Changeset 2200Tweet

Timestamp:

Jan 4, 2013, 2:57:10 PM (7 years ago)

Author:

sam

Message:

color: linear interpolation for the wavelength to colour function.

Location:

trunk/src

Files:

• image/color/cie1931.cpp (modified) (2 diffs)
• lol/image/color.h (modified) (1 diff)

trunk/src/image/color/cie1931.cpp

@@ -696 +696 @@
     0.616053f, 0.99911f, 0.001091f,
     0.633948f, 0.99977f, 0.000711f,
-    0.651901f, 1f, 0.000407f,
+    0.651901f, 1.f, 0.000407f,
     0.669824f, 0.99971f, 0.000184f,
     0.687632f, 0.99885f, 0.000047f,
@@ -974 +974 @@
 vec3 Color::WavelengthToCIExyY(float nm)
 {
-    if (nm < 360.0f || nm > 830.0f)
-        return vec3(0.0f, 0.0f);
-
-    int index = (int)nm * 3;
-    float x = cie_1931_xyz[index];
-    float y = cie_1931_xyz[index + 1];
-    float z = cie_1931_xyz[index + 2];
-
-    return vec3(x, y, 100.0f);
+    nm -= 360.f;
+
+    int i = (int)nm;
+    if (i < 0 || i > 830 - 360)
+        return vec3(0.0f);
+
+    float t = nm - i, s = 1.0 - t;
+    float x = s * cie_1931_xyz[i * 3 + 0] + t * cie_1931_xyz[i * 3 + 3];
+    float y = s * cie_1931_xyz[i * 3 + 1] + t * cie_1931_xyz[i * 3 + 4];
+    float z = s * cie_1931_xyz[i * 3 + 2] + t * cie_1931_xyz[i * 3 + 5];
+    float normalize = 1.f / (x + y + z);
+
+    return vec3(x * normalize, y * normalize, 100.0f);
 }
 

trunk/src/lol/image/color.h

@@ -277 +277 @@
 
     /* Convert a wavelength to an xyY fully saturated colour */
-    vec3 WavelengthToCIExyY(float nm);
+    static vec3 WavelengthToCIExyY(float nm);
 };