Implement double buffering drawing

1 files changed, 17 insertions, 16 deletions

diff --git a/src/main.c b/src/main.c
index e767d43..df78355 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,6 @@
 
 #include "common.h"
 #include "bitmap.h"
-#include "text.h"
 // #include "small-font.c"
 #include "bd-font.c"
 
@@ -15,6 +14,7 @@
 #include "uxn/roms/dvd.c"
 // #include "uxn/roms/automata.c"
 // #include "uxn/roms/life.c"
+#include "text.h"
 
 /*
 Copyright (c) 2021 Bad Diode
@@ -68,7 +68,7 @@ system_talk(Device *d, Uint8 b0, Uint8 w)
 
 void
 screen_talk(Device *d, Uint8 b0, Uint8 w) {
-    profile_start();
+    // profile_start();
     if(w && b0 == 0xe) {
         Uint16 x = mempeek16(d->dat, 0x8);
         Uint16 y = mempeek16(d->dat, 0xa);
@@ -84,8 +84,8 @@ screen_talk(Device *d, Uint8 b0, Uint8 w) {
         }
         reqdraw = 1;
     }
-    int cycles = profile_stop();
-    drawing_cycles += cycles;
+    // int cycles = profile_stop();
+    // drawing_cycles += cycles;
 }
 
 void
@@ -122,32 +122,33 @@ int main(void) {
     irq_init();
     irs_set(IRQ_VBLANK, irs_stub);
 
+
+    // Initialize VM.
+    Uxn u = {0};
+    init_uxn(&u);
+    evaluxn(&u, 0x0100);
+
     // Initialize text engine.
-    txt_init_bitmap(
+    txt_init_hybrid(
             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);
+            }, &ppu.fg);
 
     // Main loop.
     int frame_counter = 0;
     while(true) {
         bios_vblank_wait();
         poll_keys();
+        profile_start();
         evaluxn(&u, mempeek16(devscreen->dat, 0));
+        flipbuf(&ppu);
+        int eval_cycles = profile_stop();
         txt_position(0,0);
-        txt_clear_screen();
-        txt_printf("FRAME: %d\n", frame_counter);
-        txt_printf("DRAWING: %d\n", drawing_cycles);
+        txt_printf("FRAME: %d              \n", frame_counter);
+        txt_printf("EVAL:  %d              \n", eval_cycles);
         drawing_cycles = 0;
         frame_counter++;
     }