2019-11-25 03:22:18 +00:00
|
|
|
#include "main.h"
|
2020-05-04 15:05:52 +00:00
|
|
|
#include <vector>
|
2019-11-25 03:22:18 +00:00
|
|
|
|
2020-05-11 09:52:25 +00:00
|
|
|
TEST_CASE("Visual") {
|
2020-06-16 03:58:43 +00:00
|
|
|
auto nc_ = testing_notcurses();
|
2020-10-11 00:33:23 +00:00
|
|
|
REQUIRE(nullptr != nc_);
|
2019-12-27 22:20:20 +00:00
|
|
|
ncplane* ncp_ = notcurses_stdplane(nc_);
|
|
|
|
|
REQUIRE(ncp_);
|
2020-06-14 05:58:53 +00:00
|
|
|
auto n_ = notcurses_stdplane(nc_);
|
|
|
|
|
REQUIRE(n_);
|
2019-11-25 03:22:18 +00:00
|
|
|
|
2020-10-10 23:37:01 +00:00
|
|
|
#ifndef NOTCURSES_USE_MULTIMEDIA
|
2020-05-13 00:10:53 +00:00
|
|
|
SUBCASE("VisualDisabled"){
|
|
|
|
|
REQUIRE(!notcurses_canopen_images(nc_));
|
|
|
|
|
REQUIRE(!notcurses_canopen_videos(nc_));
|
2019-12-27 22:20:20 +00:00
|
|
|
}
|
2019-12-27 10:13:29 +00:00
|
|
|
#else
|
2020-05-13 00:10:53 +00:00
|
|
|
SUBCASE("ImagesEnabled"){
|
|
|
|
|
REQUIRE(notcurses_canopen_images(nc_));
|
2019-12-27 22:20:20 +00:00
|
|
|
}
|
2019-12-27 10:13:29 +00:00
|
|
|
|
2020-01-15 17:06:35 +00:00
|
|
|
SUBCASE("LoadImageCreatePlane") {
|
|
|
|
|
int dimy, dimx;
|
|
|
|
|
ncplane_dim_yx(ncp_, &dimy, &dimx);
|
2020-08-24 05:23:35 +00:00
|
|
|
auto ncv = ncvisual_from_file(find_data("changes.jpg"));
|
2020-01-15 17:06:35 +00:00
|
|
|
REQUIRE(ncv);
|
2020-04-24 06:23:06 +00:00
|
|
|
/*CHECK(dimy * 2 == frame->height);
|
|
|
|
|
CHECK(dimx == frame->width); FIXME */
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncvisual_options opts{};
|
|
|
|
|
opts.scaling = NCSCALE_STRETCH;
|
|
|
|
|
auto newn = ncvisual_render(nc_, ncv, &opts);
|
|
|
|
|
CHECK(newn);
|
2020-01-15 17:06:35 +00:00
|
|
|
CHECK(0 == notcurses_render(nc_));
|
2020-08-24 05:23:35 +00:00
|
|
|
CHECK(1 == ncvisual_decode(ncv));
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
ncplane_destroy(newn);
|
2020-01-15 17:06:35 +00:00
|
|
|
ncvisual_destroy(ncv);
|
|
|
|
|
}
|
|
|
|
|
|
2019-12-27 22:20:20 +00:00
|
|
|
SUBCASE("LoadImage") {
|
|
|
|
|
int dimy, dimx;
|
|
|
|
|
ncplane_dim_yx(ncp_, &dimy, &dimx);
|
2020-08-24 05:23:35 +00:00
|
|
|
auto ncv = ncvisual_from_file(find_data("changes.jpg"));
|
2019-12-27 22:20:20 +00:00
|
|
|
REQUIRE(ncv);
|
2020-04-24 06:23:06 +00:00
|
|
|
/*CHECK(dimy * 2 == frame->height);
|
|
|
|
|
CHECK(dimx == frame->width); FIXME */
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncvisual_options opts{};
|
|
|
|
|
opts.scaling = NCSCALE_STRETCH;
|
|
|
|
|
opts.n = ncp_;
|
|
|
|
|
CHECK(ncvisual_render(nc_, ncv, &opts));
|
2019-12-27 22:20:20 +00:00
|
|
|
CHECK(0 == notcurses_render(nc_));
|
2020-08-24 05:23:35 +00:00
|
|
|
CHECK(1 == ncvisual_decode(ncv));
|
2019-12-27 22:20:20 +00:00
|
|
|
ncvisual_destroy(ncv);
|
|
|
|
|
}
|
2019-12-27 10:13:29 +00:00
|
|
|
|
2020-01-15 17:22:10 +00:00
|
|
|
SUBCASE("PlaneDuplicate") {
|
2019-12-27 22:20:20 +00:00
|
|
|
int dimy, dimx;
|
|
|
|
|
ncplane_dim_yx(ncp_, &dimy, &dimx);
|
2020-08-24 05:23:35 +00:00
|
|
|
auto ncv = ncvisual_from_file(find_data("changes.jpg"));
|
2019-12-27 22:20:20 +00:00
|
|
|
REQUIRE(ncv);
|
2020-04-24 06:23:06 +00:00
|
|
|
/*CHECK(dimy * 2 == frame->height);
|
|
|
|
|
CHECK(dimx == frame->width); FIXME */
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncvisual_options opts{};
|
|
|
|
|
opts.n = ncp_;
|
|
|
|
|
opts.scaling = NCSCALE_STRETCH;
|
|
|
|
|
CHECK(ncvisual_render(nc_, ncv, &opts));
|
2020-01-15 17:22:10 +00:00
|
|
|
void* needle = malloc(1);
|
|
|
|
|
REQUIRE(nullptr != needle);
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncplane* newn = ncplane_dup(ncp_, needle);
|
2020-01-15 17:22:10 +00:00
|
|
|
int ndimx, ndimy;
|
|
|
|
|
REQUIRE(nullptr != newn);
|
|
|
|
|
ncvisual_destroy(ncv);
|
|
|
|
|
ncplane_erase(ncp_);
|
|
|
|
|
// should still have the image
|
2019-12-27 22:20:20 +00:00
|
|
|
CHECK(0 == notcurses_render(nc_));
|
2020-01-15 17:22:10 +00:00
|
|
|
ncplane_dim_yx(newn, &ndimy, &ndimx);
|
|
|
|
|
CHECK(ndimy == dimy);
|
|
|
|
|
CHECK(ndimx == dimx);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SUBCASE("LoadVideo") {
|
2020-05-13 00:10:53 +00:00
|
|
|
if(notcurses_canopen_videos(nc_)){
|
|
|
|
|
int dimy, dimx;
|
|
|
|
|
ncplane_dim_yx(ncp_, &dimy, &dimx);
|
2020-10-11 00:48:16 +00:00
|
|
|
auto ncv = ncvisual_from_file(find_data("notcursesII.mkv"));
|
2020-05-13 00:10:53 +00:00
|
|
|
REQUIRE(ncv);
|
|
|
|
|
for(;;){ // run at the highest speed we can
|
2020-08-24 05:23:35 +00:00
|
|
|
int ret = ncvisual_decode(ncv);
|
|
|
|
|
if(1 == ret){
|
2020-05-13 00:10:53 +00:00
|
|
|
break;
|
|
|
|
|
}
|
2020-08-24 05:23:35 +00:00
|
|
|
CHECK(0 == ret);
|
2020-05-13 00:10:53 +00:00
|
|
|
/*CHECK(dimy * 2 == frame->height);
|
|
|
|
|
CHECK(dimx == frame->width); FIXME */
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncvisual_options opts{};
|
|
|
|
|
opts.scaling = NCSCALE_STRETCH;
|
|
|
|
|
opts.n = ncp_;
|
|
|
|
|
CHECK(ncvisual_render(nc_, ncv, &opts));
|
2020-05-13 00:10:53 +00:00
|
|
|
CHECK(0 == notcurses_render(nc_));
|
2020-01-15 17:22:10 +00:00
|
|
|
}
|
2020-05-13 00:10:53 +00:00
|
|
|
ncvisual_destroy(ncv);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SUBCASE("LoadVideoCreatePlane") {
|
|
|
|
|
if(notcurses_canopen_videos(nc_)){
|
|
|
|
|
int dimy, dimx;
|
|
|
|
|
ncplane_dim_yx(ncp_, &dimy, &dimx);
|
2020-10-11 00:48:16 +00:00
|
|
|
auto ncv = ncvisual_from_file(find_data("notcursesII.mkv"));
|
2020-05-13 00:10:53 +00:00
|
|
|
REQUIRE(ncv);
|
2020-08-24 05:23:35 +00:00
|
|
|
CHECK(0 == ncvisual_decode(ncv));
|
2020-04-24 06:23:06 +00:00
|
|
|
/*CHECK(dimy * 2 == frame->height);
|
|
|
|
|
CHECK(dimx == frame->width); FIXME */
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncvisual_options opts{};
|
|
|
|
|
opts.scaling = NCSCALE_STRETCH;
|
|
|
|
|
auto newn = ncvisual_render(nc_, ncv, &opts);
|
|
|
|
|
CHECK(newn);
|
2020-01-15 17:22:10 +00:00
|
|
|
CHECK(0 == notcurses_render(nc_));
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
ncplane_destroy(newn);
|
2020-05-13 00:10:53 +00:00
|
|
|
ncvisual_destroy(ncv);
|
2020-01-15 17:22:10 +00:00
|
|
|
}
|
2019-12-27 22:20:20 +00:00
|
|
|
}
|
|
|
|
|
#endif
|
Per-line damage map, ~50% increase in FPS on notcurses-demo (#144)
Implement a fairly conservative, line-granularity, two-level damage map. One on the overall notcurses object is dirtied by planar moves, creations, deletions, and resizes. One on each ncplane is dirtied by glyph output, media rendering, fades, and erasure. #83 This has some definite false positives: a hidden plane which moves will damage a bunch of lines unnecessarily. For now, don't do things like that :D.
Extra byte per line per plane, shouldn't be a problem.
Two new stats for cell elisions and emissions
Allow keypress to interrupt view-demo
ncvisual_stream() now allows a callback per frame
Allow ncvisual_open() to create its own, perfectly-sized, ncplane #128
Typical performance prior to this PR:
4655 renders, 18.3s total (0.000305s min, 0.196s max, 0.0039s avg 253.9 fps)
401046.505KB total (9.688KB min, 139.697KB max, 86.15KB avg)
Emits/elides: def 1082115/116196 fg 10547624/7236460 bg 10602717/6208644
Elide rates: 9.70% 40.69% 36.93%
4680 renders, 18.4s total (0.000285s min, 0.15s max, 0.0039s avg 255.0 fps)
403078.188KB total (9.688KB min, 139.697KB max, 86.13KB avg)
Emits/elides: def 1088994/116196 fg 10604983/7267750 bg 10655426/6237472
Elide rates: 9.64% 40.66% 36.92%
4699 renders, 17.8s total (0.000227s min, 0.192s max, 0.0038s avg 263.8 fps)
403266.907KB total (9.688KB min, 139.697KB max, 85.82KB avg)
Emits/elides: def 1086511/116196 fg 10601709/7359116 bg 10661910/6326744
Elide rates: 9.66% 40.97% 37.24%
After this PR:
5625 renders, 15s total (9.36e-05s min, 0.187s max, 0.0027s avg 375.2 fps)
168365.640KB total (0.930KB min, 139.600KB max, 29.93KB avg)
Emits/elides: def 310575/116196 fg 4486002/4473416 bg 4116835/4630666
Elide rates: 27.23% 49.93% 52.94%
Cells emitted; 9928000 elided: 12572000 (55.88%)
5642 renders, 14.2s total (9.17e-05s min, 0.154s max, 0.0025s avg 397.0 fps)
168669.009KB total (0.605KB min, 139.600KB max, 29.90KB avg)
Emits/elides: def 310819/116196 fg 4499833/4482134 bg 4118562/4652470
Elide rates: 27.21% 49.90% 53.04%
Cells emitted; 9962160 elided: 12605840 (55.86%)
5650 renders, 14.3s total (0.000118s min, 0.143s max, 0.0025s avg 395.7 fps)
169461.884KB total (0.860KB min, 139.600KB max, 29.99KB avg)
Emits/elides: def 305431/116196 fg 4515396/4456376 bg 4149967/4613668
Elide rates: 27.56% 49.67% 52.65%
Cells emitted; 9945200 elided: 12654800 (55.99%)
on netcurses-demo, we're eliding about half of the total cells via this damage map. that's pretty fucking sweet! FPS increase of about 50% -- I'll take that any day of the fuckin' week, boyo. w00t!
https://www.youtube.com/watch?v=XbGs_qK2PQA
2019-12-15 18:46:47 +00:00
|
|
|
|
2020-05-04 15:05:52 +00:00
|
|
|
SUBCASE("LoadRGBAFromMemory") {
|
|
|
|
|
int dimy, dimx;
|
|
|
|
|
ncplane_dim_yx(ncp_, &dimy, &dimx);
|
|
|
|
|
std::vector<uint32_t> rgba(dimx * dimy * 2, 0x88bbccff);
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
auto ncv = ncvisual_from_rgba(rgba.data(), dimy * 2, dimx * 4, dimx);
|
2020-05-04 15:05:52 +00:00
|
|
|
REQUIRE(ncv);
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncvisual_options opts{};
|
|
|
|
|
opts.n = ncp_;
|
|
|
|
|
CHECK(ncvisual_render(nc_, ncv, &opts));
|
2020-05-04 15:05:52 +00:00
|
|
|
CHECK(0 == notcurses_render(nc_));
|
|
|
|
|
ncvisual_destroy(ncv);
|
|
|
|
|
CHECK(0 == notcurses_render(nc_));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SUBCASE("LoadBGRAFromMemory") {
|
|
|
|
|
int dimy, dimx;
|
|
|
|
|
ncplane_dim_yx(ncp_, &dimy, &dimx);
|
|
|
|
|
std::vector<uint32_t> rgba(dimx * dimy * 2, 0x88bbccff);
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
auto ncv = ncvisual_from_bgra(rgba.data(), dimy * 2, dimx * 4, dimx);
|
2020-05-04 15:05:52 +00:00
|
|
|
REQUIRE(ncv);
|
Fully general ncvisual layer (#647)
This represents an essentially complete rewrite of ncvisual and associated code. It had two major goals:
Improve the ncvisual API based off lessons learned, pursuant to the upcoming API freeze. In particular, I wanted to:
decouple ncvisuals from ncplanes. It should be possible to render a ncvisual to multiple planes, with different scaling each time. It should be possible to create an ncvisual without a plane, etc.
normalize the various ways of constructing an ncvisual -- file, memory, plane, etc.
Support multiple blitters, from 7-bit ASCII to Sixel. This required writing the blitters in several cases, and they're not yet in their final implementations (but the API is fine)
I have not yet unified Plots and Visuals, and might not, given that the Plot code works fine. We could at this point implement Plots in terms of Visuals, though -- the blitter backend range has been unified. Sixel is not yet implemented, though it is listed.
There is a new POC tool, blitter. It renders its arguments using all possible blitter+scaling combinations. Another new POC, resize, displays its argument, then resizes it to the screen size and displays that, explicitly making use of ncvisual_resize() rather than a scaling parameter to ncvisual_render().
This also eliminates some memory leaks and bugs we were seeing in trunk, and brings in Sixel scaffolding.
The C++ wrapper will also need patching back up; I cut most of it down while wrestling with this crap, urk.
Closes #638, #562, and #622.
2020-05-29 01:16:58 +00:00
|
|
|
struct ncvisual_options opts{};
|
|
|
|
|
opts.n = ncp_;
|
|
|
|
|
CHECK(ncvisual_render(nc_, ncv, &opts));
|
2020-05-04 15:05:52 +00:00
|
|
|
CHECK(0 == notcurses_render(nc_));
|
|
|
|
|
ncvisual_destroy(ncv);
|
|
|
|
|
CHECK(0 == notcurses_render(nc_));
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-14 05:58:53 +00:00
|
|
|
// write a checkerboard pattern and verify the NCBLIT_2x1 output
|
|
|
|
|
SUBCASE("Dualblitter") {
|
2020-06-14 21:39:58 +00:00
|
|
|
if(enforce_utf8()){
|
|
|
|
|
constexpr int DIMY = 10;
|
|
|
|
|
constexpr int DIMX = 11; // odd number to get checkerboard effect
|
|
|
|
|
auto rgba = new uint32_t[DIMY * DIMX];
|
|
|
|
|
for(int i = 0 ; i < DIMY * DIMX ; ++i){
|
|
|
|
|
CHECK(0 == ncpixel_set_a(&rgba[i], 0xff));
|
|
|
|
|
if(i % 2){
|
|
|
|
|
CHECK(0 == ncpixel_set_g(&rgba[i], 0xff));
|
|
|
|
|
CHECK(0 == ncpixel_set_r(&rgba[i], 0));
|
|
|
|
|
}else{
|
|
|
|
|
CHECK(0 == ncpixel_set_r(&rgba[i], 0xff));
|
|
|
|
|
CHECK(0 == ncpixel_set_g(&rgba[i], 0));
|
|
|
|
|
}
|
|
|
|
|
CHECK(0 == ncpixel_set_b(&rgba[i], 0));
|
2020-06-14 05:58:53 +00:00
|
|
|
}
|
2020-06-14 21:39:58 +00:00
|
|
|
auto ncv = ncvisual_from_rgba(rgba, DIMY, DIMX * sizeof(uint32_t), DIMX);
|
|
|
|
|
REQUIRE(nullptr != ncv);
|
|
|
|
|
struct ncvisual_options vopts{};
|
|
|
|
|
vopts.n = n_;
|
|
|
|
|
vopts.blitter = NCBLIT_2x1;
|
|
|
|
|
vopts.flags = NCVISUAL_OPTION_NODEGRADE;
|
|
|
|
|
CHECK(n_ == ncvisual_render(nc_, ncv, &vopts));
|
|
|
|
|
CHECK(0 == notcurses_render(nc_));
|
|
|
|
|
for(int y = 0 ; y < DIMY / 2 ; ++y){
|
|
|
|
|
for(int x = 0 ; x < DIMX ; ++x){
|
2020-08-15 23:25:08 +00:00
|
|
|
uint16_t stylemask;
|
2020-06-14 21:39:58 +00:00
|
|
|
uint64_t channels;
|
2020-08-15 23:25:08 +00:00
|
|
|
char* egc = notcurses_at_yx(nc_, y, x, &stylemask, &channels);
|
2020-06-14 21:39:58 +00:00
|
|
|
REQUIRE(nullptr != egc);
|
2020-09-17 19:34:28 +00:00
|
|
|
CHECK((rgba[y * 2 * DIMX + x] & 0xffffff) == channels_bg_rgb(channels));
|
|
|
|
|
CHECK((rgba[(y * 2 + 1) * DIMX + x] & 0xffffff) == channels_fg_rgb(channels));
|
2020-06-14 21:39:58 +00:00
|
|
|
free(egc);
|
|
|
|
|
}
|
2020-06-14 06:22:24 +00:00
|
|
|
}
|
2020-06-14 21:39:58 +00:00
|
|
|
delete[] rgba;
|
2020-06-14 06:22:24 +00:00
|
|
|
}
|
2020-06-14 05:58:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// write a checkerboard pattern and verify the NCBLIT_2x2 output
|
|
|
|
|
SUBCASE("Quadblitter") {
|
2020-06-14 21:39:58 +00:00
|
|
|
if(enforce_utf8()){
|
|
|
|
|
constexpr int DIMY = 10;
|
|
|
|
|
constexpr int DIMX = 11; // odd number to get checkerboard effect
|
|
|
|
|
auto rgba = new uint32_t[DIMY * DIMX];
|
|
|
|
|
for(int i = 0 ; i < DIMY * DIMX ; ++i){
|
|
|
|
|
CHECK(0 == ncpixel_set_a(&rgba[i], 0xff));
|
|
|
|
|
if(i % 2){
|
|
|
|
|
CHECK(0 == ncpixel_set_g(&rgba[i], 0xff));
|
|
|
|
|
CHECK(0 == ncpixel_set_b(&rgba[i], 0));
|
|
|
|
|
}else{
|
|
|
|
|
CHECK(0 == ncpixel_set_b(&rgba[i], 0xff));
|
|
|
|
|
CHECK(0 == ncpixel_set_g(&rgba[i], 0));
|
|
|
|
|
}
|
|
|
|
|
CHECK(0 == ncpixel_set_r(&rgba[i], 0));
|
2020-06-14 05:58:53 +00:00
|
|
|
}
|
2020-06-14 21:39:58 +00:00
|
|
|
auto ncv = ncvisual_from_rgba(rgba, DIMY, DIMX * sizeof(uint32_t), DIMX);
|
|
|
|
|
REQUIRE(nullptr != ncv);
|
|
|
|
|
struct ncvisual_options vopts{};
|
|
|
|
|
vopts.n = n_;
|
|
|
|
|
vopts.blitter = NCBLIT_2x2;
|
|
|
|
|
vopts.flags = NCVISUAL_OPTION_NODEGRADE;
|
|
|
|
|
CHECK(n_ == ncvisual_render(nc_, ncv, &vopts));
|
|
|
|
|
CHECK(0 == notcurses_render(nc_));
|
|
|
|
|
for(int y = 0 ; y < DIMY / 2 ; ++y){
|
|
|
|
|
for(int x = 0 ; x < DIMX / 2 ; ++x){
|
2020-08-15 23:25:08 +00:00
|
|
|
uint16_t stylemask;
|
2020-06-14 21:39:58 +00:00
|
|
|
uint64_t channels;
|
2020-08-15 23:25:08 +00:00
|
|
|
char* egc = notcurses_at_yx(nc_, y, x, &stylemask, &channels);
|
2020-06-14 21:39:58 +00:00
|
|
|
REQUIRE(nullptr != egc);
|
2020-09-17 19:34:28 +00:00
|
|
|
CHECK((rgba[(y * 2 * DIMX) + (x * 2)] & 0xffffff) == channels_fg_rgb(channels));
|
|
|
|
|
CHECK((rgba[(y * 2 + 1) * DIMX + (x * 2) + 1] & 0xffffff) == channels_fg_rgb(channels));
|
2020-06-14 21:39:58 +00:00
|
|
|
free(egc);
|
|
|
|
|
}
|
2020-06-14 06:38:35 +00:00
|
|
|
}
|
2020-06-14 21:39:58 +00:00
|
|
|
delete[] rgba;
|
2020-06-14 06:38:35 +00:00
|
|
|
}
|
2020-06-14 05:58:53 +00:00
|
|
|
}
|
|
|
|
|
|
2020-06-14 09:11:11 +00:00
|
|
|
// close-in verification of each quadblitter output EGC
|
|
|
|
|
SUBCASE("QuadblitterEGCs") {
|
2020-06-14 21:43:18 +00:00
|
|
|
if(enforce_utf8()){
|
|
|
|
|
// there are 16 configurations, each mapping four (2x2) pixels
|
|
|
|
|
int DIMX = 32;
|
|
|
|
|
int DIMY = 2;
|
|
|
|
|
auto rgba = new uint32_t[DIMY * DIMX];
|
|
|
|
|
memset(rgba, 0, sizeof(*rgba) * DIMY * DIMX);
|
|
|
|
|
// the top has 4 configurations of 4 each, each being 2 columns
|
|
|
|
|
for(int top = 0 ; top < 4 ; ++top){
|
|
|
|
|
for(int idx = 0 ; idx < 4 ; ++idx){
|
|
|
|
|
const int itop = (top * 4 + idx) * 2; // index of first column
|
|
|
|
|
CHECK(0 == ncpixel_set_a(&rgba[itop], 0xff));
|
|
|
|
|
CHECK(0 == ncpixel_set_a(&rgba[itop + 1], 0xff));
|
|
|
|
|
if(top == 1 || top == 3){
|
|
|
|
|
CHECK(0 == ncpixel_set_r(&rgba[itop], 0xff));
|
|
|
|
|
}
|
|
|
|
|
if(top == 2 || top == 3){
|
|
|
|
|
CHECK(0 == ncpixel_set_r(&rgba[itop + 1], 0xff));
|
|
|
|
|
}
|
2020-06-14 09:11:11 +00:00
|
|
|
}
|
|
|
|
|
}
|
2020-06-14 21:43:18 +00:00
|
|
|
for(int bot = 0 ; bot < 4 ; ++bot){
|
|
|
|
|
for(int idx = 0 ; idx < 4 ; ++idx){
|
|
|
|
|
const int ibot = (bot * 4 + idx) * 2 + DIMX;
|
|
|
|
|
CHECK(0 == ncpixel_set_a(&rgba[ibot], 0xff));
|
|
|
|
|
CHECK(0 == ncpixel_set_a(&rgba[ibot + 1], 0xff));
|
|
|
|
|
if(idx == 1 || idx == 3){
|
|
|
|
|
CHECK(0 == ncpixel_set_r(&rgba[ibot], 0xff));
|
|
|
|
|
}
|
|
|
|
|
if(idx == 2 || idx == 3){
|
|
|
|
|
CHECK(0 == ncpixel_set_r(&rgba[ibot + 1], 0xff));
|
|
|
|
|
}
|
2020-06-14 09:11:11 +00:00
|
|
|
}
|
|
|
|
|
}
|
2020-06-14 21:43:18 +00:00
|
|
|
auto ncv = ncvisual_from_rgba(rgba, DIMY, DIMX * sizeof(uint32_t), DIMX);
|
|
|
|
|
REQUIRE(nullptr != ncv);
|
|
|
|
|
struct ncvisual_options vopts{};
|
|
|
|
|
vopts.n = n_;
|
|
|
|
|
vopts.blitter = NCBLIT_2x2;
|
|
|
|
|
vopts.flags = NCVISUAL_OPTION_NODEGRADE;
|
|
|
|
|
CHECK(n_ == ncvisual_render(nc_, ncv, &vopts));
|
|
|
|
|
CHECK(0 == notcurses_render(nc_));
|
|
|
|
|
for(int y = 0 ; y < DIMY / 2 ; ++y){
|
|
|
|
|
for(int x = 0 ; x < DIMX / 2 ; ++x){
|
2020-08-15 23:25:08 +00:00
|
|
|
uint16_t stylemask;
|
2020-06-14 21:43:18 +00:00
|
|
|
uint64_t channels;
|
2020-08-15 23:25:08 +00:00
|
|
|
char* egc = notcurses_at_yx(nc_, y, x, &stylemask, &channels);
|
2020-06-14 21:43:18 +00:00
|
|
|
REQUIRE(nullptr != egc);
|
|
|
|
|
/* FIXME need to match
|
|
|
|
|
[▀] 00000000 00000000
|
|
|
|
|
[▜] 00000000 00ff0000
|
|
|
|
|
[▛] 00000000 00ff0000
|
|
|
|
|
[▀] 00000000 00ff0000
|
|
|
|
|
[▟] 00000000 00ff0000
|
|
|
|
|
[▋] 00ff0000 00000000
|
|
|
|
|
[▚] 00ff0000 00000000
|
|
|
|
|
[▙] 00ff0000 00000000
|
|
|
|
|
[▙] 00000000 00ff0000
|
|
|
|
|
[▚] 00000000 00ff0000
|
|
|
|
|
[▋] 00000000 00ff0000
|
|
|
|
|
[▟] 00ff0000 00000000
|
|
|
|
|
[▀] 00ff0000 00000000
|
|
|
|
|
[▛] 00ff0000 00000000
|
|
|
|
|
[▜] 00ff0000 00000000
|
|
|
|
|
[▀] 00ff0000 00ff0000
|
|
|
|
|
*/
|
|
|
|
|
free(egc);
|
|
|
|
|
}
|
2020-06-14 09:11:11 +00:00
|
|
|
}
|
2020-06-14 21:43:18 +00:00
|
|
|
delete[] rgba;
|
2020-06-14 09:11:11 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-12-27 22:20:20 +00:00
|
|
|
CHECK(!notcurses_stop(nc_));
|
2019-11-25 03:22:18 +00:00
|
|
|
}
|