Add a new console drawing mode

4 files changed, 95 insertions, 14 deletions

diff --git a/src/main.c b/src/main.c
index cd991e1..e767d43 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,8 +10,11 @@
 #include "uxn/uxn.c"
 #include "uxn/devices/ppu.h"
 #include "uxn/devices/ppu.c"
-// #include "uxn/roms/dvd.c"
-#include "uxn/roms/automata.c"
+// #include "uxn/roms/console.c"
+// #include "uxn/roms/proportional_fonts.c"
+#include "uxn/roms/dvd.c"
+// #include "uxn/roms/automata.c"
+// #include "uxn/roms/life.c"
 
 /*
 Copyright (c) 2021 Bad Diode
@@ -24,6 +27,8 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
+static size_t drawing_cycles = 0;
+
 static Ppu ppu;
 u8 reqdraw = 0;
 static Device *devscreen;
@@ -63,6 +68,7 @@ system_talk(Device *d, Uint8 b0, Uint8 w)
 
 void
 screen_talk(Device *d, Uint8 b0, Uint8 w) {
+    profile_start();
     if(w && b0 == 0xe) {
         Uint16 x = mempeek16(d->dat, 0x8);
         Uint16 y = mempeek16(d->dat, 0xa);
@@ -78,6 +84,8 @@ screen_talk(Device *d, Uint8 b0, Uint8 w) {
         }
         reqdraw = 1;
     }
+    int cycles = profile_stop();
+    drawing_cycles += cycles;
 }
 
 void
@@ -90,7 +98,7 @@ init_uxn(Uxn *u) {
 
     // Prepare devices.
     portuxn(u, 0x0, "system", system_talk);
-    portuxn(u, 0x1, "---", nil_talk);
+    portuxn(u, 0x1, "console", console_talk);
     devscreen = portuxn(u, 0x2, "screen", screen_talk);
     portuxn(u, 0x3, "---", nil_talk);
     portuxn(u, 0x4, "---", nil_talk);
@@ -114,9 +122,20 @@ int main(void) {
     irq_init();
     irs_set(IRQ_VBLANK, irs_stub);
 
+    // Initialize text engine.
+    txt_init_bitmap(
+            TXT_MODE_HYBRID,
+            (Font){
+                .data = bd_font,
+                .char_height = 8,
+                .char_width = 8,
+            });
+    txt_position(0,0);
+
     // Initialize VM.
     Uxn u = {0};
     init_uxn(&u);
+    txt_clear_screen();
     evaluxn(&u, 0x0100);
 
     // Main loop.
@@ -125,7 +144,13 @@ int main(void) {
         bios_vblank_wait();
         poll_keys();
         evaluxn(&u, mempeek16(devscreen->dat, 0));
-    };
+        txt_position(0,0);
+        txt_clear_screen();
+        txt_printf("FRAME: %d\n", frame_counter);
+        txt_printf("DRAWING: %d\n", drawing_cycles);
+        drawing_cycles = 0;
+        frame_counter++;
+    }
 
     return 0;
 }
diff --git a/src/text.h b/src/text.h
index bfac4e4..b3bb601 100644
--- a/src/text.h
+++ b/src/text.h
@@ -9,6 +9,7 @@
 
 typedef enum {
     TXT_MODE_TILED_BG,
+    TXT_MODE_HYBRID,
     TXT_MODE_MODE3,
 } TextMode;
 
@@ -115,6 +116,36 @@ txt_putc_m3(char c) {
 }
 
 void
+txt_putc_hybrid(char c) {
+    if (c == '\0') {
+        return;
+    }
+    if (c == '\n') {
+        text_engine.cursor_x = 0;
+        text_engine.cursor_y++;
+    } else {
+        u8 idx = text_engine.font.char_map[(int)c] * 2;
+        u32 *packed_char = text_engine.font.data;
+        packed_char += idx;
+        Tile tile = {0};
+        unpack_tiles(packed_char, &tile, 1);
+        int x = text_engine.cursor_x;
+        int y = text_engine.cursor_y;
+        // DEBUG: should be on the text struct.
+        Tile *buf = &TILE_MEM[0];
+        buf[x + y * 30] = tile;
+        text_engine.cursor_x += 1;
+        if (text_engine.cursor_x >= 30) {
+            text_engine.cursor_x = 0;
+            text_engine.cursor_y++;
+        }
+    }
+    if (text_engine.cursor_y >= 20) {
+        text_engine.cursor_y = 0;
+    }
+}
+
+void
 txt_putc(char c) {
     switch (text_engine.mode) {
         case TXT_MODE_TILED_BG: {
@@ -123,6 +154,9 @@ txt_putc(char c) {
         case TXT_MODE_MODE3: {
             txt_putc_m3(c);
         } break;
+        case TXT_MODE_HYBRID: {
+            txt_putc_hybrid(c);
+        } break;
     }
 }
 
@@ -164,9 +198,6 @@ txt_init_tile(size_t bg, Font font, size_t cb_idx) {
 
 void
 txt_init_bitmap(TextMode mode, Font font) {
-    // NOTE: Only mode 3 is currently supported
-    assert(mode == TXT_MODE_MODE3);
-
     // If font_map is NULL, initialize the standard 0-255 character map.
     if (font.char_map == NULL) {
         for (size_t i = 0; i < 256; ++i) {
@@ -201,22 +232,41 @@ txt_printf(char *msg, ...) {
     txt_puts(buf);
 }
 
-// TODO: Update for working on bitmap modes.
 void
-txt_clear_line(void) {
+txt_clear_line_tiled(void) {
     for (size_t i = 0; i < 30; ++i) {
         text_engine.memory[i + 32 * text_engine.cursor_y] = ' ';
     }
     text_engine.cursor_x = 0;
 }
 
-// TODO: Update for working on bitmap modes.
+void
+txt_clear_line_bitmap(void) {
+    // DEBUG: should be on the text struct.
+    Tile *buf = &TILE_MEM[0];
+    for (size_t i = 0; i < 30; ++i) {
+        buf[i + text_engine.cursor_y * 30] = (Tile){0};
+    }
+}
+
+void
+txt_clear_line(void) {
+    switch (text_engine.mode) {
+        case TXT_MODE_TILED_BG: {
+            txt_clear_line_tiled();
+        } break;
+        case TXT_MODE_MODE3:
+        case TXT_MODE_HYBRID: {
+            txt_clear_line_bitmap();
+        } break;
+    }
+}
+
 void
 txt_clear_screen(void) {
     for (size_t j = 0; j < 20; ++j) {
-        for (size_t i = 0; i < 30; ++i) {
-            text_engine.memory[i + 32 * j] = ' ';
-        }
+        text_engine.cursor_y = j;
+        txt_clear_line();
     }
     text_engine.cursor_x = 0;
     text_engine.cursor_y = 0;
diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index 5894352..836b7f0 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -114,6 +114,12 @@ initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad) {
         p->bg[i] = 0;
     }
 
+    // Initialize default palette.
+    PAL_BUFFER_BG[0] = COLOR_BLACK;
+    PAL_BUFFER_BG[1] = COLOR_WHITE;
+    PAL_BUFFER_BG[2] = COLOR_RED;
+    PAL_BUFFER_BG[3] = COLOR_BLUE;
+
     // Initialize memory map.
     u16 *fg_mem = SCREENBLOCK_MEM[sb_fg];
     u16 *bg_mem = SCREENBLOCK_MEM[sb_bg];
diff --git a/src/uxn/uxn.c b/src/uxn/uxn.c
index 08b3b9b..54d56d0 100644
--- a/src/uxn/uxn.c
+++ b/src/uxn/uxn.c
@@ -151,6 +151,6 @@ portuxn(Uxn *u, Uint8 id, char *name, void (*talkfn)(Device *d, Uint8 b0, Uint8
         d->u = u;
         d->mem = u->ram.dat;
         d->talk = talkfn;
-        txt_printf("Device added #%02x: %s, at 0x%04x \n", id, name, d->addr);
+        txt_printf("Dev:#%02x:0x%04x:%s \n", id, d->addr, name);
         return d;
 }