From 686125592aaeda0e4e99c63eccb3b15b5be4bbff Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Thu, 13 Jun 2024 09:01:22 -0400
Subject: [PATCH] this is as optimized as the code will reasonably get

we just need to blit less stuff
---
 bun.c  |  88 +++++++++++++++++++++++++++++++++++++--------------------
 main   | Bin 77068 -> 77192 bytes
 main.c |  56 +++++++++++++++++++++---------------
 3 files changed, 92 insertions(+), 52 deletions(-)

diff --git a/bun.c b/bun.c
index 228f8b2..20ed093 100644
--- a/bun.c
+++ b/bun.c
@@ -92,7 +92,7 @@ void bun_offRightSide(
   uint8_t i, plane = 0;
   uint8_t shift = plusXValue & 15;
   uint8_t wordShift = (plusXValue >> 4);
-  uint16_t bltalwm;
+  uint16_t bltalwm, bltcon0, bltcon1, bltdmod, bltsize;
 
   bunClear->memoryStartOffsetBytes =  (y * screenSetup->byteWidth) +
     screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES +
@@ -106,9 +106,17 @@ void bun_offRightSide(
     bltalwm += (1 << (15 - i));
   }
 
+  bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift);
+  bltcon1 = BLTCON1(bunClear->direction, shift);
+
+  bltdmod = screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES +
+    wordShift * 2;
+
+  bltsize = bunClear->widthWords + (bunClear->heightRows << 6);
+
   for (plane = 0; plane < 2; ++plane) {
-    custom.bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift);
-    custom.bltcon1 = BLTCON1(bunClear->direction, shift);
+    custom.bltcon0 = bltcon0;
+    custom.bltcon1 = bltcon1;
 
     custom.bltadat = 0xffff;
     custom.bltbpt = coolbunPlaneStarts[BUN_OFF_LEFT_SIDE][plane];
@@ -119,10 +127,9 @@ void bun_offRightSide(
     custom.bltalwm = bltalwm;
 
     custom.bltbmod = wordShift * 2;
-    custom.bltdmod = screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES +
-      wordShift * 2;
+    custom.bltdmod = bltdmod;
 
-    custom.bltsize = bunClear->widthWords + (bunClear->heightRows << 6);
+    custom.bltsize = bltsize;
 
     WaitBlit();
   }
@@ -139,7 +146,7 @@ void bun_offLeftSide(
   uint8_t shift = minusXValue & 15;
   uint8_t wordShift = (minusXValue >> 4);
   uint8_t i;
-  uint16_t bltalwm;
+  uint16_t bltalwm, bltcon0, bltcon1, bltdmod, bltsize;
 
   // y can't be 0 otherwise we will corrupt memory for now
   if (y == 0) return;
@@ -155,10 +162,16 @@ void bun_offLeftSide(
     bltalwm += (1 << i);
   }
 
+  bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift);
+  bltcon1 = BLTCON1(bunClear->direction, shift);
+  bltdmod = screenSetup->byteWidth - 4 + wordShift * 2;
+
+  bltsize = bunClear->widthWords + (bunClear->heightRows << 6);
+
   for (plane = 0; plane < 2; ++plane) {
     // shift left, so descending
-    custom.bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift);
-    custom.bltcon1 = BLTCON1(bunClear->direction, shift);
+    custom.bltcon0 = bltcon0;
+    custom.bltcon1 = bltcon1;
 
     // a has a mask we're shifting
     custom.bltadat = 0xffff;
@@ -172,9 +185,9 @@ void bun_offLeftSide(
     custom.bltalwm = bltalwm;
 
     custom.bltbmod = wordShift * 2;
-    custom.bltdmod = screenSetup->byteWidth - 4 + wordShift * 2;
+    custom.bltdmod = bltdmod;
 
-    custom.bltsize = bunClear->widthWords + (bunClear->heightRows << 6);
+    custom.bltsize = bltsize;
 
     WaitBlit();
   }
