X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/032b7eb4897d7517e94c7fe2e1d414be8d925c9f..278de4c46a99f7ebc9fdbf8354283cdef6a31c88:/termcol.plp diff --git a/termcol.plp b/termcol.plp index 9262bf3..04b6e6e 100644 --- a/termcol.plp +++ b/termcol.plp @@ -233,6 +233,8 @@ sub coltable_hsv { my $hmax = 2 * $dim * 3; # each face of the rgb cube my $vmax = $dim - 1; my $smax = $dim - 1; + $rgbval ||= sub { join('', @_), map { int $_ * 255 / $vmax } @_ }; + $greyramp ||= []; my %greymap; # name => value my @colmap; # saturation => value => hue => [name, r,g,b] @@ -241,7 +243,6 @@ sub coltable_hsv { for my $r (0 .. $dim - 1) { for my $g (0 .. $dim - 1) { for my $b (0 .. $dim - 1) { - my $index = $r*$dim*$dim + $g*$dim + $b + $offset; my @rgb = ($r, $g, $b); my $h = Shiar_Sheet::Colour->new(@rgb)->hue * $hmax; @@ -249,19 +250,20 @@ sub coltable_hsv { my $s = abs(min(@rgb) - max(@rgb)); if (!$s) { - $greymap{$index} = $rgbval->($r); + my ($index, $l) = $rgbval->(@rgb); + $greymap{$index} = $l; next; } $v = $vmax - $v; $s = $smax - $s - $v; - $colmap[$s][$v][$h] = [$index, map { $rgbval->($_) } @rgb]; + $colmap[$s][$v][$h] = [ $rgbval->(@rgb) ]; } } } - my $out = '