summaryrefslogtreecommitdiffstats
path: root/libdimension/dimension
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-11-17 22:59:29 -0500
committerTavian Barnes <tavianator@gmail.com>2009-11-17 22:59:29 -0500
commitc576229cc54c0fb963967751281e6a42fc9230ea (patch)
treed6988c644d8776d23492b326026a0f56a6162bb0 /libdimension/dimension
parent3473e1cbdc6200131923d1fd25e0b021bf66a06c (diff)
downloaddimension-c576229cc54c0fb963967751281e6a42fc9230ea.tar.xz
Use CIE 1931 RGB for dmnsn_color_illuminate().
Diffstat (limited to 'libdimension/dimension')
-rw-r--r--libdimension/dimension/color.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/libdimension/dimension/color.h b/libdimension/dimension/color.h
index a72de98..ad50334 100644
--- a/libdimension/dimension/color.h
+++ b/libdimension/dimension/color.h
@@ -46,6 +46,10 @@ typedef struct {
} dmnsn_CIE_xyY;
typedef struct {
+ double R, G, B; /* CIE 1931 RGB, a linear transformation of CIE XYZ */
+} dmnsn_CIE_RGB;
+
+typedef struct {
double L, a, b; /* L is luminence (100 = diffuse white); a and b are color-
opponent dimensions. This color space is used for color
arithmetic. */
@@ -61,7 +65,8 @@ typedef struct {
} dmnsn_sRGB;
/* Standard colors */
-extern const dmnsn_color dmnsn_black, dmnsn_white;
+extern const dmnsn_color dmnsn_black, dmnsn_white, dmnsn_red, dmnsn_green,
+ dmnsn_blue, dmnsn_magenta, dmnsn_yellow, dmnsn_cyan;
/* Standard whitepoint, determined by the conversion of sRGB white to CIE XYZ */
extern const dmnsn_CIE_XYZ dmnsn_whitepoint;
@@ -70,12 +75,14 @@ extern const dmnsn_CIE_XYZ dmnsn_whitepoint;
dmnsn_color dmnsn_color_from_XYZ(dmnsn_CIE_XYZ XYZ);
dmnsn_color dmnsn_color_from_xyY(dmnsn_CIE_xyY xyY);
+dmnsn_color dmnsn_color_from_RGB(dmnsn_CIE_RGB RGB);
dmnsn_color dmnsn_color_from_Lab(dmnsn_CIE_Lab Lab, dmnsn_CIE_XYZ white);
dmnsn_color dmnsn_color_from_Luv(dmnsn_CIE_Luv Luv, dmnsn_CIE_XYZ white);
dmnsn_color dmnsn_color_from_sRGB(dmnsn_sRGB sRGB);
dmnsn_CIE_XYZ dmnsn_XYZ_from_color(dmnsn_color color);
dmnsn_CIE_xyY dmnsn_xyY_from_color(dmnsn_color color);
+dmnsn_CIE_RGB dmnsn_RGB_from_color(dmnsn_color color);
dmnsn_CIE_Lab dmnsn_Lab_from_color(dmnsn_color color, dmnsn_CIE_XYZ white);
dmnsn_CIE_Luv dmnsn_Luv_from_color(dmnsn_color color, dmnsn_CIE_XYZ white);
dmnsn_sRGB dmnsn_sRGB_from_color(dmnsn_color color);