colors: Basic colors are now objects. Add the >rgba method on arrays

(kludge).

diff --git a/extra/colors/colors.factor b/extra/colors/colors.factor
index f8de326b4d184597df3935479f449ad08c3387e6..02ad3ac778f52f84e5f1c888d7150071ba1a3540 100644 (file)
--- a/extra/colors/colors.factor
+++ b/extra/colors/colors.factor
@@ -28,6 +28,8 @@ METHOD: >rgba { hsva }
 
 METHOD: >rgba { grey } [ grey>> dup dup ] [ alpha>> ] bi rgba boa ;
 
+METHOD: >rgba { array } first4 rgba boa ;
+
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 USE: syntax
@@ -38,16 +40,16 @@ M: color blue>>  >rgba blue>> ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: black { 0.0 0.0 0.0 1.0 } ;
-: blue { 0.0 0.0 1.0 1.0 } ;
-: cyan { 0 0.941 0.941 1 } ;
-: gray { 0.6 0.6 0.6 1.0 } ;
-: green { 0.0 1.0 0.0 1.0 } ;
-: light-gray { 0.95 0.95 0.95 0.95 } ;
-: light-purple { 0.8 0.8 1.0 1.0 } ;
-: magenta { 0.941 0 0.941 1 } ;
-: orange  { 0.941 0.627 0 1 } ;
-: purple  { 0.627 0 0.941 1 } ;
-: red { 1.0 0.0 0.0 1.0 } ;
-: white { 1.0 1.0 1.0 1.0 } ;
-: yellow { 1.0 1.0 0.0 1.0 } ;
+: black        T{ rgba f 0.0   0.0   0.0   1.0  } ;
+: blue         T{ rgba f 0.0   0.0   1.0   1.0  } ;
+: cyan         T{ rgba f 0     0.941 0.941 1    } ;
+: gray         T{ rgba f 0.6   0.6   0.6   1.0  } ;
+: green        T{ rgba f 0.0   1.0   0.0   1.0  } ;
+: light-gray   T{ rgba f 0.95  0.95  0.95  0.95 } ;
+: light-purple T{ rgba f 0.8   0.8   1.0   1.0  } ;
+: magenta      T{ rgba f 0.941 0     0.941 1    } ;
+: orange       T{ rgba f 0.941 0.627 0     1    } ;
+: purple       T{ rgba f 0.627 0     0.941 1    } ;
+: red          T{ rgba f 1.0   0.0   0.0   1.0  } ;
+: white        T{ rgba f 1.0   1.0   1.0   1.0  } ;
+: yellow       T{ rgba f 1.0   1.0   0.0   1.0  } ;