diff options
| author | skullY <skullydazed@gmail.com> | 2019-08-30 11:19:03 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-08-30 15:01:52 -0700 |
| commit | b624f32f944acdc59dcb130674c09090c5c404cb (patch) | |
| tree | bc13adbba137d122d9a2c2fb2fafcbb08ac10e25 /quantum/rgb_matrix_animations/splash_anim.h | |
| parent | 61af76a10d00aba185b8338604171de490a13e3b (diff) | |
| download | qmk_firmware-b624f32f944acdc59dcb130674c09090c5c404cb.tar.gz qmk_firmware-b624f32f944acdc59dcb130674c09090c5c404cb.zip | |
clang-format changes
Diffstat (limited to 'quantum/rgb_matrix_animations/splash_anim.h')
| -rw-r--r-- | quantum/rgb_matrix_animations/splash_anim.h | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/quantum/rgb_matrix_animations/splash_anim.h b/quantum/rgb_matrix_animations/splash_anim.h index 19ccb256e..1415bcc0f 100644 --- a/quantum/rgb_matrix_animations/splash_anim.h +++ b/quantum/rgb_matrix_animations/splash_anim.h | |||
| @@ -1,37 +1,32 @@ | |||
| 1 | #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED | 1 | #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED |
| 2 | #if !defined(DISABLE_RGB_MATRIX_SPLASH) || !defined(DISABLE_RGB_MATRIX_MULTISPLASH) | 2 | # if !defined(DISABLE_RGB_MATRIX_SPLASH) || !defined(DISABLE_RGB_MATRIX_MULTISPLASH) |
| 3 | 3 | ||
| 4 | #ifndef DISABLE_RGB_MATRIX_SPLASH | 4 | # ifndef DISABLE_RGB_MATRIX_SPLASH |
| 5 | RGB_MATRIX_EFFECT(SPLASH) | 5 | RGB_MATRIX_EFFECT(SPLASH) |
| 6 | #endif | 6 | # endif |
| 7 | 7 | ||
| 8 | #ifndef DISABLE_RGB_MATRIX_MULTISPLASH | 8 | # ifndef DISABLE_RGB_MATRIX_MULTISPLASH |
| 9 | RGB_MATRIX_EFFECT(MULTISPLASH) | 9 | RGB_MATRIX_EFFECT(MULTISPLASH) |
| 10 | #endif | 10 | # endif |
| 11 | 11 | ||
| 12 | #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 12 | # ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 13 | 13 | ||
| 14 | HSV SPLASH_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) { | 14 | HSV SPLASH_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) { |
| 15 | uint16_t effect = tick - dist; | 15 | uint16_t effect = tick - dist; |
| 16 | if (effect > 255) | 16 | if (effect > 255) effect = 255; |
| 17 | effect = 255; | ||
| 18 | hsv.h += effect; | 17 | hsv.h += effect; |
| 19 | hsv.v = qadd8(hsv.v, 255 - effect); | 18 | hsv.v = qadd8(hsv.v, 255 - effect); |
| 20 | return hsv; | 19 | return hsv; |
| 21 | } | 20 | } |
| 22 | 21 | ||
| 23 | #ifndef DISABLE_RGB_MATRIX_SPLASH | 22 | # ifndef DISABLE_RGB_MATRIX_SPLASH |
| 24 | bool SPLASH(effect_params_t* params) { | 23 | bool SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SPLASH_math); } |
| 25 | return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SPLASH_math); | 24 | # endif |
| 26 | } | ||
| 27 | #endif | ||
| 28 | 25 | ||
| 29 | #ifndef DISABLE_RGB_MATRIX_MULTISPLASH | 26 | # ifndef DISABLE_RGB_MATRIX_MULTISPLASH |
| 30 | bool MULTISPLASH(effect_params_t* params) { | 27 | bool MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SPLASH_math); } |
| 31 | return effect_runner_reactive_splash(0, params, &SPLASH_math); | 28 | # endif |
| 32 | } | ||
| 33 | #endif | ||
| 34 | 29 | ||
| 35 | #endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS | 30 | # endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS |
| 36 | #endif // !defined(DISABLE_RGB_MATRIX_SPLASH) || !defined(DISABLE_RGB_MATRIX_MULTISPLASH) | 31 | # endif // !defined(DISABLE_RGB_MATRIX_SPLASH) || !defined(DISABLE_RGB_MATRIX_MULTISPLASH) |
| 37 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED | 32 | #endif // RGB_MATRIX_KEYREACTIVE_ENABLED |
