From 786db2afe6458e24681b8a40fa798429956d3420 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 7 Jun 2021 13:22:12 +0200 Subject: [PATCH] fix(draw) with additive blending with 32 bit color depth --- examples/scroll/lv_example_scroll_6.c | 136 +++++++++++++++++++++++--- src/draw/lv_draw_blend.c | 2 + 2 files changed, 127 insertions(+), 11 deletions(-) diff --git a/examples/scroll/lv_example_scroll_6.c b/examples/scroll/lv_example_scroll_6.c index 010af3b82..bf00abf70 100644 --- a/examples/scroll/lv_example_scroll_6.c +++ b/examples/scroll/lv_example_scroll_6.c @@ -1,4 +1,4 @@ -#include "../lv_examples.h" +#include "lvgl/lvgl.h" #if LV_BUILD_EXAMPLES static void scroll_event_cb(lv_event_t * e) @@ -9,7 +9,7 @@ static void scroll_event_cb(lv_event_t * e) lv_obj_get_coords(cont, &cont_a); lv_coord_t cont_y_center = cont_a.y1 + lv_area_get_height(&cont_a) / 2; - lv_coord_t r = lv_obj_get_height(cont) * 7 / 10; + lv_coord_t r = 190; uint32_t i; uint32_t child_cnt = lv_obj_get_child_cnt(cont); for(i = 0; i < child_cnt; i++) { @@ -29,12 +29,13 @@ static void scroll_event_cb(lv_event_t * e) x = r; } else { /*Use Pythagoras theorem to get x from radius and y*/ - lv_coord_t x_sqr = r * r - diff_y * diff_y; + uint32_t x_sqr = r * r - diff_y * diff_y; lv_sqrt_res_t res; lv_sqrt(x_sqr, &res, 0x8000); /*Use lvgl's built in sqrt root function*/ x = r - res.i; } + /*Translate the item by the calculated X coordinate*/ lv_obj_set_style_translate_x(child, x, 0); @@ -44,29 +45,142 @@ static void scroll_event_cb(lv_event_t * e) } } +static void fade(void * var, int32_t v) +{ + lv_obj_set_style_opa(var, v, 0); +// lv_obj_invalidate(var); +} + + + +static void ofsx(void * var, int32_t v) +{ + lv_img_set_offset_x(var, v); +} + +static void translate_x(void * var, int32_t v) +{ + lv_obj_set_style_translate_x(var, v, 0); + lv_obj_set_style_img_opa(var, 256 + v, 0); +} /** * Translate the object as they scroll */ -void lv_example_scroll_6(void) +void sw_test_1(void) { - lv_obj_t * cont = lv_obj_create(lv_scr_act()); - lv_obj_set_size(cont, 200, 200); - lv_obj_center(cont); + + LV_IMG_DECLARE(img_bg); + + lv_obj_t * bg = lv_img_create(lv_scr_act()); + lv_img_set_src(bg, &img_bg); + lv_obj_set_size(bg, 392, 392); + lv_obj_center(bg); + lv_obj_clear_flag(bg, LV_OBJ_FLAG_SCROLLABLE); + + + LV_IMG_DECLARE(img_start_1); + lv_obj_t * start_1 = lv_img_create(bg); + lv_img_set_src(start_1, &img_start_1); + lv_obj_align(start_1, LV_ALIGN_CENTER, 22, 5); + lv_obj_set_style_blend_mode(start_1, LV_BLEND_MODE_ADDITIVE, 0); + + + lv_anim_t a1; + lv_anim_init(&a1); + lv_anim_set_var(&a1, start_1); + lv_anim_set_time(&a1, 1000); + lv_anim_set_playback_time(&a1, 300); + lv_anim_set_values(&a1, LV_OPA_50, LV_OPA_COVER); + lv_anim_set_exec_cb(&a1, fade); + lv_anim_set_repeat_count(&a1, LV_ANIM_REPEAT_INFINITE); +// lv_anim_start(&a1); + + LV_IMG_DECLARE(img_flash); + lv_obj_t * flash_1 = lv_img_create(bg); + lv_img_set_src(flash_1, &img_flash); + lv_obj_align_to(flash_1, start_1, LV_ALIGN_OUT_RIGHT_MID, -100, -10); + lv_obj_set_style_blend_mode(flash_1, LV_BLEND_MODE_ADDITIVE, 0); + lv_obj_set_width(flash_1, 110); + + lv_anim_t a2; + lv_anim_init(&a2); + lv_anim_set_var(&a2, flash_1); + lv_anim_set_time(&a2, 1000); + lv_anim_set_values(&a2, 0, -100); + lv_anim_set_exec_cb(&a2, ofsx); + lv_anim_set_repeat_count(&a2, LV_ANIM_REPEAT_INFINITE); + lv_anim_start(&a2); + + lv_obj_t * flash_2 = lv_img_create(bg); + lv_img_set_src(flash_2, &img_flash); + lv_obj_align_to(flash_2, start_1, LV_ALIGN_OUT_RIGHT_MID, -100, 10); + lv_obj_set_style_blend_mode(flash_2, LV_BLEND_MODE_ADDITIVE, 0); + lv_obj_set_width(flash_2, 110); + + lv_anim_set_var(&a2, flash_2); + lv_anim_set_time(&a2, 1500); + lv_anim_set_values(&a2, 0, -100); + lv_anim_set_exec_cb(&a2, ofsx); + lv_anim_start(&a2); + + LV_IMG_DECLARE(img_planet); + lv_obj_t * planet = lv_img_create(bg); + lv_img_set_src(planet, &img_planet); + lv_obj_align(planet, LV_ALIGN_RIGHT_MID, 0, 0); + lv_obj_add_flag(planet, LV_OBJ_FLAG_IGNORE_LAYOUT); + lv_obj_add_flag(planet, LV_OBJ_FLAG_FLOATING); + lv_obj_set_style_blend_mode(planet, LV_BLEND_MODE_ADDITIVE, 0); + + + + + + uint32_t i; + for (i = 0; i < 10; i++) { + LV_IMG_DECLARE(img_caret_down); + lv_obj_t * particle = lv_img_create(bg); + lv_img_set_src(particle, &img_caret_down); + lv_obj_align(particle, LV_ALIGN_RIGHT_MID, 0, i * 20 - 100); +// lv_obj_set_style_blend_mode(planet_glow, LV_BLEND_MODE_ADDITIVE, 0); + + lv_anim_t a3; + lv_anim_init(&a3); + lv_anim_set_var(&a3, particle); + lv_anim_set_time(&a3, lv_rand(800, 1200)); + lv_anim_set_values(&a3, 0, -256); + lv_anim_set_exec_cb(&a3, translate_x); + lv_anim_set_repeat_count(&a3, LV_ANIM_REPEAT_INFINITE); + lv_anim_start(&a3); + } + + + lv_obj_t * cont = lv_obj_create(bg); + lv_obj_remove_style_all(cont); + lv_obj_set_size(cont, lv_pct(100), lv_pct(100)); lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); lv_obj_add_event_cb(cont, scroll_event_cb, LV_EVENT_SCROLL, NULL); - lv_obj_set_style_radius(cont, LV_RADIUS_CIRCLE, 0); - lv_obj_set_style_clip_corner(cont, true, 0); + lv_obj_set_style_pad_row(cont, 50, 0); + lv_obj_set_style_text_font(cont, &lv_font_montserrat_34, 0); + lv_obj_set_style_text_color(cont, lv_color_white(), 0); lv_obj_set_scroll_dir(cont, LV_DIR_VER); lv_obj_set_scroll_snap_y(cont, LV_SCROLL_SNAP_CENTER); lv_obj_set_scrollbar_mode(cont, LV_SCROLLBAR_MODE_OFF); - uint32_t i; + + LV_IMG_DECLARE(icn_water); for(i = 0; i < 20; i++) { lv_obj_t * btn = lv_btn_create(cont); - lv_obj_set_width(btn, lv_pct(100)); + lv_obj_remove_style_all(btn); + lv_obj_set_width(btn, 250); lv_obj_t * label = lv_label_create(btn); lv_label_set_text_fmt(label, "Button %d", i); + + lv_obj_t * img = lv_img_create(btn); + lv_img_set_src(img, &icn_water); + + lv_obj_set_flex_flow(btn, LV_FLEX_FLOW_ROW); + lv_obj_set_flex_align(btn, LV_FLEX_ALIGN_SPACE_BETWEEN, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_START); } /*Update the buttons position manually for first*/ diff --git a/src/draw/lv_draw_blend.c b/src/draw/lv_draw_blend.c index 03fd31613..31ca6ba0d 100644 --- a/src/draw/lv_draw_blend.c +++ b/src/draw/lv_draw_blend.c @@ -980,6 +980,7 @@ static inline lv_color_t color_blend_true_color_additive(lv_color_t fg, lv_color #endif #if LV_COLOR_DEPTH == 8 + tmp = bg.ch.green + fg.ch.green; fg.ch.green = LV_MIN(tmp, 7); #elif LV_COLOR_DEPTH == 16 #if LV_COLOR_16_SWAP == 0 @@ -993,6 +994,7 @@ static inline lv_color_t color_blend_true_color_additive(lv_color_t fg, lv_color #endif #elif LV_COLOR_DEPTH == 32 + tmp = bg.ch.green + fg.ch.green; fg.ch.green = LV_MIN(tmp, 255); #endif