6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2025-08-05 09:25:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix lastOffset calculations in Apple II hi-res visualizer

Browse Source 
The calculations were wrong for certain situations, generating
answers that were useless or that caused a false-positive overflow
error.

This adds a couple of simple regression tests, modeled after layout
of the Lode Runner sprite sheet (which worked fine before) and the
Empire II EWS3 font (which failed).

This also bumps up some of the arbitrary limits in the visualizer.

(issue #94)
This commit is contained in:
Andy McFadden
2021-05-17 17:28:13 -07:00
parent b415424368
commit 33ccdd91eb
6 changed files with 198 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
SourceGen/RuntimeData/Apple/VisHiRes.cs
View File

@@ -64,9 +64,9 @@ namespace RuntimeData.Apple {
new VisParamDescr("Height",
P_HEIGHT, typeof(int), 1, 1024, 0, 1),
new VisParamDescr("Column stride (bytes)",
P_COL_STRIDE, typeof(int), 0, 1024, 0, 0),
P_COL_STRIDE, typeof(int), 0, 4096, 0, 0),
new VisParamDescr("Row stride (bytes)",
P_ROW_STRIDE, typeof(int), 0, 1024, 0, 0),
P_ROW_STRIDE, typeof(int), 0, 4096, 0, 0),
new VisParamDescr("Color",
P_IS_COLOR, typeof(bool), 0, 0, 0, true),
new VisParamDescr("First col odd",
@@ -88,13 +88,13 @@ namespace RuntimeData.Apple {
new VisParamDescr("Cell height",
P_ITEM_HEIGHT, typeof(int), 1, 192, 0, 1),
new VisParamDescr("Column stride (bytes)",
P_COL_STRIDE, typeof(int), 0, 1024, 0, 0),
P_COL_STRIDE, typeof(int), 0, 4096, 0, 0),
new VisParamDescr("Row stride (bytes)",
P_ROW_STRIDE, typeof(int), 0, 1024, 0, 0),
P_ROW_STRIDE, typeof(int), 0, 4096, 0, 0),
new VisParamDescr("Cell stride (bytes)",
P_CELL_STRIDE, typeof(int), 0, 4096, 0, 0),
new VisParamDescr("Number of items",
P_COUNT, typeof(int), 1, 1024, 0, 64),
P_COUNT, typeof(int), 1, 4096, 0, 64),
new VisParamDescr("Color",
P_IS_COLOR, typeof(bool), 0, 0, 0, true),
new VisParamDescr("First col odd",
@@ -205,11 +205,14 @@ namespace RuntimeData.Apple {
return null;
}
int lastOffset = offset + rowStride * height - (colStride - 1) - 1;
int lastOffset = offset + rowStride * (height - 1) +
colStride * (byteWidth - 1);
if (lastOffset >= mFileData.Length) {
mAppRef.ReportError("Bitmap runs off end of file (last offset +" +
lastOffset.ToString("x6") + ")");
return null;
//} else {
// mAppRef.DebugLog("last offset=+" + lastOffset.ToString("x6"));
}
VisBitmap8 vb = new VisBitmap8(byteWidth * 7, height);
@@ -283,11 +286,15 @@ namespace RuntimeData.Apple {
}
int lastOffset = offset + (cellStride * (count - 1)) +
rowStride * itemHeight - (colStride - 1) - 1;
rowStride * (itemHeight - 1) +
colStride * (itemByteWidth - 1);
if (lastOffset >= mFileData.Length) {
mAppRef.ReportError("Bitmap runs off end of file (last offset +" +
lastOffset.ToString("x6") + ")");
return null;
//} else {
// mAppRef.DebugLog("lastOffset=+" + lastOffset.ToString("x6") +
// ", len=" + mFileData.Length.ToString("x6"));
}
// Set the number of horizontal cells. For small counts we try to make it square,