Add a new console drawing mode

1 files changed, 29 insertions, 4 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;
 }