Apple-2-Tools/apple2js
1
0
Fork 0
mirror of https://github.com/whscullin/apple2js.git synced 2024-01-12 14:14:38 +00:00
Code Issues Projects Releases Wiki Activity

Add Apple //e.

Browse Source
This commit is contained in:
Will Scullin
2013-12-19 14:28:55 -08:00
parent 86c395ccda
commit efef420fdc
3 changed files with 1138 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apple2js.html
View File

@@ -944,7 +944,7 @@ $(function() {
<div role="textbox" class="overscan" <div role="textbox" class="overscan"
onKeyDown="_keydown(event);" onKeyDown="_keydown(event);"
onKeyUp="_keyup(event);"> onKeyUp="_keyup(event);">
<canvas id="screen" width="280" height="192"></canvas> <canvas id="screen" width="560" height="192"></canvas>
<img id="scanlines" src="css/scanlines.png" /> <img id="scanlines" src="css/scanlines.png" />
</div> </div>
</td> </td>

1092
apple2jse.html Normal file
View File

File diff suppressed because it is too large Load Diff

70
js/canvas2e.js
View File

@@ -153,6 +153,7 @@ function LoresPage(page)
e = adj >> 7; e = adj >> 7;
var idx, jdx; var idx, jdx;
var row = ab | cd | e; var row = ab | cd | e;
var b;
var data = pages[_page].data; var data = pages[_page].data;
if ((row < 24) && (col < 40)) { if ((row < 24) && (col < 40)) {
@@ -161,7 +162,6 @@ function LoresPage(page)
var color; var color;
if (textMode || (mixedMode && row > 19)) { if (textMode || (mixedMode && row > 19)) {
var b;
var flash = ((val & 0xc0) == 0x40) && var flash = ((val & 0xc0) == 0x40) &&
_blink && !_80colMode && !altCharMode; _blink && !_80colMode && !altCharMode;
fore = flash ? _black : (_greenMode ? _green : _white); fore = flash ? _black : (_greenMode ? _green : _white);
@@ -388,7 +388,6 @@ function HiresPage(page)
var _green = [0x00, 0xff, 0x80]; var _green = [0x00, 0xff, 0x80];
var _greenMode = false; var _greenMode = false;
var _garish = false;
function _init() { function _init() {
_buffer[0] = allocMemPages(0x20); _buffer[0] = allocMemPages(0x20);
@@ -477,17 +476,19 @@ function HiresPage(page)
return; return;
dy = rowa * 16 + rowb * 2; dy = rowa * 16 + rowb * 2;
var b0, b1, b2, b3, b4, c; var bz, b0, b1, b2, b3, b4, c;
if (doubleHiresMode) { if (doubleHiresMode) {
// Every 4 bytes is 7 pixels // Every 4 bytes is 7 pixels
// 2 bytes per bank // 2 bytes per bank
var mod = col % 2, mcol = col - mod; var mod = col % 2, mcol = col - mod;
bz = _buffer[0][base - mod - 1];
b0 = _buffer[1][base - mod]; b0 = _buffer[1][base - mod];
b1 = _buffer[0][base - mod]; b1 = _buffer[0][base - mod];
b2 = _buffer[1][base - mod + 1]; b2 = _buffer[1][base - mod + 1];
b3 = _buffer[0][base - mod + 1]; b3 = _buffer[0][base - mod + 1];
b4 = _buffer[1][base - mod + 2]; b4 = _buffer[1][base - mod + 2];
c = [((b0 & 0x0f) >> 0), // 0 c = [0,
((b0 & 0x0f) >> 0), // 0
((b0 & 0x70) >> 4) | ((b1 & 0x01) << 3), // 1 ((b0 & 0x70) >> 4) | ((b1 & 0x01) << 3), // 1
((b1 & 0x1e) >> 1), // 2 ((b1 & 0x1e) >> 1), // 2
((b1 & 0x60) >> 5) | ((b2 & 0x03) << 2), // 3 ((b1 & 0x60) >> 5) | ((b2 & 0x03) << 2), // 3
@@ -495,33 +496,62 @@ function HiresPage(page)
((b2 & 0x40) >> 6) | ((b3 & 0x07) << 1), // 5 ((b2 & 0x40) >> 6) | ((b3 & 0x07) << 1), // 5
((b3 & 0x78) >> 3), // 6 ((b3 & 0x78) >> 3), // 6
0]; // 7 0]; // 7
if (col > 0) {
c[0] = (bz & 0x78) >> 3;
}
if (col < 39) { if (col < 39) {
c[7] = b4 & 0x0f; c[8] = b4 & 0x0f;
} }
dx = mcol * 14; dx = mcol * 14;
off = dx * 4 + dy * 280 * 4; off = dx * 4 + dy * 280 * 4;
for (idx = 0; idx < 7; idx++) { for (idx = 1; idx < 8; idx++) {
var dcolor = _greenMode ? _green : dcolors[r4[c[idx]]]; var dcolor = dcolors[r4[c[idx]]];
var bits = c[idx] | (c[idx + 1] << 4); var bits = c[idx-1] | (c[idx] << 4) | (c[idx+1] << 8);
for (jdx = 0; jdx < 4; jdx++, off += 4) { for (jdx = 0; jdx < 4; jdx++, off += 4) {
if (bits & 0x1) { if (_greenMode) {
if (bits & 0x10) {
data[off + 0] = _green[0];
data[off + 1] = _green[1];
data[off + 2] = _green[2];
} else {
data[off + 0] = 0;
data[off + 1] = 0;
data[off + 2] = 0;
}
} else if (((bits & 0x3c) == 0x3c) ||
((bits & 0xf0) == 0xf0) ||
((bits & 0x1e) == 0x1e) ||
((bits & 0x78) == 0x78)) {
data[off + 0] = 0xff;
data[off + 1] = 0xff;
data[off + 2] = 0xff;
} else if (((c[idx] == c[idx + 1]) &&
(bits & 0xf0)) ||
((c[idx] == c[idx - 1]) &&
(bits & 0x01e)) ||
(bits & 0x10)) {
data[off + 0] = dcolor[0]; data[off + 0] = dcolor[0];
data[off + 1] = dcolor[1]; data[off + 1] = dcolor[1];
data[off + 2] = dcolor[2]; data[off + 2] = dcolor[2];
} else if (_greenMode) { } else {
data[off + 0] = 0; data[off + 0] = 0;
data[off + 1] = 0; data[off + 1] = 0;
data[off + 2] = 0; data[off + 2] = 0;
} else {
dcolor = dim(dcolor);
data[off + 0] = dcolor[0];
data[off + 1] = dcolor[1];
data[off + 2] = dcolor[2];
} }
bits >>= 1; bits >>= 1;
} }
} }
if (!_refreshing) {
_refreshing = true;
var bb = bank ? 0 : 1;
for (var rr = addr - 1; rr <= addr + 1; rr++) {
var vv = _buffer[bb][rr - 0x2000 * _page];
this._write(rr >> 8, rr & 0xff, vv, bb);
}
_refreshing = false;
}
} else { } else {
dx = col * 14 - 2; dx = col * 14 - 2;
b0 = col > 0 ? _buffer[bank][base - 1] : 0; b0 = col > 0 ? _buffer[bank][base - 1] : 0;
@@ -589,10 +619,6 @@ function HiresPage(page)
_greenMode = on; _greenMode = on;
this.refresh(); this.refresh();
}, },
garish: function(on) {
// _garish = on;
// this.refresh();
},
blit: function() { blit: function() {
context.putImageData(pages[_page], 0, 0); context.putImageData(pages[_page], 0, 0);
}, },
@@ -600,7 +626,6 @@ function HiresPage(page)
return { return {
page: _page, page: _page,
green: _greenMode, green: _greenMode,
garish: _garish,
buffer: [base64_encode(_buffer[0]), buffer: [base64_encode(_buffer[0]),
base64_encode(_buffer[1])] base64_encode(_buffer[1])]
}; };
@@ -608,7 +633,6 @@ function HiresPage(page)
setState: function(state) { setState: function(state) {
_page = state.page; _page = state.page;
_greenMode = state.green; _greenMode = state.green;
_garish = state.garish;
_buffer[0] = base64_decode(state.buffer[0]); _buffer[0] = base64_decode(state.buffer[0]);
_buffer[1] = base64_decode(state.buffer[1]); _buffer[1] = base64_decode(state.buffer[1]);
@@ -758,10 +782,6 @@ function VideoModes(gr,hgr,gr2,hgr2) {
_grs[1].green(on); _grs[1].green(on);
_hgrs[0].green(on); _hgrs[0].green(on);
_hgrs[1].green(on); _hgrs[1].green(on);
},
garish: function(on) {
_hgrs[0].garish(on);
_hgrs[1].garish(on);
} }
}; };
} }