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;
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];
}
}
}