Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

line_mask anti-alaising fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-08-13 17:39:15 +02:00
parent 0aa19da0c7
commit 9b91dc057e
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lv_draw/lv_draw_rect.c
View File

@ -98,9 +98,9 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
lv_color_t line_buf[LV_HOR_RES_MAX];
lv_opa_t mask_buf[LV_HOR_RES_MAX];
lv_mask_line_param_t line_mask_param;
line_mask_param.origo.x = 150;
line_mask_param.origo.y = 100;
line_mask_param.steep = -300;
line_mask_param.origo.x = 0;
line_mask_param.origo.y = 0;
line_mask_param.steep = 987;
line_mask_param.flat = 1;

17
src/lv_draw/lv_mask.c
View File

@ -97,9 +97,8 @@ void lv_mask_line_left(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
int32_t k = xei - abs_x;
if(xef) {
if(p->steep > 0) k++;
if(k >= 0) mask_buf[k] = 255 - (((255-xef) * (255 - px_h)) >> 8);
if(p->steep < 0) k++;
if(k >= 0) mask_buf[k] = 255 - (((255-xef) * (255 - px_h)) >> 9);
k++;
}
while(px_h > sps) {
@ -110,7 +109,8 @@ void lv_mask_line_left(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
}
if(k < len && k >= 0) {
mask_buf[k] = px_h >> 1; /*Approximation*/
int32_t x_inters = (px_h << 10)/ p->steep;
mask_buf[k] = (x_inters * px_h) >> 9; //px_h >> 1; /*Approximation*/
}
k++;
@ -142,11 +142,7 @@ void lv_mask_line_left(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
int32_t xqi = xq >> 8;
int32_t xqf = xq & 0xFF;
printf("%d: %d.%d\n", abs_y, xei, xef * 100 / 255);
int32_t k = xei - abs_x;
if(xei != xqi && (p->steep < 0 && xef == 0)) {
xef = 0xFF;
xei = xqi;
@ -169,7 +165,7 @@ void lv_mask_line_left(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
if(p->steep < 0) {
y_inters = (xef << 10) / (-p->steep);
if(k >= 0 && k < len ) {
mask_buf[k] = (y_inters * xef) >> 8;
mask_buf[k] = (y_inters * xef) >> 9;
}
k--;
@ -189,13 +185,12 @@ void lv_mask_line_left(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
} else {
y_inters = ((255-xef) << 10) / p->steep;
if(k >= 0 && k < len ) {
mask_buf[k] = 255 - ((y_inters * (255-xef)) >> 8);
mask_buf[k] = 255 - ((y_inters * (255-xef)) >> 9);
}
k++;
int32_t x_inters = ((255-y_inters) * p->steep) >> 10;
printf("x_inters: %d\n", x_inters * 100 / 255);
if(k >= 0 && k < len ) {