From eb5daa16843d5e819ffe6a788a9c93e930ff0e82 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Sun, 2 Jun 2024 14:42:36 -0400
Subject: [PATCH] code cleanups, on to sprites

---
 bun.c  |  84 ++++++++++++++++++++++++++++++++++++---------------------
 bun.h  |  39 +--------------------------
 main   | Bin 15776 -> 15452 bytes
 main.c |  13 ++-------
 4 files changed, 57 insertions(+), 79 deletions(-)

diff --git a/bun.c b/bun.c
index 2dd2bce..999e930 100644
--- a/bun.c
+++ b/bun.c
@@ -14,6 +14,31 @@
 #include "bun.h"
 #include "system/system.h"
 
+#define COOL_BUN_WIDTH (32)
+#define COOL_BUN_WIDTH_BYTES (COOL_BUN_WIDTH / 8)
+#define COOL_BUN_HEIGHT (32)
+#define COOL_BUN_PLANES (2)
+#define COOL_BUN_LAST_ROW (COOL_BUN_HEIGHT - 1)
+#define COOL_BUN_LAST_ROW_BYTES (COOL_BUN_LAST_ROW * COOL_BUN_WIDTH_BYTES)
+
+#define COOL_BUN_PLANE_SIZE (COOL_BUN_WIDTH_BYTES * COOL_BUN_HEIGHT)
+#define COOL_BUN_MEMORY_SIZE (COOL_BUN_PLANE_SIZE * COOL_BUN_PLANES)
+
+#define BUN_MAX_RANGE (31 + 320)
+
+#define BUN_COUNT (12)
+#define BUN_SPEED (1)
+
+#define BUN_HORIZ_DISTANCE_BETWEEN_BUNS ((BUN_MAX_RANGE / 4) - COOL_BUN_WIDTH)
+#define BUN_TOTAL_HORIZ_DISTANCE (BUN_HORIZ_DISTANCE_BETWEEN_BUNS + COOL_BUN_WIDTH)
+#define BUN_ROW_START (30)
+#define BUN_VERT_DISTANCE_BETWEEN_BUNS (20)
+#define BUN_TOTAL_VERT_DISTANCE (COOL_BUN_HEIGHT + BUN_VERT_DISTANCE_BETWEEN_BUNS)
+#define FRAME_MAX (BUN_TOTAL_HORIZ_DISTANCE / BUN_SPEED)
+
+#define FRAMES_FOR_SCREEN (90)
+#define BUN_WAVE_LENGTH (FRAMES_FOR_SCREEN / 2)
+
 // linked as raw bytes in assembler
 extern unsigned char far coolbun[];
 
@@ -26,9 +51,8 @@ unsigned char *coolbunArea;
 
 extern struct Custom far custom;
 
