Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-27 20:18:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[core] Move Color::gradient to cpp to avoid duplicate code (#12348)

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-07 22:08:21 -06:00
committed by GitHub
parent ffb3e2eb0a
commit 159194587b
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/color.cpp
+14
View File
@@ -6,4 +6,18 @@ namespace esphome {
constinit const Color Color::BLACK(0, 0, 0, 0); constinit const Color Color::BLACK(0, 0, 0, 0);
constinit const Color Color::WHITE(255, 255, 255, 255); constinit const Color Color::WHITE(255, 255, 255, 255);
Color Color::gradient(const Color &to_color, uint8_t amnt) {
Color new_color;
float amnt_f = float(amnt) / 255.0f;
new_color.r = amnt_f * (to_color.r - this->r) + this->r;
new_color.g = amnt_f * (to_color.g - this->g) + this->g;
new_color.b = amnt_f * (to_color.b - this->b) + this->b;
new_color.w = amnt_f * (to_color.w - this->w) + this->w;
return new_color;
}
Color Color::fade_to_white(uint8_t amnt) { return this->gradient(Color::WHITE, amnt); }
Color Color::fade_to_black(uint8_t amnt) { return this->gradient(Color::BLACK, amnt); }
} // namespace esphome } // namespace esphome
esphome/core/color.h
+3 -11
View File
@@ -174,17 +174,9 @@ struct Color {
uint8_t((uint16_t(b) * 255U / max_rgb)), w); uint8_t((uint16_t(b) * 255U / max_rgb)), w);
} }
Color gradient(const Color &to_color, uint8_t amnt) { Color gradient(const Color &to_color, uint8_t amnt);
Color new_color; Color fade_to_white(uint8_t amnt);
float amnt_f = float(amnt) / 255.0f; Color fade_to_black(uint8_t amnt);
new_color.r = amnt_f * (to_color.r - (*this).r) + (*this).r;
new_color.g = amnt_f * (to_color.g - (*this).g) + (*this).g;
new_color.b = amnt_f * (to_color.b - (*this).b) + (*this).b;
new_color.w = amnt_f * (to_color.w - (*this).w) + (*this).w;
return new_color;
}
Color fade_to_white(uint8_t amnt) { return (*this).gradient(Color::WHITE, amnt); }
Color fade_to_black(uint8_t amnt) { return (*this).gradient(Color::BLACK, amnt); }
Color lighten(uint8_t delta) { return *this + delta; } Color lighten(uint8_t delta) { return *this + delta; }
Color darken(uint8_t delta) { return *this - delta; } Color darken(uint8_t delta) { return *this - delta; }