diff options
Diffstat (limited to 'quantum/rgb_matrix_runners/effect_runner_reactive_splash.h')
| -rw-r--r-- | quantum/rgb_matrix_runners/effect_runner_reactive_splash.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h b/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h index cb2b0d794..4f2059c99 100644 --- a/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h +++ b/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h | |||
| @@ -2,25 +2,24 @@ | |||
| 2 | 2 | ||
| 3 | #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED | 3 | #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED |
| 4 | 4 | ||
| 5 | typedef void (*reactive_splash_f)(HSV* hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick); | 5 | typedef HSV (*reactive_splash_f)(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick); |
| 6 | 6 | ||
| 7 | bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, reactive_splash_f effect_func) { | 7 | bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, reactive_splash_f effect_func) { |
| 8 | RGB_MATRIX_USE_LIMITS(led_min, led_max); | 8 | RGB_MATRIX_USE_LIMITS(led_min, led_max); |
| 9 | 9 | ||
| 10 | HSV hsv = { 0, rgb_matrix_config.sat, 0 }; | ||
| 11 | uint8_t count = g_last_hit_tracker.count; | 10 | uint8_t count = g_last_hit_tracker.count; |
| 12 | for (uint8_t i = led_min; i < led_max; i++) { | 11 | for (uint8_t i = led_min; i < led_max; i++) { |
| 13 | RGB_MATRIX_TEST_LED_FLAGS(); | 12 | RGB_MATRIX_TEST_LED_FLAGS(); |
| 14 | hsv.h = rgb_matrix_config.hue; | 13 | HSV hsv = rgb_matrix_config.hsv; |
| 15 | hsv.v = 0; | 14 | hsv.v = 0; |
| 16 | for (uint8_t j = start; j < count; j++) { | 15 | for (uint8_t j = start; j < count; j++) { |
| 17 | int16_t dx = g_led_config.point[i].x - g_last_hit_tracker.x[j]; | 16 | int16_t dx = g_led_config.point[i].x - g_last_hit_tracker.x[j]; |
| 18 | int16_t dy = g_led_config.point[i].y - g_last_hit_tracker.y[j]; | 17 | int16_t dy = g_led_config.point[i].y - g_last_hit_tracker.y[j]; |
| 19 | uint8_t dist = sqrt16(dx * dx + dy * dy); | 18 | uint8_t dist = sqrt16(dx * dx + dy * dy); |
| 20 | uint16_t tick = scale16by8(g_last_hit_tracker.tick[j], rgb_matrix_config.speed); | 19 | uint16_t tick = scale16by8(g_last_hit_tracker.tick[j], rgb_matrix_config.speed); |
| 21 | effect_func(&hsv, dx, dy, dist, tick); | 20 | hsv = effect_func(hsv, dx, dy, dist, tick); |
| 22 | } | 21 | } |
| 23 | hsv.v = scale8(hsv.v, rgb_matrix_config.val); | 22 | hsv.v = scale8(hsv.v, rgb_matrix_config.hsv.v); |
| 24 | RGB rgb = hsv_to_rgb(hsv); | 23 | RGB rgb = hsv_to_rgb(hsv); |
| 25 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); | 24 | rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); |
| 26 | } | 25 | } |
