X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/1cf492e9a7420f613fee280c789f637af9b1b9c1..4df29062a0012a9864d1038557d9f825b7cf509f:/termcol.plp
diff --git a/termcol.plp b/termcol.plp
index a930698..e34cead 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,24 +226,11 @@ for my $term (@termlist) {
- 88-colour space
-<:
-print coltable_hsv(4,
- sub {(0, 139, 205, 255)[$_[0]]},
- [map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7],
-);
-
-:>
-<: if ($ENV{PATH_INFO} =~ /256/) { :>
-
-
-
- 256-colour space
<:
sub coltable_hsv {
my ($dim, $rgbval, $greyramp) = @_;
- my $hmax = ($dim + $dim - 1) * 2 + ($dim - 2) * 2 + 3;
+ my $hmax = 2 * $dim * 3; # each face of the rgb cube
my $vmax = $dim - 1;
my $smax = $dim - 1;
@@ -255,54 +242,66 @@ sub coltable_hsv {
for my $g (0 .. $dim - 1) {
for my $b (0 .. $dim - 1) {
my $index = $r*$dim*$dim + $g*$dim + $b + $offset;
- my @rgb = map { $rgbval->($_) } $r, $g, $b;
+ my @rgb = ($r, $g, $b);
my $h = Shiar_Sheet::Colour->new(@rgb)->hue * $hmax;
- my $v = int(max(@rgb) / 255 * $vmax);
- my $s = abs(min(@rgb) - max(@rgb)) / 255 * $smax;
+ my $v = max(@rgb);
+ my $s = abs(min(@rgb) - max(@rgb));
if (!$s) {
- $greymap{$index} = $rgb[0];
+ $greymap{$index} = $rgbval->($r);
next;
}
$v = $vmax - $v;
$s = $smax - $s - $v;
- $colmap[$s][$v][$h] = [$index, @rgb];
+ $colmap[$s][$v][$h] = [$index, map { $rgbval->($_) } @rgb];
}
}
}
- my $out = ' ';
+ 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;
}
- $out .= " \n\n";
$offset += $dim ** 3;
$greymap{$offset++} = $_ for @{$greyramp};
- $out .= ' ';
+ $out .= '';
my $col = 0;
- my $colbreak = keys(%greymap) / 2; # split into 2 rows
+ 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 coltable_hsv(6,
- sub { $_[0] && $_[0]*40 + 55 },
- [ map { $_ * 10 + 8 } 0 .. 23 ],
-);
+{
+ print " 88-colour space\n";
+ print " \n";
+ print coltable_hsv(4,
+ sub {(0, 139, 205, 255)[$_[0]]},
+ [map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7],
+ );
+ print " \n";
+}
+
+if ($ENV{PATH_INFO} =~ /256/) {
+ print " 256-colour space\n";
+ print " \n";
+ print coltable_hsv(6,
+ sub { $_[0] && $_[0]*40 + 55 },
+ [ map { $_ * 10 + 8 } 0 .. 23 ],
+ );
+ print " \n";
+}
:>
-<: } :>
|