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

Faster 1bpp drawing

This commit is contained in:
neauoire 2023-11-12 11:58:08 -08:00
parent 0123b4030e
commit 9e5dbc043d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/devices/screen.c
View File

@ -73,16 +73,16 @@ screen_2bpp(Uint8 *layer, Uint8 *ram, Uint16 addr, Uint16 x1, Uint16 y1, Uint16
} }
static void static void
screen_1bpp(Uint8 *layer, Uint8 *ram, Uint16 addr, Uint16 x1, Uint16 y1, Uint16 color, int flipx, int flipy) screen_1bpp(Uint8 *layer, Uint8 *ram, Uint16 addr, Uint16 x1, Uint16 y1, Uint16 color, int fx, int fy)
{ {
int v, h, width = uxn_screen.width, height = uxn_screen.height, opaque = (color % 5); int width = uxn_screen.width, height = uxn_screen.height, opaque = (color % 5);
Uint8 *ch1 = &ram[addr]; Uint8 *ch1 = &ram[addr];
for(v = 0; v < 8; v++) { Uint16 y, ymod = (fy < 0 ? 8 : 0), ymax = y1 + ymod + fy * 8;
Uint16 x, xmod = (fx > 0 ? 8 : 0), xmax = x1 + xmod - fx * 8;
for(y = y1 + ymod; y != ymax; y += fy) {
Uint16 c = *ch1++; Uint16 c = *ch1++;
Uint16 y = (y1 + (flipy ? 7 - v : v)); for(x = x1 + xmod; x != xmax; x -= fx, c >>= 1) {
for(h = 7; h >= 0; --h, c >>= 1) { Uint8 ch = c & 1;
Uint8 ch = (c & 1) | ((c >> 7) & 2);
Uint16 x = (x1 + (flipx ? 7 - h : h));
if((opaque || ch) && x < width && y < height) if((opaque || ch) && x < width && y < height)
layer[x + y * width] = blending[ch][color]; layer[x + y * width] = blending[ch][color];
} }
@ -109,8 +109,8 @@ static Uint8 arrow[] = {
static void static void
draw_byte(Uint8 b, Uint16 x, Uint16 y, Uint8 color) draw_byte(Uint8 b, Uint16 x, Uint16 y, Uint8 color)
{ {
screen_1bpp(uxn_screen.fg, icons, (b >> 4) << 3, x, y, color, 0, 0); screen_1bpp(uxn_screen.fg, icons, (b >> 4) << 3, x, y, color, 1, 1);
screen_1bpp(uxn_screen.fg, icons, (b & 0xf) << 3, x + 8, y, color, 0, 0); screen_1bpp(uxn_screen.fg, icons, (b & 0xf) << 3, x + 8, y, color, 1, 1);
screen_change(x, y, x + 0x10, y + 0x8); screen_change(x, y, x + 0x10, y + 0x8);
} }
@ -132,7 +132,7 @@ screen_debugger(Uxn *u)
0x2; 0x2;
draw_byte(u->rst.dat[pos], i * 0x18 + 0x8, uxn_screen.height - 0x10, color); draw_byte(u->rst.dat[pos], i * 0x18 + 0x8, uxn_screen.height - 0x10, color);
} }
screen_1bpp(uxn_screen.fg, arrow, 0, 0x68, uxn_screen.height - 0x20, 3, 0, 0); screen_1bpp(uxn_screen.fg, arrow, 0, 0x68, uxn_screen.height - 0x20, 3, 1, 1);
for(i = 0; i < 0x20; i++) for(i = 0; i < 0x20; i++)
draw_byte(u->ram[i], (i & 0x7) * 0x18 + 0x8, ((i >> 3) << 3) + 0x8, 1 + !!u->ram[i]); draw_byte(u->ram[i], (i & 0x7) * 0x18 + 0x8, ((i >> 3) << 3) + 0x8, 1 + !!u->ram[i]);
} }
@ -275,7 +275,7 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
} }
} else { } else {
for(i = 0; i <= length; i++) { for(i = 0; i <= length; i++) {
screen_1bpp(layer, ram, addr, x + dyx * i, y + dxy * i, color, flipx, flipy); screen_1bpp(layer, ram, addr, x + dyx * i, y + dxy * i, color, fx, fy);
addr += addr_incr; addr += addr_incr;
} }
} }