Apple-2-Tools/jace
1
0
Fork 1
mirror of https://github.com/badvision/jace.git synced 2025-02-19 21:30:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixed outstanding bugs in VideoDHGR class. It still sucks compared to VideoNTSC but that's a known fact and not a defect. :D

Browse Source
This commit is contained in:
Brendan Robert 2016-01-13 01:11:46 -06:00
parent fa7cab9866
commit 8064a804eb
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/jace/apple2e/VideoDHGR.java
View File

@ -389,7 +389,7 @@ public class VideoDHGR extends Video {
Color color = Palette.color[c1]; Color color = Palette.color[c1];
// Unrolled loop, faster // Unrolled loop, faster
PixelWriter writer = screen.getPixelWriter(); PixelWriter writer = screen.getPixelWriter();
int xx = xOffset * 7; int xx = xOffset * 14;
writer.setColor(xx++, y, color); writer.setColor(xx++, y, color);
writer.setColor(xx++, y, color); writer.setColor(xx++, y, color);
writer.setColor(xx++, y, color); writer.setColor(xx++, y, color);
@ -418,9 +418,9 @@ public class VideoDHGR extends Video {
} }
PixelWriter writer = screen.getPixelWriter(); PixelWriter writer = screen.getPixelWriter();
// int yOffset = xyOffset[y][times14[xOffset]]; // int yOffset = xyOffset[y][times14[xOffset]];
Color color = Palette.color[c1]; Color color = Palette.color[FLIP_NYBBLE[c1]];
// Unrolled loop, faster // Unrolled loop, faster
int xx = xOffset * 7; int xx = xOffset * 14;
writer.setColor(xx++, y, color); writer.setColor(xx++, y, color);
writer.setColor(xx++, y, color); writer.setColor(xx++, y, color);
writer.setColor(xx++, y, color); writer.setColor(xx++, y, color);
@ -615,16 +615,19 @@ public class VideoDHGR extends Video {
} }
protected void showDhgr(WritableImage screen, int xOffset, int y, int dhgrWord) { protected void showDhgr(WritableImage screen, int xOffset, int y, int dhgrWord) {
//Graphics2D g = (Graphics2D) screen.getGraphics();
int xx = xOffset * 7;
PixelWriter writer = screen.getPixelWriter(); PixelWriter writer = screen.getPixelWriter();
try { try {
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
Color color = Palette.color[FLIP_NYBBLE[dhgrWord & 15]]; Color color;
writer.setColor(xx++, y, color); if (!dhgrMode && hiresMode) {
writer.setColor(xx++, y, color); color = Palette.color[dhgrWord & 15];
writer.setColor(xx++, y, color); } else {
writer.setColor(xx++, y, color); color = Palette.color[FLIP_NYBBLE[dhgrWord & 15]];
}
writer.setColor(xOffset++, y, color);
writer.setColor(xOffset++, y, color);
writer.setColor(xOffset++, y, color);
writer.setColor(xOffset++, y, color);
dhgrWord >>= 4; dhgrWord >>= 4;
} }
} catch (ArrayIndexOutOfBoundsException ex) { } catch (ArrayIndexOutOfBoundsException ex) {
@ -652,11 +655,13 @@ public class VideoDHGR extends Video {
// Also, adding xOffset now makes it additionally 5% faster // Also, adding xOffset now makes it additionally 5% faster
//int yOffset = ((y << 4) + (y << 5) + (y << 9))+xOffset; //int yOffset = ((y << 4) + (y << 5) + (y << 9))+xOffset;
int xx = xOffset * 7; int xx = xOffset;
PixelWriter writer = screen.getPixelWriter(); PixelWriter writer = screen.getPixelWriter();
for (int i = 0; i < 28; i++) { for (int i = 0; i < 28; i++) {
if (xx < 560) {
// yOffset++ is used instead of yOffset+i, because it is faster // yOffset++ is used instead of yOffset+i, because it is faster
writer.setColor(xx++, y, (dhgrWord & 1) == 1 ? WHITE : BLACK); writer.setColor(xx++, y, (dhgrWord & 1) == 1 ? WHITE : BLACK);
}
dhgrWord >>= 1; dhgrWord >>= 1;
} }
} }