Merge branch 'master' of git://factorcode.org/git/factor
commit
baac7fa02b
|
@ -1,8 +1,7 @@
|
|||
! Copyright (C) 2003, 2007 Slava Pestov.
|
||||
! Copyright (C) 2003, 2007, 2008 Slava Pestov.
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
|
||||
USING: kernel combinators sequences arrays
|
||||
classes.tuple multi-methods accessors colors.hsv ;
|
||||
USING: kernel combinators sequences arrays classes.tuple accessors colors.hsv ;
|
||||
|
||||
IN: colors
|
||||
|
||||
|
@ -14,29 +13,25 @@ TUPLE: rgba < color red green blue alpha ;
|
|||
|
||||
TUPLE: hsva < color hue saturation value alpha ;
|
||||
|
||||
TUPLE: grey < color grey alpha ;
|
||||
TUPLE: gray < color gray alpha ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
GENERIC: >rgba ( object -- rgba )
|
||||
|
||||
METHOD: >rgba { rgba } ;
|
||||
M: rgba >rgba ( rgba -- rgba ) ;
|
||||
|
||||
METHOD: >rgba { hsva }
|
||||
M: hsva >rgba ( hsva -- rgba )
|
||||
{ [ hue>> ] [ saturation>> ] [ value>> ] [ alpha>> ] } cleave 4array
|
||||
[ hsv>rgb ] [ peek ] bi suffix first4 rgba boa ;
|
||||
|
||||
METHOD: >rgba { grey } [ grey>> dup dup ] [ alpha>> ] bi rgba boa ;
|
||||
M: gray >rgba ( gray -- rgba ) [ gray>> dup dup ] [ alpha>> ] bi rgba boa ;
|
||||
|
||||
METHOD: >rgba { array } first4 rgba boa ;
|
||||
M: array >rgba ( array -- rgba ) first4 rgba boa ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
USE: syntax
|
||||
|
||||
M: color red>> >rgba red>> ;
|
||||
M: color green>> >rgba green>> ;
|
||||
M: color blue>> >rgba blue>> ;
|
||||
M: color red>> ( color -- red ) >rgba red>> ;
|
||||
M: color green>> ( color -- green ) >rgba green>> ;
|
||||
M: color blue>> ( color -- blue ) >rgba blue>> ;
|
||||
|
||||
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
|
|
Loading…
Reference in New Issue