Add draw_filled_rect function

3 files changed, 30 insertions, 11 deletions

diff --git a/src/main.c b/src/main.c
index 9e0be39..3a15655 100644
--- a/src/main.c
+++ b/src/main.c
@@ -53,12 +53,15 @@ WITH REGARD TO THIS SOFTWARE.
 void
 test_rects() {
     for (size_t i = 0; i < 100; i++) {
-        draw_line(0, 10, 10, 10, 1);
-        draw_line(10, 10, 10, 20, 1);
-        draw_line(0, 0, 10, 10, 2);
-        draw_line(0, 20, 20, 14, 1);
-        draw_line(0, 0, 239, 159, 2);
-        draw_line(0, 159, 239, 0, 3);
+        // draw_line(0, 10, 10, 10, 1);
+        // draw_line(10, 10, 10, 20, 1);
+        // draw_line(0, 0, 10, 10, 2);
+        // draw_line(0, 20, 20, 14, 1);
+        // draw_line(0, 0, 239, 159, 2);
+        // draw_line(0, 159, 239, 0, 3);
+        // draw_filled_rect(10, 10, SCREEN_WIDTH - 11, SCREEN_HEIGHT - 11, 3);
+        // draw_filled_rect(10, 10, 13, 21, 3);
+        draw_filled_rect(10, 10, 20, 20, 3);
     }
 }
 
diff --git a/src/renderer.c b/src/renderer.c
index 2b1f0d2..773d50b 100644
--- a/src/renderer.c
+++ b/src/renderer.c
@@ -26,7 +26,7 @@ static u32 dirty_tiles[21] = {0};
 
 IWRAM_CODE
 void
-draw_pixel(size_t x, size_t y, u8 color) {
+draw_pixel(size_t x, size_t y, u8 clr) {
     BOUNDCHECK_SCREEN(x, y);
 
     // Find row position for the given x/y coordinates.
@@ -38,7 +38,7 @@ draw_pixel(size_t x, size_t y, u8 color) {
 
     // Update backbuffer.
     size_t shift = start_col * sizeof(u32);
-    BACKBUF[pos] = (BACKBUF[pos] & ~(0xF << shift)) | color << shift;
+    BACKBUF[pos] = (BACKBUF[pos] & ~(0xF << shift)) | clr << shift;
 
     // Mark tile as dirty.
     dirty_tiles[tile_y] |= 1 << tile_x;
@@ -129,7 +129,7 @@ draw_line(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
         if (dx >= dy) {
             // Positive slope.
             int diff = 2 * dy - dx;
-            for (int i = 0; i <= dx; ++i) {
+            for (size_t i = 0; i <= dx; ++i) {
                 draw_pixel(x, y, clr);
                 if (diff >= 0) {
                     y += y_step;
@@ -141,7 +141,7 @@ draw_line(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
         } else {
             // Negative slope.
             int diff = 2 * dx - dy;
-            for (int i = 0; i <= dy; ++i) {
+            for (size_t i = 0; i <= dy; ++i) {
                 draw_pixel(x, y, clr);
                 if (diff >= 0) {
                     x += x_step;
@@ -253,6 +253,21 @@ draw_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
 
 IWRAM_CODE
 void
+draw_filled_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr) {
+    BOUNDCHECK_SCREEN(x0, y0);
+    BOUNDCHECK_SCREEN(x1, y1);
+
+    size_t dx = x1 - x0;
+    size_t dy = y1 - y0;
+    size_t n_rect = MIN(dx, dy);
+    n_rect = n_rect / 2 + 1;
+    for (size_t i = 0; i < n_rect; i++) {
+        draw_rect(x0 + i, y0 + i, x1 - i, y1 - i, clr);
+    }
+}
+
+IWRAM_CODE
+void
 draw_tile(size_t x, size_t y, Tile *tile, bool merge) {
     BOUNDCHECK_SCREEN(x, y);
 
diff --git a/src/renderer.h b/src/renderer.h
index 6e5cc38..e0aae31 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -28,9 +28,10 @@
 #define FONT_SB      15
 #define FONT_OFFSET  192
 
-void draw_pixel(size_t x, size_t y, u8 color);
+void draw_pixel(size_t x, size_t y, u8 clr);
 void draw_line(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr);
 void draw_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr);
+void draw_filled_rect(size_t x0, size_t y0, size_t x1, size_t y1, u8 clr);
 void draw_tile(size_t x, size_t y, Tile *tile, bool merge);
 void flip_buffer(void);
 void renderer_init(void);