Add support for color2, vector2, color4 and vector4 types

Signed-off-by: Sparsh-N <sparsh.nair@hotmail.com>

Author: Sparsh-N

src/shaders/color2.h

@@ -183,6 +183,12 @@ color2 mix(color2 a, color2 b, float x )
                   mix(a.a, b.a, x));
 }
 
+color2 unmix(color2 a, color2 b, float x )
+{
+    return color2(unmix(a.r, b.r, x),
+                  unmix(a.a, b.a, x));
+}
+
 color2 smoothstep(color2 edge0, color2 edge1, color2 c)
 {
     return color2(smoothstep(edge0.r, edge1.r, c.r),

src/shaders/color4.h

@@ -183,6 +183,12 @@ color4 mix(color4 a, color4 b, float x )
                   mix(a.a, b.a, x));
 }
 
+color4 unmix(color4 a, color4 b, float x )
+{
+    return color4(unmix(a.rgb, b.rgb, x),
+                  unmix(a.a, b.a, x));
+}
+
 color4 smoothstep(color4 edge0, color4 edge1, color4 c)
 {
     return color4(smoothstep(edge0.rgb, edge1.rgb, c.rgb),

src/shaders/stdosl.h

@@ -164,7 +164,7 @@ float  mix (float  x, float  y, float  a) BUILTIN;
 closure color mix (closure color x, closure color y, float a) { return x*(1-a) + y*a; }
 closure color mix (closure color x, closure color y, color a) { return x*(1-a) + y*a; }
 
-#if 0
+#if 0 // Assuming x != y
 normal unmix (normal x, normal y, normal a) { return (a - x) / (y - x); }
 normal unmix (normal x, normal y, float  a) { return (a - x) / (y - x); }
 vector unmix (vector x, vector y, vector a) { return (a - x) / (y - x); }
@@ -185,8 +185,8 @@ color  unmix (color  x, color  y, color  a) BUILTIN;
 color  unmix (color  x, color  y, float  a) BUILTIN;
 float  unmix (float  x, float  y, float  a) BUILTIN;
 #endif
-closure color unmix (closure color x, closure color y, float a) { return (a - x) / (y - x); }
-closure color unmix (closure color x, closure color y, color a) { return (a - x) / (y - x); }
+// closure color unmix (closure color x, closure color y, float a) { return (a - x) / (y - x); }
+// closure color unmix (closure color x, closure color y, color a) { return (a - x) / (y - x); }
 
 // TODO: ADD REMAP FROM MIX AND UNMIX
 

src/shaders/vector2.h

@@ -182,6 +182,11 @@ vector2 mix(vector2 a, vector2 b, float x )
     return vector2 (mix(a.x, b.x, x), mix(a.y, b.y, x));
 }
 
+vector2 unmix(vector2 a, vector2 b, float x )
+{
+    return vector2 (unmix(a.x, b.x, x), unmix(a.y, b.y, x));
+}
+
 float dot(vector2 a, vector2 b)
 {
     return (a.x * b.x + a.y * b.y);

src/shaders/vector4.h

@@ -209,6 +209,14 @@ vector4 mix(vector4 value1, vector4 value2, float x )
                     mix( value1.w, value2.w, x));
 }
 
+vector4 unmix(vector4 value1, vector4 value2, float x )
+{
+    return vector4 (unmix( value1.x, value2.x, x),
+                    unmix( value1.y, value2.y, x),
+                    unmix( value1.z, value2.z, x),
+                    unmix( value1.w, value2.w, x));
+}
+
 vector vec4ToVec3(vector4 v)
 {
     return vector(v.x, v.y, v.z) / v.w;