X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d29916edd5f2af73164483662b5e49fdc6e3e697..032b7eb4897d7517e94c7fe2e1d414be8d925c9f:/termcol.plp
diff --git a/termcol.plp b/termcol.plp
index 5a4e83e..9262bf3 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -32,7 +32,7 @@ use Shiar_Sheet::Colour '1.03';
use List::Util qw( min max );
sub colcell {
- my $name = shift or return "
\n";
+ my $name = shift // return " | \n";
my $col = Shiar_Sheet::Colour->new(@_);
my $minhex = $col->rgb24;
my $css = '#' . $col->rgb48;
@@ -226,79 +226,79 @@ for my $term (@termlist) {
- 88-colour space
<:
-for my $r (0 .. 3) {
- print ' ';
- for my $g (0 .. 3) {
- print '';
- for my $b (0 .. 3) {
- my $index = $r*4*4 + $g*4 + $b + 16;
- print colcell($index, map {(0, 139, 205, 255)[$_]} $r, $g, $b);
- }
- }
- print " \n";
-}
-print "\n";
+sub coltable_hsv {
+ my ($dim, $rgbval, $greyramp) = @_;
-print ' ';
-print colcell(80+$_, (($_ + 2 + ($_>0)) * 255/11) x 3) for 0 .. 7;
-print "
\n\n";
+ my $hmax = 2 * $dim * 3; # each face of the rgb cube
+ my $vmax = $dim - 1;
+ my $smax = $dim - 1;
-:>
-<: if ($ENV{PATH_INFO} =~ /256/) { :>
-
+ my %greymap; # name => value
+ my @colmap; # saturation => value => hue => [name, r,g,b]
+ my $offset = 16;
-
- 256-colour space
-<:
-my @colmap; # saturation => value => hue => colcell
-for my $r (0 .. 5) {
- for my $g (0 .. 5) {
- for my $b (0 .. 5) {
- my $index = $r*6*6 + $g*6 + $b + 16;
- my @rgb = map { $_ && $_*40 + 55 } $r, $g, $b;
+ 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 * 33;
- my $v = int(max(@rgb) / 255 * 5);
- my $s = abs(min(@rgb) - max(@rgb)) / 255 * 7;
- my $grey = !$s;
+ my $h = Shiar_Sheet::Colour->new(@rgb)->hue * $hmax;
+ my $v = max(@rgb);
+ my $s = abs(min(@rgb) - max(@rgb));
- $v = 5 - $v;
- $s = 7 - $s - $v;
- $s-- if $s;
+ if (!$s) {
+ $greymap{$index} = $rgbval->($r);
+ next;
+ }
- if ($grey) {
- $h = 33; # greyscale hue
- $s -= 2; # lowest saturation for other hues
- $v = $s = 0 if $s < 0; # black at full saturation
- }
+ $v = $vmax - $v;
+ $s = $smax - $s - $v;
- $colmap[$s][$v][$h] = [$index, @rgb];
+ $colmap[$s][$v][$h] = [$index, map { $rgbval->($_) } @rgb];
+ }
}
}
-}
-{
- print ' ';
- printf '', 3 * @{$_} for @colmap;
- for my $h (grep { $colmap[0][0][$_] } 0 .. $#{ $colmap[0][0] }) {
- print '';
- print colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
+ my $out = '';
+ $out .= sprintf '', 3 * @{$_} for @colmap;
+ my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
+ for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
+ $out .= '';
+ $out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
}
- print " \n";
+
+ $offset += $dim ** 3;
+ $greymap{$offset++} = $_ for @{$greyramp};
+
+ $out .= ' ';
+ my $col = 0;
+ my $colbreak = scalar map { @$_ } @colmap; # same width as hue rows
+ for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
+ $out .= '' unless $col++ % $colbreak;
+ $out .= colcell($num, ($greymap{$num}) x 3);
+ }
+ $out .= " \n\n";
+
+ return $out;
}
-print "\n";
- print ' ';
-for my $row (0, 12) {
- print '';
- print colcell(232+$_, ($_*10 + 8) x 3) for $row .. $row+11;
+{
+ print "88-colour space\n";
+ print coltable_hsv(4,
+ sub {(0, 139, 205, 255)[$_[0]]},
+ [map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7],
+ );
}
- print " \n";
-print "\n";
+if ($ENV{PATH_INFO} =~ /256/) {
+ print " 256-colour space\n";
+ print coltable_hsv(6,
+ sub { $_[0] && $_[0]*40 + 55 },
+ [ map { $_ * 10 + 8 } 0 .. 23 ],
+ );
+}
:>
-<: } :>
|