blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

ncvisual_render_pixels(): unite duplicated code

Browse Source
This commit is contained in:
nick black 2021-03-07 16:44:42 -05:00
parent 103eb7fe01
commit 5bd1db168b
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/visual.cpp
View File

@ -481,21 +481,19 @@ auto ncvisual_render_cells(notcurses* nc, ncvisual* ncv, const blitset* bset,
auto ncvisual_render_pixels(tinfo* tcache, ncvisual* ncv, const blitset* bset,
int placey, int placex, int begy, int begx,
int leny, int lenx, ncplane* n, ncscale_e scaling,
ncplane* stdn) -> ncplane* {
ncplane* n, ncscale_e scaling, ncplane* stdn)
-> ncplane* {
int disprows, dispcols;
if(scaling == NCSCALE_NONE || scaling == NCSCALE_NONE_HIRES){
dispcols = ncv->cols;
disprows = ncv->rows;
}
//fprintf(stderr, "INPUT N: %p\n", vopts ? vopts->n : nullptr);
if(n == nullptr){ // create plane
if(scaling == NCSCALE_NONE || scaling == NCSCALE_NONE_HIRES){
dispcols = ncv->cols;
disprows = ncv->rows;
}else{
if(scaling != NCSCALE_NONE && scaling != NCSCALE_NONE_HIRES){
ncplane_dim_yx(stdn, &disprows, &dispcols);
dispcols *= tcache->cellpixx;
disprows *= tcache->cellpixy;
if(scaling == NCSCALE_SCALE || scaling == NCSCALE_SCALE_HIRES){
scale_visual(ncv, &disprows, &dispcols);
}
}
//fprintf(stderr, "PLACING NEW PLANE: %d/%d @ %d/%d\n", disprows, dispcols, placey, placex);
struct ncplane_options nopts = {
@ -514,25 +512,20 @@ auto ncvisual_render_pixels(tinfo* tcache, ncvisual* ncv, const blitset* bset,
placey = 0;
placex = 0;
}else{
if(scaling == NCSCALE_NONE || scaling == NCSCALE_NONE_HIRES){
dispcols = ncv->cols;
disprows = ncv->rows;
}else{
if(scaling != NCSCALE_NONE && scaling != NCSCALE_NONE_HIRES){
ncplane_dim_yx(n, &disprows, &dispcols);
dispcols *= tcache->cellpixx;
disprows *= tcache->cellpixy;
dispcols -= (placex * tcache->cellpixx + 1);
disprows -= (placey * tcache->cellpixy + 1);
if(scaling == NCSCALE_SCALE || scaling == NCSCALE_SCALE_HIRES){
scale_visual(ncv, &disprows, &dispcols);
} // else stretch
}
}
leny = disprows;
lenx = dispcols;
if(scaling == NCSCALE_SCALE || scaling == NCSCALE_SCALE_HIRES){
scale_visual(ncv, &disprows, &dispcols);
}
//fprintf(stderr, "blit: %dx%d <- %dx%d:%d+%d of %d/%d stride %u @%dx%d %p\n", disprows, dispcols, begy, begx, leny, lenx, ncv->rows, ncv->cols, ncv->rowstride, placey, placex, ncv->data);
if(ncvisual_blit(ncv, disprows, dispcols, n, bset,
placey, placex, begy, begx, leny, lenx,
placey, placex, begy, begx, disprows, dispcols,
ncplane_notcurses(stdn)->tcache.cellpixx)){
ncplane_destroy(n);
return nullptr;
@ -589,7 +582,7 @@ auto ncvisual_render(notcurses* nc, ncvisual* ncv,
vopts && (vopts->flags & NCVISUAL_OPTION_BLEND));
}else{
n = ncvisual_render_pixels(&nc->tcache, ncv, bset, placey, placex, begy, begx,
leny, lenx, n, scaling, notcurses_stdplane(nc));
n, scaling, notcurses_stdplane(nc));
}
return n;
}