Taiko_Stuff/DonCon2040
1
0
Fork 0
mirror of https://github.com/ravinrabbid/DonCon2040.git synced 2024-11-20 11:47:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify status LED color mixing

Browse Source
This commit is contained in:
Frederik Walk 2024-11-05 20:18:19 +01:00
parent 5aceccc855
commit 464b713917
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/peripherals/StatusLed.cpp
View File

@ -20,45 +20,39 @@ void StatusLed::setInputState(const Utils::InputState input_state) { m_input_sta
void StatusLed::setPlayerColor(const Config::Color color) { m_player_color = color; } void StatusLed::setPlayerColor(const Config::Color color) { m_player_color = color; }
void StatusLed::update() { void StatusLed::update() {
float brightness_factor = m_config.brightness / static_cast<float>(UINT8_MAX); float brightness_factor = (float)m_config.brightness / static_cast<float>(UINT8_MAX);
uint16_t mixed_red = 0; Config::Color mixed = {0, 0, 0};
uint16_t mixed_green = 0; bool triggered = false;
uint16_t mixed_blue = 0;
uint8_t num_colors = 0; const auto add_color = [](Config::Color &base, const Config::Color &add) {
base.r = std::max(base.r, add.r);
base.g = std::max(base.g, add.g);
base.b = std::max(base.b, add.b);
};
// TODO simply use max of each channel
if (m_input_state.drum.don_left.triggered) { if (m_input_state.drum.don_left.triggered) {
mixed_red += m_config.don_left_color.r; add_color(mixed, m_config.don_left_color);
mixed_green += m_config.don_left_color.g; triggered = true;
mixed_blue += m_config.don_left_color.b;
num_colors++;
} }
if (m_input_state.drum.ka_left.triggered) { if (m_input_state.drum.ka_left.triggered) {
mixed_red += m_config.ka_left_color.r; add_color(mixed, m_config.ka_left_color);
mixed_green += m_config.ka_left_color.g; triggered = true;
mixed_blue += m_config.ka_left_color.b;
num_colors++;
} }
if (m_input_state.drum.don_right.triggered) { if (m_input_state.drum.don_right.triggered) {
mixed_red += m_config.don_right_color.r; add_color(mixed, m_config.don_right_color);
mixed_green += m_config.don_right_color.g; triggered = true;
mixed_blue += m_config.don_right_color.b;
num_colors++;
} }
if (m_input_state.drum.ka_right.triggered) { if (m_input_state.drum.ka_right.triggered) {
mixed_red += m_config.ka_right_color.r; add_color(mixed, m_config.ka_right_color);
mixed_green += m_config.ka_right_color.g; triggered = true;
mixed_blue += m_config.ka_right_color.b;
num_colors++;
} }
if (num_colors > 0) { if (triggered) {
ws2812_put_pixel(ws2812_rgb_to_gamma_corrected_u32pixel( ws2812_put_pixel(
static_cast<uint8_t>((mixed_red / num_colors) * brightness_factor), ws2812_rgb_to_gamma_corrected_u32pixel(static_cast<uint8_t>((float)mixed.r * brightness_factor),
static_cast<uint8_t>((mixed_green / num_colors) * brightness_factor), static_cast<uint8_t>((float)mixed.g * brightness_factor),
static_cast<uint8_t>((mixed_blue / num_colors) * brightness_factor))); static_cast<uint8_t>((float)mixed.b * brightness_factor)));
} else { } else {
const auto idle_color = const auto idle_color =
m_config.enable_player_color ? m_player_color.value_or(m_config.idle_color) : m_config.idle_color; m_config.enable_player_color ? m_player_color.value_or(m_config.idle_color) : m_config.idle_color;