Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-07-07 14:29:16 +00:00
Code Issues Projects Releases Wiki Activity

Fixed DHGR export bugs

Browse Source
This commit is contained in:
Brendan Robert 2017-12-29 00:15:40 -06:00
parent 05e59a5454
commit c98bf87549
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleImageEditor.java
View File

@ -571,6 +571,7 @@ public class AppleImageEditor extends ImageEditor implements EventHandler<MouseE
try (FileOutputStream outStream = new FileOutputStream(out)) {
outStream.write(AppleNTSCGraphics.getAppleHGRBinary(getPlatformData()));
outStream.flush();
outStream.close();
} catch (IOException ex) {
Logger.getLogger(AppleImageEditor.class.getName()).log(Level.SEVERE, null, ex);
}

18
OutlawEditor/src/main/java/org/badvision/outlaweditor/apple/AppleNTSCGraphics.java
View File

@ -150,12 +150,20 @@ public class AppleNTSCGraphics {
}
static byte[] getAppleHGRBinary(PlatformData platformData) {
byte[] output = new byte[0x02000];
boolean dhgr = platformData.getWidth() > 40;
byte[] output = new byte[dhgr ? 0x04000 : 0x02000];
int counter = 0;
for (int y = 0; y < platformData.getHeight(); y++) {
int offset = calculateHiresOffset(y);
for (int x = 0; x < platformData.getWidth(); x++) {
output[offset + x] = platformData.getValue()[counter++];
if (dhgr) {
for (int x = 0; x < 40; x++) {
output[0x02000 + offset + x] = platformData.getValue()[counter++];
output[offset + x] = platformData.getValue()[counter++];
}
} else {
for (int x = 0; x < platformData.getWidth(); x++) {
output[offset + x] = platformData.getValue()[counter++];
}
}
}
return output;
@ -166,7 +174,7 @@ public class AppleNTSCGraphics {
for (int y = 0; y < data.getHeight(); y++) {
int pos = calculateHiresOffset(y) + 0x02000;
listing.append("\n").append(Integer.toHexString(pos)).append(":");
for (int x = 1; x < data.getWidth(); x+=2) {
for (int x = 0; x < data.getWidth(); x+=2) {
int val = data.getValue()[data.getWidth() * y + x] & 0x0ff;
listing.append(Integer.toHexString(val)).append(" ");
}
@ -174,7 +182,7 @@ public class AppleNTSCGraphics {
for (int y = 0; y < data.getHeight(); y++) {
int pos = calculateHiresOffset(y) + 0x04000;
listing.append("\n").append(Integer.toHexString(pos)).append(":");
for (int x = 0; x < data.getWidth(); x+=2) {
for (int x = 1; x < data.getWidth(); x+=2) {
int val = data.getValue()[data.getWidth() * y + x] & 0x0ff;
listing.append(Integer.toHexString(val)).append(" ");
}