d6
/
uxn11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified screen device

This commit is contained in:
Devine Lu Linvega 2023-04-12 20:31:30 -07:00
parent a92e5416f9
commit 1968801862
1 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/devices/screen.c
View File

@ -22,12 +22,6 @@ static Uint8 blending[4][16] = {
{1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1}, {1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1},
{2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2}}; {2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2}};
static int
clamp(int val, int min, int max)
{
return (val >= min) ? (val <= max) ? val : max : min;
}
static void static void
screen_write(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 color) screen_write(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 color)
{ {
@ -49,12 +43,6 @@ screen_fill(UxnScreen *p, Layer *layer, Uint16 x1, Uint16 y1, Uint16 x2, Uint16
screen_write(p, layer, h, v, color); screen_write(p, layer, h, v, color);
} }
static void
screen_wipe(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y)
{
screen_fill(p, layer, x, y, x + 8, y + 8, 0);
}
static void static void
screen_blit(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy, Uint8 twobpp) screen_blit(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy, Uint8 twobpp)
{ {
@ -79,9 +67,9 @@ screen_palette(UxnScreen *p, Uint8 *addr)
int i, shift; int i, shift;
for(i = 0, shift = 4; i < 4; ++i, shift ^= 4) { for(i = 0, shift = 4; i < 4; ++i, shift ^= 4) {
Uint8 Uint8
r = (addr[0 + i / 2] >> shift) & 0x0f, r = (addr[0 + i / 2] >> shift) & 0xf,
g = (addr[2 + i / 2] >> shift) & 0x0f, g = (addr[2 + i / 2] >> shift) & 0xf,
b = (addr[4 + i / 2] >> shift) & 0x0f; b = (addr[4 + i / 2] >> shift) & 0xf;
p->palette[i] = 0x0f000000 | r << 16 | g << 8 | b; p->palette[i] = 0x0f000000 | r << 16 | g << 8 | b;
p->palette[i] |= p->palette[i] << 4; p->palette[i] |= p->palette[i] << 4;
} }
@ -91,20 +79,22 @@ screen_palette(UxnScreen *p, Uint8 *addr)
void void
screen_resize(UxnScreen *p, Uint16 width, Uint16 height) screen_resize(UxnScreen *p, Uint16 width, Uint16 height)
{ {
Uint8 Uint8 *bg, *fg;
*bg = realloc(p->bg.pixels, width * height), Uint32 *pixels;
*fg = realloc(p->fg.pixels, width * height); if(width < 0x20 || height < 0x20 || width >= 0x400 || height >= 0x400)
Uint32 return;
*pixels = realloc(p->pixels, width * height * sizeof(Uint32)); bg = realloc(p->bg.pixels, width * height),
if(bg) p->bg.pixels = bg; fg = realloc(p->fg.pixels, width * height);
if(fg) p->fg.pixels = fg; pixels = realloc(p->pixels, width * height * sizeof(Uint32));
if(pixels) p->pixels = pixels; if(!bg || !fg || !pixels)
if(bg && fg && pixels) { return;
p->width = width; p->bg.pixels = bg;
p->height = height; p->fg.pixels = fg;
screen_fill(p, &p->bg, 0, 0, p->width, p->height, 0); p->pixels = pixels;
screen_fill(p, &p->fg, 0, 0, p->width, p->height, 0); p->width = width;
} p->height = height;
screen_fill(p, &p->bg, 0, 0, p->width, p->height, 0);
screen_fill(p, &p->fg, 0, 0, p->width, p->height, 0);
} }
void void
@ -135,17 +125,18 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
{ {
switch(port) { switch(port) {
case 0x3: case 0x3:
screen_resize(&uxn_screen, clamp(PEEK2(d + 2), 1, 1024), uxn_screen.height); screen_resize(&uxn_screen, PEEK2(d + 2), uxn_screen.height);
break; break;
case 0x5: case 0x5:
screen_resize(&uxn_screen, uxn_screen.width, clamp(PEEK2(d + 4), 1, 1024)); screen_resize(&uxn_screen, uxn_screen.width, PEEK2(d + 4));
break; break;
case 0xe: { case 0xe: {
Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa); Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa);
Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg; Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
if(d[0xe] & 0x80) if(d[0xe] & 0x80) {
screen_fill(&uxn_screen, layer, (d[0xe] & 0x10) ? 0 : x, (d[0xe] & 0x20) ? 0 : y, (d[0xe] & 0x10) ? x : uxn_screen.width, (d[0xe] & 0x20) ? y : uxn_screen.height, d[0xe] & 0x3); Uint8 xflip = d[0xe] & 0x10, yflip = d[0xe] & 0x20;
else { screen_fill(&uxn_screen, layer, xflip ? 0 : x, yflip ? 0 : y, xflip ? x : uxn_screen.width, yflip ? y : uxn_screen.height, d[0xe] & 0x3);
} else {
screen_write(&uxn_screen, layer, x, y, d[0xe] & 0x3); screen_write(&uxn_screen, layer, x, y, d[0xe] & 0x3);
if(d[0x6] & 0x1) POKE2(d + 0x8, x + 1); /* auto x+1 */ if(d[0x6] & 0x1) POKE2(d + 0x8, x + 1); /* auto x+1 */
if(d[0x6] & 0x2) POKE2(d + 0xa, y + 1); /* auto y+1 */ if(d[0x6] & 0x2) POKE2(d + 0xa, y + 1); /* auto y+1 */
@ -154,24 +145,24 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
} }
case 0xf: { case 0xf: {
Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa), dx, dy, addr = PEEK2(d + 0xc); Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa), dx, dy, addr = PEEK2(d + 0xc);
Uint8 i, n, twobpp = !!(d[0xf] & 0x80); Uint8 i, n = d[0x6] >> 4, twobpp = !!(d[0xf] & 0x80);
Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg; Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
n = d[0x6] >> 4;
dx = (d[0x6] & 0x01) << 3; dx = (d[0x6] & 0x01) << 3;
dy = (d[0x6] & 0x02) << 2; dy = (d[0x6] & 0x02) << 2;
if(addr > 0x10000 - ((n + 1) << (3 + twobpp))) if(addr > 0x10000 - ((n + 1) << (3 + twobpp)))
return; return;
for(i = 0; i <= n; i++) { for(i = 0; i <= n; i++) {
if(!(d[0xf] & 0xf)) if(!(d[0xf] & 0xf)) {
screen_wipe(&uxn_screen, layer, x + dy * i, y + dx * i); Uint16 ex = x + dy * i, ey = y + dx * i;
else { screen_fill(&uxn_screen, layer, ex, ey, ex + 8, ey + 8, 0);
} else {
screen_blit(&uxn_screen, layer, x + dy * i, y + dx * i, &ram[addr], d[0xf] & 0xf, d[0xf] & 0x10, d[0xf] & 0x20, twobpp); screen_blit(&uxn_screen, layer, x + dy * i, y + dx * i, &ram[addr], d[0xf] & 0xf, d[0xf] & 0x10, d[0xf] & 0x20, twobpp);
addr += (d[0x6] & 0x04) << (1 + twobpp); addr += (d[0x6] & 0x04) << (1 + twobpp);
} }
} }
if(d[0x6] & 0x1) POKE2(d + 0x8, x + dx); /* auto x+8 */ POKE2(d + 0x8, x + dx); /* auto x+8 */
if(d[0x6] & 0x2) POKE2(d + 0xa, y + dy); /* auto y+8 */ POKE2(d + 0xa, y + dy); /* auto y+8 */
if(d[0x6] & 0x4) POKE2(d + 0xc, addr); /* auto addr+length */ POKE2(d + 0xc, addr); /* auto addr+length */
break; break;
} }
} }