steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

colors.hsv: use sort-triple instead of natural-sort.

db4
John Benediktsson 2013-04-02 16:55:03 -07:00
parent 4b9b14308d
commit f351eaedd0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/colors/hsv/hsv.factor
View File

@ -42,9 +42,16 @@ M: hsva >rgba ( hsva -- rgba )
} case } case
] [ alpha>> ] bi <rgba> ; inline ] [ alpha>> ] bi <rgba> ; inline
<PRIVATE
: sort-triple ( a b c -- d e f )
sort-pair [ sort-pair ] dip sort-pair ;
PRIVATE>
:: rgba>hsva ( rgba -- hsva ) :: rgba>hsva ( rgba -- hsva )
rgba >rgba-components :> ( r g b a ) rgba >rgba-components :> ( r g b a )
r g b 3array natural-sort first3 :> ( z y x ) r g b sort-triple :> ( z y x )
x z = x zero? or [ 0 0 x a <hsva> ] [ x z = x zero? or [ 0 0 x a <hsva> ] [
{ {
{ [ r x = g z = and ] [ 5 x b - x z - / + ] } { [ r x = g z = and ] [ 5 x b - x z - / + ] }