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

(screen) Removed clamp function

This commit is contained in:
Devine Lu Linvega 2023-04-12 19:20:11 -07:00
parent 540847694e
commit 8aae16a9d0
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/devices/screen.c
View File

@ -22,16 +22,9 @@ 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)
{ {
if(x < p->width && y < p->height) { if(x < p->width && y < p->height) {
Uint32 i = x + y * p->width; Uint32 i = x + y * p->width;
if(color != layer->pixels[i]) { if(color != layer->pixels[i]) {
@ -86,11 +79,13 @@ 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),
fg = realloc(p->fg.pixels, width * height);
pixels = realloc(p->pixels, width * height * sizeof(Uint32));
if(bg) p->bg.pixels = bg; if(bg) p->bg.pixels = bg;
if(fg) p->fg.pixels = fg; if(fg) p->fg.pixels = fg;
if(pixels) p->pixels = pixels; if(pixels) p->pixels = pixels;
@ -130,10 +125,10 @@ 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);