Update screen rendering to use 2 backgrounds

3 files changed, 118 insertions, 206 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;
diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index 06d84bf..5894352 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -3,6 +3,8 @@
 /*
 Copyright (c) 2021 Devine Lu Linvega
 Copyright (c) 2021 Andrew Alderwick
+Copyright (c) 2021 Adrian "asie" Siekierka
+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
@@ -13,149 +15,115 @@ WITH REGARD TO THIS SOFTWARE.
 */
 
 static Uint8 font[][8] = {
-        {0x00, 0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c},
-        {0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
-        {0x00, 0x7c, 0x82, 0x02, 0x7c, 0x80, 0x80, 0xfe},
-        {0x00, 0x7c, 0x82, 0x02, 0x1c, 0x02, 0x82, 0x7c},
-        {0x00, 0x0c, 0x14, 0x24, 0x44, 0x84, 0xfe, 0x04},
-        {0x00, 0xfe, 0x80, 0x80, 0x7c, 0x02, 0x82, 0x7c},
-        {0x00, 0x7c, 0x82, 0x80, 0xfc, 0x82, 0x82, 0x7c},
-        {0x00, 0x7c, 0x82, 0x02, 0x1e, 0x02, 0x02, 0x02},
-        {0x00, 0x7c, 0x82, 0x82, 0x7c, 0x82, 0x82, 0x7c},
-        {0x00, 0x7c, 0x82, 0x82, 0x7e, 0x02, 0x82, 0x7c},
-        {0x00, 0x7c, 0x82, 0x02, 0x7e, 0x82, 0x82, 0x7e},
-        {0x00, 0xfc, 0x82, 0x82, 0xfc, 0x82, 0x82, 0xfc},
-        {0x00, 0x7c, 0x82, 0x80, 0x80, 0x80, 0x82, 0x7c},
-        {0x00, 0xfc, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfc},
-        {0x00, 0x7c, 0x82, 0x80, 0xf0, 0x80, 0x82, 0x7c},
-        {0x00, 0x7c, 0x82, 0x80, 0xf0, 0x80, 0x80, 0x80}};
-
-Uint8
-readpixel(Uint8 *sprite, Uint8 h, Uint8 v)
-{
-        Uint8 ch1 = ((sprite[v] >> h) & 0x1);
-        Uint8 ch2 = (((sprite[v + 8] >> h) & 0x1) << 1);
-        return ch1 + ch2;
-}
+    {0x00, 0x7c, 0x82, 0x82, 0x82, 0x82, 0x82, 0x7c},
+    {0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},
+    {0x00, 0x7c, 0x82, 0x02, 0x7c, 0x80, 0x80, 0xfe},
+    {0x00, 0x7c, 0x82, 0x02, 0x1c, 0x02, 0x82, 0x7c},
+    {0x00, 0x0c, 0x14, 0x24, 0x44, 0x84, 0xfe, 0x04},
+    {0x00, 0xfe, 0x80, 0x80, 0x7c, 0x02, 0x82, 0x7c},
+    {0x00, 0x7c, 0x82, 0x80, 0xfc, 0x82, 0x82, 0x7c},
+    {0x00, 0x7c, 0x82, 0x02, 0x1e, 0x02, 0x02, 0x02},
+    {0x00, 0x7c, 0x82, 0x82, 0x7c, 0x82, 0x82, 0x7c},
+    {0x00, 0x7c, 0x82, 0x82, 0x7e, 0x02, 0x82, 0x7c},
+    {0x00, 0x7c, 0x82, 0x02, 0x7e, 0x82, 0x82, 0x7e},
+    {0x00, 0xfc, 0x82, 0x82, 0xfc, 0x82, 0x82, 0xfc},
+    {0x00, 0x7c, 0x82, 0x80, 0x80, 0x80, 0x82, 0x7c},
+    {0x00, 0xfc, 0x82, 0x82, 0x82, 0x82, 0x82, 0xfc},
+    {0x00, 0x7c, 0x82, 0x80, 0xf0, 0x80, 0x82, 0x7c},
+    {0x00, 0x7c, 0x82, 0x80, 0xf0, 0x80, 0x80, 0x80}};
 
 void
