From 071b70df067ffa192e64511f2a88f1d4efad241b Mon Sep 17 00:00:00 2001 From: rodri Date: Tue, 16 Jul 2024 11:35:58 +0000 Subject: implement pixel art upscaling filters scale[23]x. tidy up some code. --- fb.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- internal.h | 8 +++++- render.c | 6 ++--- util.c | 17 ++++++++++--- 4 files changed, 100 insertions(+), 13 deletions(-) diff --git a/fb.c b/fb.c index a23e305..0077452 100644 --- a/fb.c +++ b/fb.c @@ -8,6 +8,74 @@ #include "graphics.h" #include "internal.h" +/* + * scale[234]x filters + * + * see https://www.scale2x.it/algorithm + */ +static void +scale2x_filter(ulong *dst, Framebuf *fb, Point *sp) +{ + ulong B, D, E, F, H; + + E = getpixel(fb, *sp); + B = sp->y == fb->r.min.y? E: getpixel(fb, addpt(*sp, Pt( 0,-1))); + D = sp->x == fb->r.min.x? E: getpixel(fb, addpt(*sp, Pt(-1, 0))); + F = sp->x == fb->r.max.x? E: getpixel(fb, addpt(*sp, Pt( 1, 0))); + H = sp->y == fb->r.max.y? E: getpixel(fb, addpt(*sp, Pt( 0, 1))); + + if(B != H && D != F){ + dst[0] = D == B? D: E; + dst[1] = B == F? F: E; + dst[2] = D == H? D: E; + dst[3] = H == F? F: E; + }else + memsetl(dst, E, 4); +} + +static void +scale3x_filter(ulong *dst, Framebuf *fb, Point *sp) +{ + ulong A, B, C, D, E, F, G, H, I; + + E = getpixel(fb, *sp); + B = sp->y == fb->r.min.y? E: getpixel(fb, addpt(*sp, Pt( 0,-1))); + D = sp->x == fb->r.min.x? E: getpixel(fb, addpt(*sp, Pt(-1, 0))); + F = sp->x == fb->r.max.x? E: getpixel(fb, addpt(*sp, Pt( 1, 0))); + H = sp->y == fb->r.max.y? E: getpixel(fb, addpt(*sp, Pt( 0, 1))); + A = sp->y == fb->r.min.y && sp->x == fb->r.min.x? E: + sp->y == fb->r.min.y? D: sp->x == fb->r.min.x? B: + getpixel(fb, addpt(*sp, Pt(-1,-1))); + C = sp->y == fb->r.min.y && sp->x == fb->r.max.x? E: + sp->y == fb->r.min.y? F: sp->x == fb->r.max.x? B: + getpixel(fb, addpt(*sp, Pt( 1,-1))); + G = sp->y == fb->r.max.y && sp->x == fb->r.min.x? E: + sp->y == fb->r.max.y? D: sp->x == fb->r.min.x? H: + getpixel(fb, addpt(*sp, Pt(-1, 1))); + I = sp->y == fb->r.max.y && sp->x == fb->r.max.x? E: + sp->y == fb->r.max.y? F: sp->x == fb->r.max.x? H: + getpixel(fb, addpt(*sp, Pt( 1, 1))); + + if(B != H && D != F){ + dst[0] = D == B? D: E; + dst[1] = (D == B && E != C) || (B == F && E != A)? B: E; + dst[2] = B == F? F: E; + dst[3] = (D == B && E != G) || (D == H && E != A)? D: E; + dst[4] = E; + dst[5] = (B == F && E != I) || (H == F && E != C)? F: E; + dst[6] = D == H? D: E; + dst[7] = (D == H && E != I) || (H == F && E != G)? H: E; + dst[8] = H == F? F: E; + }else + memsetl(dst, E, 9); +} + +//static void +//scale4x_filter(ulong *dst, Framebuf *fb, Point *sp) +//{ +// +//} + static void framebufctl_draw(Framebufctl *ctl, Image *dst) { @@ -35,8 +103,11 @@ framebufctl_upscaledraw(Framebufctl *ctl, Image *dst, Point scale) fb = ctl->getfb(ctl); for(sp.y = fb->r.min.y, dp.y = dst->r.min.y; sp.y < fb->r.max.y; sp.y++, dp.y += scale.y) for(sp.x = fb->r.min.x, dp.x = dst->r.min.x; sp.x < fb->r.max.x; sp.x++, dp.x += scale.x){ - for(i = 0; i < scale.x*scale.y; i++) - blk[i] = fb->cb[Dx(fb->r)*sp.y + sp.x]; + /*if(scale.x == 2 && scale.y == 2) + scale2x_filter(blk, fb, &sp); + else if(scale.x == 3 && scale.y == 3) + scale3x_filter(blk, fb, &sp); + else */memsetl(blk, getpixel(fb, sp), scale.x*scale.y); loadimage(dst, rectaddpt(blkr, dp), (uchar*)blk, scale.x*scale.y*4); } qunlock(ctl); @@ -70,8 +141,11 @@ framebufctl_upscalememdraw(Framebufctl *ctl, Memimage *dst, Point scale) fb = ctl->getfb(ctl); for(sp.y = fb->r.min.y, dp.y = dst->r.min.y; sp.y < fb->r.max.y; sp.y++, dp.y += scale.y) for(sp.x = fb->r.min.x, dp.x = dst->r.min.x; sp.x < fb->r.max.x; sp.x++, dp.x += scale.x){ - for(i = 0; i < scale.x*scale.y; i++) - blk[i] = fb->cb[Dx(fb->r)*sp.y + sp.x]; + /*if(scale.x == 2 && scale.y == 2) + scale2x_filter(blk, fb, &sp); + else if(scale.x == 3 && scale.y == 3) + scale3x_filter(blk, fb, &sp); + else */memsetl(blk, getpixel(fb, sp), scale.x*scale.y); loadmemimage(dst, rectaddpt(blkr, dp), (uchar*)blk, scale.x*scale.y*4); } qunlock(ctl); diff --git a/internal.h b/internal.h index 361b013..f34776a 100644 --- a/internal.h +++ b/internal.h @@ -59,7 +59,13 @@ int min(int, int); int max(int, int); void swapi(int*, int*); void swappt(Point*, Point*); -void memsetd(double*, double, usize); +void memsetd(void*, double, usize); +void memsetl(void*, ulong, usize); /* nanosec */ uvlong nanosec(void); + +/* ulong getpixel(Framebuf *fb, Point p) */ +#define getpixel(fb, p) (((fb)->cb)[Dx((fb)->r)*(p).y + (p).x]) +/* void putpixel(Framebuf *fb, Point p, ulong c) */ +#define putpixel(fb, p, c) (((fb)->cb)[Dx((fb)->r)*(p).y + (p).x] = (c)) diff --git a/render.c b/render.c index 6937c92..98dd0e9 100644 --- a/render.c +++ b/render.c @@ -38,12 +38,10 @@ static void pixel(Framebuf *fb, Point p, Color c) { Color dc; - ulong *dst; - dst = fb->cb; - dc = srgb2linear(ul2col(dst[Dx(fb->r)*p.y + p.x])); + dc = srgb2linear(ul2col(getpixel(fb, p))); c = lerp3(dc, c, c.a); /* SoverD */ - dst[Dx(fb->r)*p.y + p.x] = col2ul(linear2srgb(c)); + putpixel(fb, p, col2ul(linear2srgb(c))); } static void diff --git a/util.c b/util.c index 0b9003e..2bf77c2 100644 --- a/util.c +++ b/util.c @@ -65,12 +65,21 @@ modulapt3(Point3 a, Point3 b) } void -memsetd(double *p, double v, usize len) +memsetd(void *dp, double v, usize len) { - double *dp; + double *p, *ep; - for(dp = p; dp < p+len; dp++) - *dp = v; + for(p = dp, ep = p+len; p < ep; p++) + *p = v; +} + +void +memsetl(void *dp, ulong v, usize len) +{ + ulong *p, *ep; + + for(p = dp, ep = p+len; p < ep; p++) + *p = v; } Memimage * -- cgit v1.2.3