diff --git a/basis/colors/colors.factor b/basis/colors/colors.factor index 1364f173d5..ddb2b1a5f4 100644 --- a/basis/colors/colors.factor +++ b/basis/colors/colors.factor @@ -1,4 +1,4 @@ -! 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 ; @@ -14,21 +14,22 @@ GENERIC: >rgba ( object -- 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>> ; +M: color blue>> ( color -- blue ) >rgba blue>> ; -: black T{ rgba f 0.0 0.0 0.0 1.0 } ; inline -: blue T{ rgba f 0.0 0.0 1.0 1.0 } ; inline -: cyan T{ rgba f 0 0.941 0.941 1 } ; inline -: gray T{ rgba f 0.6 0.6 0.6 1.0 } ; inline -: dark-gray T{ rgba f 0.8 0.8 0.8 1.0 } ; inline -: green T{ rgba f 0.0 1.0 0.0 1.0 } ; inline -: light-gray T{ rgba f 0.95 0.95 0.95 0.95 } ; inline -: light-purple T{ rgba f 0.8 0.8 1.0 1.0 } ; inline -: magenta T{ rgba f 0.941 0 0.941 1 } ; inline -: orange T{ rgba f 0.941 0.627 0 1 } ; inline -: purple T{ rgba f 0.627 0 0.941 1 } ; inline -: red T{ rgba f 1.0 0.0 0.0 1.0 } ; inline -: white T{ rgba f 1.0 1.0 1.0 1.0 } ; inline -: yellow T{ rgba f 1.0 1.0 0.0 1.0 } ; inline +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: dark-gray T{ rgba f 0.8 0.8 0.8 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: medium-purple T{ rgba f 0.7 0.7 0.9 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 }