Fix conflict

[factor.git] / basis / colors / colors.factor

diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor
index 9c55b1f29a20ce1eedda1f542d6ef3f31e0d089c..0cd743fa5fd8a1e57a7f6cf8f76c6d361af69f6e 100644 (file)
--- a/basis/colors/colors.factor
+++ b/basis/colors/colors.factor
@@ -1,33 +1,30 @@
-! Copyright (C) 2003, 2008 Slava Pestov.
+! Copyright (C) 2003, 2009 Slava Pestov.
 ! Copyright (C) 2008 Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel accessors ;
+USING: kernel accessors combinators math ;
 IN: colors
 
 TUPLE: color ;
 
-TUPLE: rgba < color red green blue alpha ;
+TUPLE: rgba < color
+{ red read-only }
+{ green read-only }
+{ blue read-only }
+{ alpha read-only } ;
 
 C: <rgba> rgba
 
-GENERIC: >rgba ( object -- rgba )
+GENERIC: >rgba ( color -- rgba )
 
 M: rgba >rgba ( rgba -- rgba ) ;
 
-M: color red>>   ( color -- red   ) >rgba red>>   ;
+M: color red>> ( color -- red ) >rgba red>> ;
 M: color green>> ( color -- green ) >rgba green>> ;
-M: color blue>>  ( color -- blue  ) >rgba blue>>  ;
-
-CONSTANT: black        T{ rgba f 0.0   0.0   0.0   1.0  }
-CONSTANT: blue         T{ rgba f 0.0   0.0   1.0   1.0  }
-CONSTANT: cyan         T{ rgba f 0     0.941 0.941 1    }
-CONSTANT: gray         T{ rgba f 0.6   0.6   0.6   1.0  }
-CONSTANT: green        T{ rgba f 0.0   1.0   0.0   1.0  }
-CONSTANT: light-gray   T{ rgba f 0.95  0.95  0.95  0.95 }
-CONSTANT: light-purple T{ rgba f 0.8   0.8   1.0   1.0  }
-CONSTANT: magenta      T{ rgba f 0.941 0     0.941 1    }
-CONSTANT: orange       T{ rgba f 0.941 0.627 0     1    }
-CONSTANT: purple       T{ rgba f 0.627 0     0.941 1    }
-CONSTANT: red          T{ rgba f 1.0   0.0   0.0   1.0  }
-CONSTANT: white        T{ rgba f 1.0   1.0   1.0   1.0  }
-CONSTANT: yellow       T{ rgba f 1.0   1.0   0.0   1.0  }
+M: color blue>> ( color -- blue ) >rgba blue>> ;
+
+: >rgba-components ( object -- r g b a )
+    >rgba { [ red>> ] [ green>> ] [ blue>> ] [ alpha>> ] } cleave ; inline
+
+: opaque? ( color -- ? ) alpha>> 1 number= ;
+
+CONSTANT: transparent T{ rgba f 0.0 0.0 0.0 0.0 }
\ No newline at end of file