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

(screen) Created static fill function

This commit is contained in:
Devine Lu Linvega 2023-04-11 11:11:12 -07:00
parent 24dbc7d5f8
commit 07e8306616
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/devices/screen.c
View File

@ -38,12 +38,19 @@ screen_write(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 color)
} }
static void static void
screen_wipe(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y) screen_fill(UxnScreen *p, Layer *layer, Uint16 x1, Uint16 y1, Uint16 x2, Uint16 y2, Uint8 color)
{ {
int v, h; int v, h;
for(v = 0; v < 8; v++) for(v = y1; v < y2; v++)
for(h = 0; h < 8; h++) for(h = x1; h < x2; h++)
screen_write(p, layer, x + h, y + v, 0); screen_write(p, layer, h, v, color);
layer->changed = 1;
}
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
@ -93,20 +100,11 @@ screen_resize(UxnScreen *p, Uint16 width, Uint16 height)
if(bg && fg && pixels) { if(bg && fg && pixels) {
p->width = width; p->width = width;
p->height = height; p->height = height;
screen_fill(p, &p->bg, 0); screen_fill(p, &p->bg, 0, 0, p->width, p->height, 0);
screen_fill(p, &p->fg, 0); screen_fill(p, &p->fg, 0, 0, p->width, p->height, 0);
} }
} }
void
screen_fill(UxnScreen *p, Layer *layer, Uint8 color)
{
Uint32 i, size = p->width * p->height;
for(i = 0; i < size; i++)
layer->pixels[i] = color;
layer->changed = 1;
}
void void
screen_redraw(UxnScreen *p) screen_redraw(UxnScreen *p)
{ {
@ -164,10 +162,14 @@ screen_deo(Uint8 *ram, Uint8 *d, Uint8 port)
break; break;
case 0xe: { case 0xe: {
Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa); Uint16 x = PEEK2(d + 0x8), y = PEEK2(d + 0xa);
Uint8 layer = d[0xe] & 0x40; Layer *layer = (d[0xf] & 0x40) ? &uxn_screen.fg : &uxn_screen.bg;
screen_write(&uxn_screen, layer ? &uxn_screen.fg : &uxn_screen.bg, x, y, d[0xe] & 0x3); if(d[0xe] & 0x80) {
screen_fill(&uxn_screen, layer, x, y, uxn_screen.width, uxn_screen.height, d[0xe] & 0x3);
} else {
screen_write(&uxn_screen, layer, x, y, d[0xe] & 0x3);
if(d[0x6] & 0x01) POKE2(d + 0x8, x + 1); /* auto x+1 */ if(d[0x6] & 0x01) POKE2(d + 0x8, x + 1); /* auto x+1 */
if(d[0x6] & 0x02) POKE2(d + 0xa, y + 1); /* auto y+1 */ if(d[0x6] & 0x02) POKE2(d + 0xa, y + 1); /* auto y+1 */
}
break; break;
} }
case 0xf: { case 0xf: {

1
src/devices/screen.h
View File

@ -27,7 +27,6 @@ extern UxnScreen uxn_screen;
void screen_palette(UxnScreen *p, Uint8 *addr); void screen_palette(UxnScreen *p, Uint8 *addr);
void screen_resize(UxnScreen *p, Uint16 width, Uint16 height); void screen_resize(UxnScreen *p, Uint16 width, Uint16 height);
void screen_fill(UxnScreen *p, Layer *layer, Uint8 color);
void screen_redraw(UxnScreen *p); void screen_redraw(UxnScreen *p);
void screen_mono(UxnScreen *p); void screen_mono(UxnScreen *p);