termcol: use rgb index instead of value for hsv calculation

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index d945079bbab1cbec8b9af2f5a7ab7062707c700d..fd2bc9bf0107d36fd2f5c3ff21ef6c3a967c39b3 100644 (file)
--- a/termcol.plp
+++ b/termcol.plp
@@ -228,22 +228,10 @@ for my $term (@termlist) {
 <div class="section">
 <h2>88-colour space</h2>
 <:
-for my $r (0 .. 3) {
-       print '<table>';
-       for my $g (0 .. 3) {
-               print '<tr>';
-               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 "</table>\n";
-}
-print "\n";
-
-print '<table><tr>';
-print colcell(80+$_, (($_ + 2 + ($_>0)) * 255/11) x 3) for 0 .. 7;
-print "</table>\n\n";
+print coltable_hsv(4,
+       sub {(0, 139, 205, 255)[$_[0]]},
+       [map { ($_ + 2 + ($_>0)) * 255/11 } 0 .. 7],
+);
 
 :></div>
 <: if ($ENV{PATH_INFO} =~ /256/) { :>
@@ -255,7 +243,7 @@ print "</table>\n\n";
 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;
 
@@ -267,21 +255,21 @@ 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];
                        }
                }
        }
@@ -311,7 +299,7 @@ sub coltable_hsv {
 }
 
 print coltable_hsv(6,
-       sub { $_ && $_*40 + 55 },
+       sub { $_[0] && $_[0]*40 + 55 },
        [ map { $_ * 10 + 8 } 0 .. 23 ],
 );
 :></div>