Apple-2-Tools/Steve2
1
0
Fork 0
mirror of https://github.com/trudnai/Steve2.git synced 2024-12-22 21:29:50 +00:00
Code Issues Projects Releases Wiki Activity

- White reduced to get a better retro feeling

Browse Source 
- HiRes Color restoration adjusted so no more green stuff in Donkey Kong
This commit is contained in:
tudnai 2020-05-07 23:54:11 -07:00
parent c996f0ce14
commit c6a7f211dc
2 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
A2Mac/Base.lproj/Main.storyboard
View File

@ -837,7 +837,7 @@
@@@@@@@@@@@@@@@@@@22@@@@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@22@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@23@@@@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@23@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@24@@@@@@@@@@@@@@@@@@@@</string> @@@@@@@@@@@@@@@@@@24@@@@@@@@@@@@@@@@@@@@</string>
<color key="textColor" name="systemGreenColor" catalog="System" colorSpace="catalog"/> <color key="textColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell> </textFieldCell>
</textField> </textField>

47
A2Mac/HiRes.swift
View File

@ -483,7 +483,7 @@ class HiRes: NSView {
let color_black : UInt32 = 0x00000000; let color_black : UInt32 = 0x00000000;
let color_white : UInt32 = 0xFFFFFFFF; let color_white : UInt32 = 0xEEEEEEEE;
let color_purple : UInt32 = 0xFFBB11EE; let color_purple : UInt32 = 0xFFBB11EE;
let color_green : UInt32 = 0xFF0BA212; let color_green : UInt32 = 0xFF0BA212;
let color_blue : UInt32 = 0xFF1166EE; let color_blue : UInt32 = 0xFF1166EE;
@ -503,18 +503,6 @@ class HiRes: NSView {
// HiRes.typedPointer[colorAddr + 1] = color_black; // HiRes.typedPointer[colorAddr + 1] = color_black;
case 0x02: // green case 0x02: // green
if (prev == 0x02) ||
(prev == 0x06) ||
(prev == 0x03) || (prev == 0x07) ||
(prev == 0x00) || (prev == 0x04) ||
(prev == 0x04)
{
HiRes.typedPointer[colorAddr] = color_green;
}
// else {
// HiRes.typedPointer[colorAddr] = color_black;
// }
// reducing color bleeding // reducing color bleeding
if (prev == 0x01) || if (prev == 0x01) ||
(prev == 0x05) (prev == 0x05)
@ -522,6 +510,7 @@ class HiRes: NSView {
// HiRes.typedPointer[colorAddr + 1] = color_black; // HiRes.typedPointer[colorAddr + 1] = color_black;
} }
else { else {
HiRes.typedPointer[colorAddr] = color_green;
HiRes.typedPointer[colorAddr + 1] = color_green; HiRes.typedPointer[colorAddr + 1] = color_green;
} }
@ -539,18 +528,17 @@ class HiRes: NSView {
// HiRes.typedPointer[colorAddr + 1] = color_black; // HiRes.typedPointer[colorAddr + 1] = color_black;
case 0x06: // orange case 0x06: // orange
// do we need to extend the color? // reducing color bleeding
if (prev == 0x06) || if (prev == 0x01) ||
(prev == 0x03) || (prev == 0x07) (prev == 0x05)
{ {
HiRes.typedPointer[colorAddr] = color_orange; // HiRes.typedPointer[colorAddr + 1] = color_black;
} }
else { else {
// HiRes.typedPointer[colorAddr] = color_black; HiRes.typedPointer[colorAddr] = color_orange;
HiRes.typedPointer[colorAddr + 1] = color_orange;
} }
HiRes.typedPointer[colorAddr + 1] = color_orange;
case 0x07: // white 2 case 0x07: // white 2
HiRes.typedPointer[colorAddr] = color_white; HiRes.typedPointer[colorAddr] = color_white;
HiRes.typedPointer[colorAddr + 1] = color_white; HiRes.typedPointer[colorAddr + 1] = color_white;
@ -574,9 +562,9 @@ class HiRes: NSView {
// purple adjustment -- followed by white // purple adjustment -- followed by white
else if (prev == 0x01) && ( else if (prev == 0x01) && (
(pixel == 0x01) || (pixel == 0x03) || (pixel == 0x01) ||
(pixel == 0x07) || (pixel == 0x00) || (pixel == 0x03) || (pixel == 0x07) || // white
(pixel == 0x04) (pixel == 0x00) || (pixel == 0x04) // black
) { ) {
// was the previous purple pixel promoted to white or is it still purple? // was the previous purple pixel promoted to white or is it still purple?
if ( HiRes.pixels[pixelAddr - 8 + R] == 0xBB ) { if ( HiRes.pixels[pixelAddr - 8 + R] == 0xBB ) {
@ -584,14 +572,19 @@ class HiRes: NSView {
} }
} }
// blue adjustment // blue adjustment -- followed by white
else if (prev == 0x05) && ( else if (prev == 0x05) && (
(pixel == 0x05) || (pixel == 0x05) ||
(pixel == 0x03) || (pixel == 0x07) (pixel == 0x03) || (pixel == 0x07) || // white
(pixel == 0x00) || (pixel == 0x04) // black
) { ) {
HiRes.typedPointer[colorAddr - 1] = color_blue; // was the previous purple pixel promoted to white or is it still purple?
if ( HiRes.pixels[pixelAddr - 8 + R] == 0x11 ) {
HiRes.typedPointer[colorAddr - 1] = color_blue;
}
} }
} }
@ -657,7 +650,7 @@ class HiRes: NSView {
prev = pixel prev = pixel
} }
let pixel = blockH7 | ( (block >> (3 * 2)) & 3 ) let pixel = (blockL7 | blockH7) | ( (block >> (3 * 2)) & 3 )
hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev ) hiresColorPixel(pixelAddr: pixelAddr, pixel: pixel, prev: prev )
pixelAddr += 8 pixelAddr += 8
prev = pixel prev = pixel