Update screen rendering to use 2 backgrounds

1 files changed, 17 insertions, 73 deletions

diff --git a/src/main.c b/src/main.c
index a2962bf..df6e225 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,11 +10,18 @@
 #include "uxn/uxn.c"
 #include "uxn/devices/ppu.h"
 #include "uxn/devices/ppu.c"
-// #include "uxn/roms/console.c"
 #include "uxn/roms/dvd.c"
-// #include "uxn/roms/proportional_fonts.c"
-// #include "uxn/roms/automata.c"
-// #include "uxn/roms/life.c"
+
+/*
+Copyright (c) 2021 Bad Diode
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE.
+*/
 
 static Ppu ppu;
 u8 reqdraw = 0;
@@ -73,14 +80,6 @@ screen_talk(Device *d, Uint8 b0, Uint8 w) {
 }
 
 void
-redraw(Uint16 *dst, Uxn *u) {
-    // TODO: The screen will flicker but using Mode4 for double buffering would
-    // be way too slow.
-    drawppu(&ppu);
-    reqdraw = 0;
-}
-
-void
 init_uxn(Uxn *u) {
     // Initialize PPU.
     initppu(&ppu, 30, 20, 0);
@@ -90,7 +89,7 @@ init_uxn(Uxn *u) {
 
     // Prepare devices.
     portuxn(u, 0x0, "system", system_talk);
-    portuxn(u, 0x1, "console", console_talk);
+    portuxn(u, 0x1, "---", nil_talk);
     devscreen = portuxn(u, 0x2, "screen", screen_talk);
     portuxn(u, 0x3, "---", nil_talk);
     portuxn(u, 0x4, "---", nil_talk);
@@ -110,76 +109,21 @@ init_uxn(Uxn *u) {
 }
 
 int main(void) {
-    // Initialize display mode and bg palette.
-    DISP_CTRL = DISP_MODE_0 | DISP_BG_0 | DISP_BG_1;
-
-    // WORKS
-    u8 cb_fg = 0;
-    u8 sb_fg = 10;
-    u8 cb_bg = 2;
-    u8 sb_bg = 26;
-    BG_CTRL(0) = BG_CHARBLOCK(cb_fg) | BG_SCREENBLOCK(sb_fg) | BG_PRIORITY(1);
-    BG_CTRL(1) = BG_CHARBLOCK(cb_bg) | BG_SCREENBLOCK(sb_bg) | BG_PRIORITY(2);
-    Tile *fg = &TILE_MEM[cb_fg];
-    Tile *bg = &TILE_MEM[cb_bg];
-    for (size_t i = 0; i < 30 * 20; ++i) {
-        fg[i] = (Tile){0};
-        bg[i] = (Tile){0};
-    }
-
-    // Initialize memory map.
-    u16 *fg_mem = SCREENBLOCK_MEM[sb_fg];
-    u16 *bg_mem = SCREENBLOCK_MEM[sb_bg];
-    size_t k = 0;
-    for (size_t j = 0; j < 20; ++j) {
-        for (size_t i = 0; i < 30; ++i, ++k) {
-            fg_mem[i + j * 32] = k;
-            bg_mem[i + j * 32] = k;
-        }
-    }
-
-    // Initialize text engine.
-    // txt_init_tile(
-    //         2,
-    //         (Font){
-    //             .data = bd_font,
-    //             .color = COLOR_WHITE,
-    //         }, 3);
-    // txt_printf("testing");
-
-    PAL_BUFFER_BG[0] = COLOR_RED;
-    PAL_BUFFER_BG[1] = COLOR_BLUE;
-    PAL_BUFFER_BG[2] = COLOR_CYAN;
-    PAL_BUFFER_BG[3] = COLOR_WHITE;
-    PAL_BUFFER_BG[4] = COLOR_GREY;
-
-
     // Register interrupts.
     irq_init();
     irs_set(IRQ_VBLANK, irs_stub);
 
-//     // Initialize VM.
-//     Uxn u = {0};
-//     init_uxn(&u);
-//     evaluxn(&u, 0x0100);
+    // Initialize VM.
+    Uxn u = {0};
+    init_uxn(&u);
+    evaluxn(&u, 0x0100);
 
     // Main loop.
     int frame_counter = 0;
     while(true) {
         bios_vblank_wait();
         poll_keys();
-        // profile_start();
-        // evaluxn(&u, mempeek16(devscreen->dat, 0));
-        // int eval_cycles = profile_stop();
-        // profile_start();
-        // // if(reqdraw) {
-        // //     redraw(ppu.output, &u);
-        // // }
-        // int redraw_cycles = profile_stop();
-        // txt_position(0, 0);
-        // txt_printf("EVAL: %d\n", eval_cycles);
-        // txt_printf("REDRAW: %d\n", redraw_cycles);
-        // frame_counter++;
+        evaluxn(&u, mempeek16(devscreen->dat, 0));
     };
 
     return 0;