X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/ddd5f9146c58ba38f16d2e525273b83076c4f93a..8e78ee79f876ead17fc0ac245c0978b8eb63d575:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 4b9f3e4..46a4b50 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -117,15 +117,46 @@ my %col = (
 	],
 	c64 => [
 		'C=64',  # commodore 64/128
-		map { Shiar_Sheet::Colour->newyuv($_)->rgb48 }
-		qw/008080 FF8080 4F4FF5 9FB00A 5FDADA 7F2525 3FFF80 BF0080
-		   5F25DA 3F0AB0 7F4FF5 4F8080 778080 BF2525 77FF80 9F8080 /
+		map {
+			# 5-bit luma ± 2-bit colour angle
+			my ($y, $neg, $hue) = split /(-)|\+/;
+
+			# convert to yuv
+			my ($u, $v) = (0, 0);
+			if (defined $hue) {
+				my $RAD = 3.14159;
+				$hue *= $RAD / 8;
+				$hue += $RAD if $neg;
+				$u = cos $hue;
+				$v = sin $hue;
+			}
+
+			# convert to rgb
+			$y *= 255 / 32;
+			$_ = $_ * 127.5 + 128 for $u, $v;
+			Shiar_Sheet::Colour->newyuv($y, $u, $v)->rgb48;
+		}
+		qw/ 0    32  10+5 20-5 12+2 16-2 8+0  24-0
+		    12+6 8+7 16+5 10   15   24-2 15+0 20 /,
 	],
-	msx => [
+	msx1 => [
 		'MSX',
-		map { Shiar_Sheet::Colour->newyuv($_)->rgb48 }
-		qw/008080 008080 873F1F AA4F37 66FF6F 87EE76 7757D6 BAB70E
-		   874FEE AA4FEE BA1F98 CC3798 77462E 87B0BE CC8080 FF8080 /,
+		map {
+			my ($y, @c) = split /;/;
+			$y *= 255;
+			$_ = ($_ - .47) / .53 * 127.5 + 128 for @c;
+			Shiar_Sheet::Colour->newyuv($y, @c)->rgb48;
+		}
+		qw/ 0.00;0.47;0.47 0.00;0.47;0.47 0.53;0.20;0.07 0.67;0.27;0.17
+		    0.40;1.00;0.40 0.53;0.93;0.43 0.47;0.30;0.83 0.73;0.70;0.00
+		    0.53;0.27;0.93 0.67;0.27;0.93 0.73;0.07;0.57 0.80;0.17;0.57
+		    0.47;0.23;0.13 0.53;0.67;0.73 0.80;0.47;0.47 1.00;0.47;0.47 /,
+	],
+	msx2 => [
+		'MSX2',
+		map { s{([0-7])}{sprintf '%02X', $1 / 7 * 255}egr }
+		qw/ 000 000 161 373 117 237 511 267
+		    711 733 661 663 141 625 555 777 /,
 	],
 );