From 45aa654f0c7f381702ae1b0e7f2c243aa7af43d2 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Sat, 13 Jun 2020 10:38:34 -0700 Subject: [PATCH] Improve GR/HGR colors --- hires.js | 24 ++++++++++-------------- lores.js | 43 +++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/hires.js b/hires.js index 1133e11..0395672 100644 --- a/hires.js +++ b/hires.js @@ -28,22 +28,18 @@ function HiRes(element, width, height) { pixels.length = width * height; - // Colors c/o USENET: - // Date: Wed, 05 Sep 2007 01:04:20 +0200 - // From: Linards Ticmanis - // Newsgroups: comp.sys.apple2 - // Subject: Re: Double hires mode color artifacts - // Message-ID: <46dde477$0$4527$9b4e6d93@newsspool3.arcor-online.net> + // From: Apple ][ Colors at MROB + // https://mrob.com/pub/xapple2/colors.html COLORS = [ - '#000000', // Black 1 - '#2fbc1a', // Green - '#d043e5', // Violet - '#ffffff', // White 1 - '#000000', // Black 2 - '#d06a1a', // Orange - '#2f95e5', // Medium Blue - '#ffffff' // White 2 + '#000000', // 0 = Black 1 + '#14f53c', // 1 = Green + '#ff44fd', // 2 = Purple + '#ffffff', // 3 = White 1 + '#000000', // 4 = Black 2 + '#ff6a3c', // 5 = Orange + '#14cffd', // 6 = Medium Blue + '#ffffff' // 7 = White 2 ]; this.clear = function(opt_color) { diff --git a/lores.js b/lores.js index bff9dd4..6892cbf 100644 --- a/lores.js +++ b/lores.js @@ -21,30 +21,27 @@ function LoRes(element, width, height) { pixels = [], // color values color = 0; // current color - // Colors c/o USENET: - // Date: Wed, 05 Sep 2007 01:04:20 +0200 - // From: Linards Ticmanis - // Newsgroups: comp.sys.apple2 - // Subject: Re: Double hires mode color artifacts - // Message-ID: <46dde477$0$4527$9b4e6d93@newsspool3.arcor-online.net> + + // From: Apple ][ Colors at MROB + // https://mrob.com/pub/xapple2/colors.html COLORS = [ - '#000000', // Black - '#901740', // Deep Red - '#402ca5', // Dark Blue - '#d043e5', // Purple - '#006940', // Dark Green - '#808080', // Gray 1 - '#2f95e5', // Medium Blue - '#bfabff', // Light Blue - '#402400', // Brown // WAS #405400, error pointed out by MJM - '#d06a1a', // Orange - '#808080', // Gray 2 - '#ff96bf', // Pink - '#2fbc1a', // Light Green - '#bfd35a', // Yellow - '#6fe8bf', // Aquamarine - '#ffffff' // White + '#000000', // 0 = Black + '#e31e60', // 1 = Deep Red + '#604ebd', // 2 = Dark Blue + '#ff44fd', // 3 = Purple + '#00a360', // 4 = Dark Green + '#9c9c9c', // 5 = Gray 1 + '#14cffd', // 6 = Medium Blue + '#d0c3ff', // 7 = Light Blue + '#607203', // 8 = Brown + '#ff6a3c', // 9 = Orange + '#9c9c9c', // 10 = Gray 2 + '#ffa0d0', // 11 = Pink + '#14f53c', // 12 = Light Green + '#d0dd8d', // 13 = Yellow + '#72ffd0', // 14 = Aquamarine + '#ffffff' // 15 = White ]; function init() { @@ -156,5 +153,3 @@ function LoRes(element, width, height) { init(); } - -