Apple-2-Tools/jace
1
0
Fork 1
mirror of https://github.com/badvision/jace.git synced 2024-11-30 23:49:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34 from Michaelangel007/master

Browse Source 
Cleanup DHGR code for readability
This commit is contained in:
Brendan Robert 2017-10-24 10:12:23 -05:00 committed by GitHub
commit f19b0847ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,23 +297,23 @@ public class VideoDHGR extends Video {
if ((xOffset & 0x01) == 1) { if ((xOffset & 0x01) == 1) {
return; return;
} }
int b1 = ((RAM128k) computer.getMemory()).getAuxVideoMemory().readByte(rowAddress + xOffset); int b1 = ((RAM128k) computer.getMemory()).getAuxVideoMemory().readByte(rowAddress + xOffset );
int b2 = ((RAM128k) computer.getMemory()).getMainMemory().readByte(rowAddress + xOffset); int b2 = ((RAM128k) computer.getMemory()).getMainMemory() .readByte(rowAddress + xOffset );
int b3 = ((RAM128k) computer.getMemory()).getAuxVideoMemory().readByte(rowAddress + xOffset + 1); int b3 = ((RAM128k) computer.getMemory()).getAuxVideoMemory().readByte(rowAddress + xOffset + 1);
int b4 = ((RAM128k) computer.getMemory()).getMainMemory().readByte(rowAddress + xOffset + 1); int b4 = ((RAM128k) computer.getMemory()).getMainMemory() .readByte(rowAddress + xOffset + 1);
int useColOffset = xOffset << 1; int useColOffset = xOffset << 1;
// This shouldn't be necessary but prevents an index bounds exception when graphics modes are flipped (Race condition?) // This shouldn't be necessary but prevents an index bounds exception when graphics modes are flipped (Race condition?)
if (useColOffset >= 77) { if (useColOffset >= 77) {
useColOffset = 76; useColOffset = 76;
} }
useColor[useColOffset] = (b1 & 0x80) != 0; useColor[useColOffset ] = (b1 & 0x80) != 0;
useColor[useColOffset + 1] = (b2 & 0x80) != 0; useColor[useColOffset + 1] = (b2 & 0x80) != 0;
useColor[useColOffset + 2] = (b3 & 0x80) != 0; useColor[useColOffset + 2] = (b3 & 0x80) != 0;
useColor[useColOffset + 3] = (b4 & 0x80) != 0; useColor[useColOffset + 3] = (b4 & 0x80) != 0;
int dhgrWord = 0x07f & b1; int dhgrWord = (0x07f & b1) ;
dhgrWord |= (0x07f & b2) << 7; dhgrWord |= (0x07f & b2) << 7;
dhgrWord |= (0x07f & b3) << 14; dhgrWord |= (0x07f & b3) << 14;
dhgrWord |= (0x07f & b4) << 21; dhgrWord |= (0x07f & b4) << 21;
showDhgr(screen, TIMES_14[xOffset], y, dhgrWord); showDhgr(screen, TIMES_14[xOffset], y, dhgrWord);
} }
boolean extraHalfBit = false; boolean extraHalfBit = false;