-clear(Ppu *p)
-{
-        int i, sz = p->height * p->width, rows = sz / 4;
-        for(i = 0; i < sz; ++i)
-                p->output[i] = p->colors[0];
-        for(i = 0; i < rows; i++) {
-                p->fg[i] = 0;
-                p->bg[i] = 0;
-        }
+putcolors(Ppu *p, Uint8 *addr) {
+    int i;
+    for(i = 0; i < 4; ++i) {
+        Uint8
+            r = (*(addr + i / 2) >> (!(i % 2) << 2)) & 0x0f,
+            g = (*(addr + 2 + i / 2) >> (!(i % 2) << 2)) & 0x0f,
+            b = (*(addr + 4 + i / 2) >> (!(i % 2) << 2)) & 0x0f;
+        PAL_BUFFER_BG[i] = rgb15(
+                (r << 1) | (r >> 3),
+                (g << 1) | (g >> 3),
+                (b << 1) | (b >> 3));
+    }
 }
 
 void
-putcolors(Ppu *p, Uint8 *addr)
-{
-        int i;
-        for(i = 0; i < 4; ++i) {
-                Uint8
-                        r = (*(addr + i / 2) >> (!(i % 2) << 2)) & 0x0f,
-                        g = (*(addr + 2 + i / 2) >> (!(i % 2) << 2)) & 0x0f,
-                        b = (*(addr + 4 + i / 2) >> (!(i % 2) << 2)) & 0x0f;
-                p->colors[i] = rgb15(r,g,b);
-        }
-        // p->colors[0] = COLOR_BLUE;
-        // p->colors[1] = COLOR_WHITE;
-        // p->colors[2] = COLOR_RED;
-        // p->colors[3] = COLOR_CYAN;
-}
+putpixel(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 color) {
+    if(x >= 30 * 8 || y >= 20 * 8)
+        return;
 
-void
-putpixel(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 color)
-{
-        Uint16 row = (y % 8) + ((x / 8 + y / 8 * p->hor) * 16), col = 7 - (x % 8);
-        if(x >= p->hor * 8 || y >= p->ver * 8 || row > (p->hor * p->ver * 16) - 8)
-                return;
-        if(color == 0 || color == 2)
-                layer[row] &= ~(1UL << col);
-        else
-                layer[row] |= 1UL << col;
-        if(color == 0 || color == 1)
-                layer[row + 8] &= ~(1UL << col);
-        else
-                layer[row + 8] |= 1UL << col;
+    Uint32 pos = ((y & 7) + (((x >> 3) + (y >> 3) * 30) * 8));
+    Uint32 shift = (x & 7) << 2;
+    layer[pos] = (layer[pos] & (~(0xF << shift))) | (color << shift);
 }
 
 void
-puticn(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy)
-{
-        Uint16 v, h;
-        for(v = 0; v < 8; v++)
-                for(h = 0; h < 8; h++) {
-                        Uint8 ch1 = ((sprite[v] >> (7 - h)) & 0x1);
-                        if(ch1 == 1 || (color != 0x05 && color != 0x0a && color != 0x0f))
-                                putpixel(p,
-                                        layer,
-                                        x + (flipx ? 7 - h : h),
-                                        y + (flipy ? 7 - v : v),
-                                        ch1 ? color % 4 : color / 4);
-                }
+puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy) {
+    Uint16 v, h;
+    for(v = 0; v < 8; v++)
+        for(h = 0; h < 8; h++) {
+            Uint8 ch1 = ((sprite[v] >> (7 - h)) & 0x1);
+            if(ch1 == 1 || (color != 0x05 && color != 0x0a && color != 0x0f))
+                putpixel(p,
+                    layer,
+                    x + (flipx ? 7 - h : h),
+                    y + (flipy ? 7 - v : v),
+                    ch1 ? color % 4 : color / 4);
+        }
 }
 
 void
-putchr(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy)
-{
-        Uint16 v, h;
-        for(v = 0; v < 8; v++)
-                for(h = 0; h < 8; h++) {
-                        Uint8 ch1 = ((sprite[v] >> (7 - h)) & 0x1) * color;
-                        Uint8 ch2 = ((sprite[v + 8] >> (7 - h)) & 0x1) * color;
-                        putpixel(p,
-                                layer,
-                                x + (flipx ? 7 - h : h),
-                                y + (flipy ? 7 - v : v),
-                                (((ch1 + ch2 * 2) + color / 4) & 0x3));
-                }
+putchr(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy) {
+    Uint16 v, h;
+    for(v = 0; v < 8; v++)
+        for(h = 0; h < 8; h++) {
+            Uint8 ch1 = ((sprite[v] >> (7 - h)) & 0x1) * color;
+            Uint8 ch2 = ((sprite[v + 8] >> (7 - h)) & 0x1) * color;
+            putpixel(p,
+                layer,
+                x + (flipx ? 7 - h : h),
+                y + (flipy ? 7 - v : v),
+                (((ch1 + ch2 * 2) + color / 4) & 0x3));
+        }
 }
 
-/* output */
+int
+initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad) {
+    p->hor = hor;
+    p->ver = ver;
+    p->pad = pad;
+    p->width = (8 * p->hor + p->pad * 2);
+    p->height = (8 * p->ver + p->pad * 2);
 
-void
-drawpixel(Ppu *p, Uint16 x, Uint16 y, Uint8 color)
-{
-        if(x >= p->pad && x <= p->width - p->pad - 1 && y >= p->pad && y <= p->height - p->pad - 1)
-                FRAMEBUFFER[y][x] = p->colors[color];
-}
+    // Initialize display mode and bg palette.
+    DISP_CTRL = DISP_MODE_0 | DISP_BG_0 | DISP_BG_1;
 
-void
-drawppu(Ppu *p)
-{
-        Uint16 x, y;
-        for(y = 0; y < p->ver; ++y)
-                for(x = 0; x < p->hor; ++x) {
-                        Uint8 v, h;
-                        Uint16 key = (y * p->hor + x) * 16;
-                        for(v = 0; v < 8; v++)
-                                for(h = 0; h < 8; h++) {
-                                        Uint8 color = readpixel(&p->fg[key], h, v);
-                                        if(color == 0)
-                                                color = readpixel(&p->bg[key], h, v);
-                                        drawpixel(p, x * 8 + p->pad + 7 - h, y * 8 + p->pad + v, color);
-                                }
-                }
-}
+    // Initialize backgrounds.
+    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);
 
-int
-initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad)
-{
-        p->hor = hor;
-        p->ver = ver;
-        p->pad = pad;
-        p->width = (8 * p->hor + p->pad * 2);
-        p->height = (8 * p->ver + p->pad * 2);
-        if(!(p->output = malloc(p->width * p->height * sizeof(Uint16))))
-                return 0;
-        if(!(p->bg = malloc(p->width * p->height * sizeof(Uint8) / 4)))
-                return 0;
-        if(!(p->fg = malloc(p->width * p->height * sizeof(Uint8) / 4)))
-                return 0;
-        clear(p);
-        return 1;
+    // Clear tile memory.
+    p->fg = &TILE_MEM[cb_fg];
+    p->bg = &TILE_MEM[cb_bg];
+    for (size_t i = 0; i < 30 * 20 * 8; ++i) {
+        p->fg[i] = 0;
+        p->bg[i] = 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;
+        }
+    }
+
+    return 1;
 }
diff --git a/src/uxn/devices/ppu.h b/src/uxn/devices/ppu.h
index 187d364..213dc75 100644
--- a/src/uxn/devices/ppu.h
+++ b/src/uxn/devices/ppu.h
@@ -7,6 +7,7 @@
 /*
 Copyright (c) 2021 Devine Lu Linvega
 Copyright (c) 2021 Andrew Alderwick
+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
@@ -21,16 +22,15 @@ typedef unsigned short Uint16;
 typedef unsigned int Uint32;
 
 typedef struct Ppu {
-        Uint8 *bg, *fg;
+        Uint32 *bg, *fg;
         Uint16 hor, ver, pad, width, height;
-        Uint16 *output, colors[4];
 } Ppu;
 
 int initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad);
 void putcolors(Ppu *p, Uint8 *addr);
-void putpixel(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 color);
-void puticn(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy);
-void putchr(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy);
+void putpixel(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 color);
+void puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy);
+void putchr(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy);
 void drawppu(Ppu *p);
 void drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr);
 #endif // UXNGBA_PPU_H