-void setupBun() {
+void setupBun(void) {
   unsigned char *currentCoolBunArea, *currentCoolBun;
-  unsigned int x, y, plane;
 
   coolbunArea = AllocMem(COOL_BUN_MEMORY_SIZE, MEMF_CHIP | MEMF_CLEAR);
   currentCoolBunArea = coolbunArea;
@@ -37,7 +61,7 @@ void setupBun() {
   CopyMem(coolbun, coolbunArea, COOL_BUN_MEMORY_SIZE);
 }
 
-void teardownBun() {
+void teardownBun(void) {
   FreeMem(coolbunArea, COOL_BUN_MEMORY_SIZE);
 }
 
@@ -195,37 +219,10 @@ void renderBun(
   }
 }
 
-short int allBunPositionsByFrame[FRAMES_FOR_SCREEN][BUN_COUNT][2];
-
-void calculateAllBunPositions(
-  struct ScreenSetup *screenSetup
-) {
-  int frame;
-
-  for (frame = 0; frame < FRAMES_FOR_SCREEN; ++frame) {
-    calculateBunPositions(
-      frame,
-      allBunPositionsByFrame[frame],
-      screenSetup
-    );
-  }
-}
-
 #define MAX_SINE_WAVE_CHANGE (20)
 
 int bunAngleAdjustments[BUN_COUNT];
 
-void buildBunAngleAdjustments() {
-  int row, column, current, angleAdjustment;
-  for (current = 0; current < BUN_COUNT; ++current) {
-    angleAdjustment = 0;
-    if (current % 2 == 1) angleAdjustment += 180;
-    if (current / 4 == 1) angleAdjustment += 90;
-
-    bunAngleAdjustments[current] = angleAdjustment;
-  }
-}
-
 void calculateBunPositions(
   uint16_t frame,
   short int bunPositions[BUN_COUNT][2],
@@ -261,6 +258,33 @@ void calculateBunPositions(
   }
 }
 
+short int allBunPositionsByFrame[FRAMES_FOR_SCREEN][BUN_COUNT][2];
+
+void calculateAllBunPositions(
+  struct ScreenSetup *screenSetup
+) {
+  int frame;
+
+  for (frame = 0; frame < FRAMES_FOR_SCREEN; ++frame) {
+    calculateBunPositions(
+      frame,
+      allBunPositionsByFrame[frame],
+      screenSetup
+    );
+  }
+}
+
+void buildBunAngleAdjustments() {
+  int current, angleAdjustment;
+  for (current = 0; current < BUN_COUNT; ++current) {
+    angleAdjustment = 0;
+    if (current % 2 == 1) angleAdjustment += 180;
+    if (current / 4 == 1) angleAdjustment += 90;
+
+    bunAngleAdjustments[current] = angleAdjustment;
+  }
+}
+
 void setupBunRenderer(
   struct BunRenderer *bunRenderer,
   struct ScreenSetup *screenSetup,
diff --git a/bun.h b/bun.h
index 8dfc3fe..b10af54 100644
--- a/bun.h
+++ b/bun.h
@@ -3,31 +3,6 @@
 
 #include "screen.h"
 
-#define COOL_BUN_WIDTH (32)
-#define COOL_BUN_WIDTH_BYTES (COOL_BUN_WIDTH / 8)
-#define COOL_BUN_HEIGHT (32)
-#define COOL_BUN_PLANES (2)
-#define COOL_BUN_LAST_ROW (COOL_BUN_HEIGHT - 1)
-#define COOL_BUN_LAST_ROW_BYTES (COOL_BUN_LAST_ROW * COOL_BUN_WIDTH_BYTES)
-
-#define COOL_BUN_PLANE_SIZE (COOL_BUN_WIDTH_BYTES * COOL_BUN_HEIGHT)
-#define COOL_BUN_MEMORY_SIZE (COOL_BUN_PLANE_SIZE * COOL_BUN_PLANES)
-
-#define BUN_MAX_RANGE (31 + 320)
-
-#define BUN_COUNT (12)
-#define BUN_SPEED (1)
-
-#define BUN_HORIZ_DISTANCE_BETWEEN_BUNS ((BUN_MAX_RANGE / 4) - COOL_BUN_WIDTH)
-#define BUN_TOTAL_HORIZ_DISTANCE (BUN_HORIZ_DISTANCE_BETWEEN_BUNS + COOL_BUN_WIDTH)
-#define BUN_ROW_START (30)
-#define BUN_VERT_DISTANCE_BETWEEN_BUNS (20)
-#define BUN_TOTAL_VERT_DISTANCE (COOL_BUN_HEIGHT + BUN_VERT_DISTANCE_BETWEEN_BUNS)
-#define FRAME_MAX (BUN_TOTAL_HORIZ_DISTANCE / BUN_SPEED)
-
-#define FRAMES_FOR_SCREEN (90)
-#define BUN_WAVE_LENGTH (FRAMES_FOR_SCREEN / 2)
-
 struct BunRenderer {
   struct ScreenSetup *screenSetup;
   struct CurrentScreen *currentScreen;
@@ -43,17 +18,5 @@ void renderBunFrame(
   int frame,
   struct BunRenderer *
 );
-
-void renderBun(
-  int x,
-  int y,
-  struct ScreenSetup *screenSetup,
-  struct CurrentScreen *currentScreen
-);
-void calculateBunPositions(
-  uint16_t frame,
-  short int bunPositions[BUN_COUNT][2],
-  struct ScreenSetup *screenSetup
-);
-
+void teardownBunRenderer(void);
 #endif
diff --git a/main b/main
index 9b3097557984c5de6e5f8197d50968e99678e484..0814c45a0204c7a9a4a4d3613bc4d0033fdc42e9 100755
GIT binary patch
delta 4395
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

delta 4594
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
HruP2@Wq=4@

diff --git a/main.c b/main.c
index 9dbfc8e..bb4be2b 100644
--- a/main.c
+++ b/main.c
@@ -37,13 +37,9 @@ void *copperlistSpritePointers[8];
 uint16_t custom_color = (uint16_t)offsetof(Custom, color);
 uint16_t custom_sprite = (uint16_t)offsetof(Custom, sprpt);
 
-short int bunPositions[BUN_COUNT][2];
-
 int main(void) {
   uint16_t *copperlist, *currentCopperlist, result;
-  int i, j, x, y, plane;
-  int blitShiftRight, memoryXOffset, blitWidth;
-  uint32_t wow, wow2;
+  int i, y, plane;
 
   struct BunRenderer bunRenderer;
 
@@ -56,7 +52,6 @@ int main(void) {
 
   printf("setting up, i haven't crashed...yet.\n");
 
-  setupBun();
   setupScreen(&screenSetup, SCREEN_WIDTH, SCREEN_HEIGHT, 3);
   setupInitialCurrentScreen(&screenSetup, &currentScreen);
 
@@ -144,11 +139,7 @@ int main(void) {
 
   freeCopperlist(copperlist);
 
-  teardownBun();
-
-  for (i = 0; i < BUN_COUNT; ++i) {
-    printf("%d %d\n", bunPositions[i][0], bunPositions[i][1]);
-  }
+  teardownBunRenderer();
 
   return 0;
 }