@@ -190,6 +203,7 @@ void bun_anywhere(
   uint8_t plane;
   uint8_t shift = x & 15;
   uint8_t needsExtraWord = shift != 0;
+  uint16_t bltcon0, bltcon1, bltalwm, bltbmod, bltdmod, bltsize;
 
   bunClear->memoryStartOffsetBytes = WORD_ALIGNED_BYTE_POSITION(screenSetup->width, x, y);
 
@@ -197,13 +211,23 @@ void bun_anywhere(
   bunClear->widthWords = 2 + needsExtraWord;
   bunClear->direction = BLITTER_ASCENDING;
 
-  for (plane = 0; plane < 2; ++plane) {
-    // if we extend the bun area by a word, we only need one write
+  // buns will never interfere with a background so they don't need a mask
+  bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift);
+  bltcon1 = BLTCON1(bunClear->direction, shift);
 
-    // buns will never interfere with a background so they don't need a mask
-    // they do need the scratch area though
-    custom.bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift);
-    custom.bltcon1 = BLTCON1(bunClear->direction, shift);
+  if (needsExtraWord) {
+    bltalwm = 0x0000;
+  } else {
+    bltalwm = 0xffff;
+  }
+
+  bltbmod = -(needsExtraWord * 2);
+  bltdmod = screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES - (needsExtraWord * 2);
+  bltsize = bunClear->widthWords + (bunClear->heightRows << 6);
+
+  for (plane = 0; plane < 2; ++plane) {
+    custom.bltcon0 = bltcon0;
+    custom.bltcon1 = bltcon1;
 
     custom.bltadat = 0xffff;
     custom.bltbpt = coolbunPlaneStarts[BUN_ANYWHERE][plane];
@@ -212,15 +236,11 @@ void bun_anywhere(
 
    // custom.bltdpt = screenSetup.memoryStart;
     custom.bltafwm = 0xffff;
-    if (needsExtraWord) {
-      custom.bltalwm = 0x0000;
-    } else {
-      custom.bltalwm = 0xffff;
-    }
+    custom.bltalwm = bltalwm;
 
-    custom.bltbmod = -(needsExtraWord * 2);
-    custom.bltdmod = screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES - (needsExtraWord * 2);
-    custom.bltsize = bunClear->widthWords + (bunClear->heightRows << 6);
+    custom.bltbmod = bltbmod;
+    custom.bltdmod = bltdmod;
+    custom.bltsize = bltsize;
 
     WaitBlit();
   }
@@ -242,7 +262,7 @@ void renderBun(
   if (x < -31) return;
   if (x > screenSetup->width + 31) return;
   if (y < 1) return;
-  if (y > screenSetup->height- COOL_BUN_HEIGHT - 1) return;
+  if (y > screenSetup->height - COOL_BUN_HEIGHT - 1) return;
 
   if (x < 0) {
     bun_offLeftSide(
@@ -370,22 +390,30 @@ void clearCurrentBuns(
 ) {
   int bun, plane;
   struct BunClear *currentBunClear;
+  uint16_t bltcon0, bltcon1, bltdmod, bltsize;
 
   if (!hasBunClear[bunRenderer->currentScreen->currentBuffer]) return;
 
+  bltcon0 = 0xc0 + (1 << 8);
+
   for (bun = 0; bun < BUN_COUNT; ++bun) {
     currentBunClear = &bunClearForScreen[bunRenderer->currentScreen->currentBuffer][bun];
 
+    bltcon1 = BLTCON1(currentBunClear->direction, 0);
+    bltdmod = bunRenderer->screenSetup->byteWidth - (currentBunClear->widthWords * 2);
+    bltsize = currentBunClear->widthWords + (currentBunClear->heightRows << 6);
+
     for (plane = 0; plane < 2; ++plane) {
-      custom.bltcon0 = 0xc0 + (1 << 8);
-      custom.bltcon1 = BLTCON1(currentBunClear->direction, 0);
+      custom.bltcon0 = bltcon0;
+      custom.bltcon1 = bltcon1;
       custom.bltadat = 0x0000;
       custom.bltafwm = 0xffff;
       custom.bltalwm = 0xffff;
       custom.bltdpt = bunRenderer->currentScreen->planes[plane] +
         currentBunClear->memoryStartOffsetBytes;
-      custom.bltdmod = bunRenderer->screenSetup->byteWidth - (currentBunClear->widthWords * 2);
-      custom.bltsize = currentBunClear->widthWords + (currentBunClear->heightRows << 6);
+      custom.bltdmod = bltdmod;
+      custom.bltsize = bltsize;
+
       WaitBlit();
     }
   }
diff --git a/main b/main
index ee124a79616b3e38ebfde0708000b6b750eae649..d6fc5e44b32bcde55b18eb7a977240866ff90b8f 100755
GIT binary patch
delta 2640
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
bXYYky4+ofS74Pb!uP@&_@!mTDrkni_naS=<

delta 2519
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
Rook=g#CNN2BwD#){vQIG)pP&=

diff --git a/main.c b/main.c
index 70c3793..18351d5 100644
--- a/main.c
+++ b/main.c
@@ -64,6 +64,37 @@ extern uint16_t chip SpriteCopperlist[];
 extern uint16_t chip SpriteData[];
 extern uint16_t chip MaskBitplane[];
 
+void renderTopaz(void) {
+  int plane;
+
+  uint16_t bltcon0, bltcmod;
+  uint8_t *bltbpt;
+
+  bltcon0 = 0xca + (1 << 8) + (1 << 9) + (1 << 10) + (1 << 11);
+  bltcmod = screenSetup.byteWidth - 32;
+  bltbpt = TopazBitplanes;
+
+  for (plane = 0; plane < 3; ++plane) {
+    custom.bltcon0 = bltcon0;
+    custom.bltcon1 = 0;
+    custom.bltafwm = 0xffff;
+    custom.bltalwm = 0xffff;
+    custom.bltapt = MaskBitplane;
+    custom.bltbpt = bltbpt;
+    custom.bltcpt = currentScreen.planes[plane];
+    custom.bltdpt = currentScreen.planes[plane];
+    custom.bltamod = 0;
+    custom.bltbmod = 0;
+    custom.bltcmod = bltcmod;
+    custom.bltdmod = bltcmod;
+    custom.bltsize = 16 + (256 << 6);
+
+    bltbpt += 32 * 256;
+
+    WaitBlit();
+  }
+}
+
 int main(void) {
   uint16_t *copperlist, *currentCopperlist, *currentCopperColors, result, *currentSpriteCopperlist;
   uint32_t spriteDataPointer;
@@ -78,7 +109,6 @@ int main(void) {
   colors[2] = 0x0fff;
   colors[3] = 0x000f;
 
-  printf("%x\n", &SpriteData);
   printf("setting up, i haven't crashed...yet.\n");
 
   setupScreen(&screenSetup, SCREEN_WIDTH, SCREEN_HEIGHT, 3);
@@ -101,7 +131,7 @@ int main(void) {
     &currentScreen,
     &copperlistBitplanePointers
   );
-  currentCopperlist = setUpEmptySpritesInCopperlist(currentCopperlist);
+  //currentCopperlist = setUpEmptySpritesInCopperlist(currentCopperlist);
 
   currentCopperColors = CopperColors;
   currentSpriteCopperlist = SpriteCopperlist;
@@ -198,26 +228,11 @@ int main(void) {
 
     renderBunFrame(i, &bunRenderer);
 
+    renderTopaz();
+
     /*
   */
 
-    for (plane = 0; plane < 3; ++plane) {
-      custom.bltcon0 = 0xca + (1 << 8) + (1 << 9) + (1 << 10) + (1 << 11);
-      custom.bltcon1 = 0;
-      custom.bltafwm = 0xffff;
-      custom.bltalwm = 0xffff;
-      custom.bltapt = MaskBitplane;
-      custom.bltbpt = TopazBitplanes + (plane * 32 * 256);
-      custom.bltcpt = currentScreen.planes[plane];
-      custom.bltdpt = currentScreen.planes[plane];
-      custom.bltamod = 0;
-      custom.bltbmod = 0;
-      custom.bltcmod = screenSetup.byteWidth - 32;
-      custom.bltdmod = screenSetup.byteWidth - 32;
-      custom.bltsize = 16 + (256 << 6);
-
-      WaitBlit();
-    }
 
     /*
     *(SpriteData) = SPRPOS(250, 44);
@@ -230,7 +245,6 @@ int main(void) {
       copperlistBitplanePointers
     );
 
-
     WaitTOF();
     
     if ((ciaa.ciapra >> 6) != 3) break;
@@ -255,8 +269,6 @@ int main(void) {
   }
 */
 
-  printf("%x %x", SPRPOS(250, 44), SPRCTL(250, 44, 44 + 256));
-
   freeCopperlist(copperlist);
 
   teardownBunRenderer();