From ba0f11e3a5f88adb0f7be3e97067b5c88523a11e Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Sun, 6 Oct 2024 12:48:10 -0700 Subject: [PATCH] Update tests --- src/inc/dcgrlib.plh | 2 +- src/libsrc/apple/dcgrlib.pla | 19 +++++++++++++++++-- src/samplesrc/dcgrtest.pla | 6 ++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/inc/dcgrlib.plh b/src/inc/dcgrlib.plh index 669f658..9992777 100644 --- a/src/inc/dcgrlib.plh +++ b/src/inc/dcgrlib.plh @@ -41,5 +41,5 @@ import dcgrlib predef dcgrOp(op)#0 predef dcgrSurfScr(op)#0 predef dcgrSurfMem(op, memh, memptr, memspan)#0 - predef dcgrMode(mode) + predef dcgrMode(mode)#1 end diff --git a/src/libsrc/apple/dcgrlib.pla b/src/libsrc/apple/dcgrlib.pla index f42fe7e..1bba877 100644 --- a/src/libsrc/apple/dcgrlib.pla +++ b/src/libsrc/apple/dcgrlib.pla @@ -1827,7 +1827,22 @@ def dcgrTileMem(tileptr, memptr, memspan)#0 byte h, v word rowptr - for h = 0 to 3 + // + // AUX half of memptr + // + for h = 0 to 1 + rowptr = memptr + h + for v = 0 to 7 + ^rowptr = tileptr->[v] + rowptr = rowptr + memspan + next + tileptr = tileptr + 8 + next + // + // MEM half of memptr + // + memptr = memptr + memspan / 2 + for h = 0 to 1 rowptr = memptr + h for v = 0 to 7 ^rowptr = tileptr->[v] @@ -2044,7 +2059,7 @@ export def dcgrSurfMem(op, memh, memptr, memspan)#0 dcgrOpMem(opMem) fin end -export def dcgrMode(mode) +export def dcgrMode(mode)#1 if mode >= 0 ^page1m ^showfull diff --git a/src/samplesrc/dcgrtest.pla b/src/samplesrc/dcgrtest.pla index 90dd2df..5881f74 100644 --- a/src/samplesrc/dcgrtest.pla +++ b/src/samplesrc/dcgrtest.pla @@ -258,6 +258,9 @@ def dcgrTest#0 // j = 0 while ^$C000 < 128 + // + // Convert compiled sprite into tile set + // dcgrMemBl7Tile(0, 0, backblk, sprite7[j], sprite7span) dcgrMemBl7Tile(1, 0, backblk + 32, sprite7[j], sprite7span) dcgrMemBl7Tile(2, 0, backblk + 64, sprite7[j], sprite7span) @@ -266,6 +269,9 @@ def dcgrTest#0 dcgrMemBl7Tile(1, 8, backblk + 160, sprite7[j], sprite7span) dcgrMemBl7Tile(2, 8, backblk + 192, sprite7[j], sprite7span) dcgrMemBl7Tile(3, 8, backblk + 224, sprite7[j], sprite7span) + // + // Fill screen wil tiles matching compiled sprite + // for i = 0 to 19 tilestr[i] = i & $03 next