X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e91a2ba2717ffcad718e1875f1b1fb30bb5ca5b4..a4fdefae72afac5a4ad02eabcc23fe762903ad89:/termcol.plp?ds=inline
diff --git a/termcol.plp b/termcol.plp
index f2a0f85..fd2bc9b 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -16,12 +16,23 @@ Html({
:>
<:
-use Shiar_Sheet::Colour '1.01';
+use Shiar_Sheet::Colour '1.03';
+use List::Util qw( min max );
sub colcell {
- my $name = shift;
+ my $name = shift or return "
\n";
my $col = Shiar_Sheet::Colour->new(@_);
my $minhex = $col->rgb24;
my $css = '#' . $col->rgb48;
@@ -183,6 +194,11 @@ my %col = (
if ($get{v}) {
my %reorder = (
arnegame => [ 0,5,9,12 , 3,6,10,13,1 , 4,7,8,11,14,15,2 ],
+ arnegame => [ 0,3,10,6,12,9,13,1 , 5,7,11,8,14,4,15,2 ],
+ c64 => [ 0,2,5,9,6,4,3,15 , 11,10,13,7,14,8,12,1 ],
+ msx2 => [ 0,6,2,10,4,13,7,14 , 1,8,3,11,5,9,12,15 ],
+ risc => [ 7,11,13,14,8,12,15,1, 6,5,10,9,4,3,2,0],
+ mac2 => [ 15,3,9,11,6,5,7,12 , 14,2,8,1,13,4,10,0 ],
);
$reorder{$_} = $reorder{msx2} for qw( msx1 arnejmp );
while (my ($name, $order) = each %reorder) {
@@ -212,22 +228,10 @@ 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";
-
-print ' ';
-print colcell(80+$_, (($_ + 2 + ($_>0)) * 255/11) x 3) for 0 .. 7;
-print "
\n\n";
+print coltable_hsv(4,
+ sub {(0, 139, 205, 255)[$_[0]]},
+ [map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7],
+);
:>
<: if ($ENV{PATH_INFO} =~ /256/) { :>
@@ -236,27 +240,68 @@ print "\n\n";
256-colour space
<:
-for my $r (0 .. 5) {
- print ' ';
- for my $g (0 .. 5) {
- print '';
- for my $b (0 .. 5) {
- my $index = $r*6*6 + $g*6 + $b + 16;
- print colcell($index, map { $_ && $_*40 + 55 } $r, $g, $b);
+sub coltable_hsv {
+ my ($dim, $rgbval, $greyramp) = @_;
+
+ my $hmax = 2 * $dim * 3; # each face of the rgb cube
+ my $vmax = $dim - 1;
+ my $smax = $dim - 1;
+
+ my %greymap; # name => value
+ my @colmap; # saturation => value => hue => [name, r,g,b]
+ my $offset = 16;
+
+ 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;
+ my $v = max(@rgb);
+ my $s = abs(min(@rgb) - max(@rgb));
+
+ if (!$s) {
+ $greymap{$index} = $rgbval->($r);
+ next;
+ }
+
+ $v = $vmax - $v;
+ $s = $smax - $s - $v;
+
+ $colmap[$s][$v][$h] = [$index, map { $rgbval->($_) } @rgb];
+ }
}
}
- print " \n";
-}
-print "\n";
- print ' ';
-for my $row (0, 12) {
- print '';
- print colcell(232+$_, ($_*10 + 8) x 3) for $row .. $row+11;
+ 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 .= '';
+ my $col = 0;
+ my $colbreak = keys(%greymap) / 2; # split into 2 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 "\n";
+print coltable_hsv(6,
+ sub { $_[0] && $_[0]*40 + 55 },
+ [ map { $_ * 10 + 8 } 0 .. 23 ],
+);
:>
<: } :>
|