Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-06-14 12:29:34 +00:00
Code Issues Projects Releases Wiki Activity

match colour bits

Browse Source
This commit is contained in:
Denis Molony 2016-02-22 13:18:30 +11:00
parent c426cbfb25
commit 4b323d7f3e
1 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/com/bytezone/diskbrowser/applefile/HiResImage.java
View File

@ -20,11 +20,13 @@ public class HiResImage extends AbstractFile
private static final int[][] colours = { { VIOLET, GREEN }, { BLUE, RED } }; private static final int[][] colours = { { VIOLET, GREEN }, { BLUE, RED } };
private static int[] line = new int[280]; private static int[] line = new int[280];
private static int[] colourBits = new int[280];
private int fileType; private int fileType;
private int auxType; private int auxType;
private byte[] unpackedBuffer; private byte[] unpackedBuffer;
private static boolean colourQuirks; private static boolean colourQuirks;
private static boolean checkingColourBits = true;
public HiResImage (String name, byte[] buffer) public HiResImage (String name, byte[] buffer)
{ {
@ -116,17 +118,18 @@ public class HiResImage extends AbstractFile
DataBuffer db = image.getRaster ().getDataBuffer (); DataBuffer db = image.getRaster ().getDataBuffer ();
int element = 0; int element = 0;
for (int z = 0; z < rows / 192; z++) for (int page = 0; page < rows / 192; page++)
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
for (int j = 0; j < 8; j++) for (int j = 0; j < 8; j++)
for (int k = 0; k < 8; k++) for (int k = 0; k < 8; k++)
{ {
int base = i * 0x28 + j * 0x80 + k * 0x400 + z * 0x2000; fillLine (page * 0x2000 + i * 0x28 + j * 0x80 + k * 0x400);
element = drawLine (db, element, base); for (int pixel : line)
db.setElem (element++, pixel);
} }
} }
private int drawLine (DataBuffer db, int element, int base) private void fillLine (int base)
{ {
int max = Math.min (base + 40, buffer.length); int max = Math.min (base + 40, buffer.length);
int linePtr = 0; int linePtr = 0;
@ -138,52 +141,30 @@ public class HiResImage extends AbstractFile
for (int px = 0; px < 7; px++) for (int px = 0; px < 7; px++)
{ {
int val = (value >> px) & 0x01; colourBits[linePtr] = colourBit; // store the colour bit
int column = (ptr + px) % 2; int val = (value >> px) & 0x01; // get the next pixel to draw
line[linePtr++] = val == 0 ? 0 : colours[colourBit][column]; int column = (ptr * 7 + px) % 2; // is it in an odd or even column?
line[linePtr++] = val == 0 ? 0 : // black pixel
colours[colourBit][column]; // coloured pixel - use palette
} }
} }
// convert ALL consecutive ON pixels to white // convert consecutive ON pixels to white
if (true) if (true)
for (int x = 0; x < line.length - 1; x++) for (int x = 0; x < line.length - 1; x++)
if (line[x] != BLACK && line[x + 1] != BLACK)
// if (isColoured (line[x]) && isColoured (line[x + 1]))
line[x] = line[x + 1] = WHITE;
// convert WOZ quirks
if (colourQuirks)
{
for (int x = 0; x < line.length - 3; x++)
{ {
if (checkingColourBits && colourBits[x] != colourBits[x + 1])
continue; // only modify values with matching colour bits
int px0 = line[x]; int px0 = line[x];
int px1 = line[x + 1]; int px1 = line[x + 1];
int px2 = line[x + 2]; if (px0 != BLACK && px1 != BLACK)
int px3 = line[x + 3]; line[x] = line[x + 1] = WHITE;
if (px1 == BLACK)
{
if (px3 == BLACK && px0 == px2 && isColoured (px0)) // V-B-V-B
line[x + 1] = px0; // --> V-V-V-B
else if (px3 == WHITE && px2 == WHITE && isColoured (px0)) // V-B-W-W
line[x + 1] = px0; // --> V-V-W-W
}
else if (px2 == BLACK)
{
if (px0 == BLACK && px1 == px3 && isColoured (px3)) // B-G-B-G
line[x + 2] = px3; // --> B-G-G-G
else if (px0 == WHITE && px1 == WHITE && isColoured (px3)) // W-W-B-G
line[x + 2] = px3; // --> W-W-G-G
}
} }
}
for (int pixel : line) // optionally do physics
db.setElem (element++, pixel); if (colourQuirks)
applyColourQuirks ();
return element;
} }
private boolean isColoured (int pixel) private boolean isColoured (int pixel)
@ -191,6 +172,35 @@ public class HiResImage extends AbstractFile
return pixel != BLACK && pixel != WHITE; return pixel != BLACK && pixel != WHITE;
} }
private void applyColourQuirks ()
{
for (int x = 0; x < line.length - 3; x++)
{
if (checkingColourBits && colourBits[x] != colourBits[x + 3])
continue; // only modify values with matching colour bits
int px0 = line[x];
int px1 = line[x + 1];
int px2 = line[x + 2];
int px3 = line[x + 3];
if (px1 == BLACK)
{
if (px3 == BLACK && px0 == px2 && isColoured (px0)) // V-B-V-B
line[x + 1] = px0; // --> V-V-V-B
else if (px3 == WHITE && px2 == WHITE && isColoured (px0)) // V-B-W-W
line[x + 1] = px0; // --> V-V-W-W
}
else if (px2 == BLACK)
{
if (px0 == BLACK && px1 == px3 && isColoured (px3)) // B-G-B-G
line[x + 2] = px3; // --> B-G-G-G
else if (px0 == WHITE && px1 == WHITE && isColoured (px3)) // W-W-B-G
line[x + 2] = px3; // --> W-W-G-G
}
}
}
private void makeScreen2 (byte[] buffer) private void makeScreen2 (byte[] buffer)
{ {
// System.out.println (HexFormatter.format (buffer, 32000, 640)); // System.out.println (HexFormatter.format (buffer, 32000, 640));