Skip to content

Minor Color class changes #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danngreen merged 5 commits into from
Jan 25, 2026
+8 −10
Merged

Minor Color class changes #18

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03f94f7
Merge branch 'main' into audiobird
audiobird Aug 20, 2025
519df37
colors: default initialize r,g,b. Add default constructor, remove def…
audiobird Aug 22, 2025
630a8f9
constexpr color operations
audiobird Jan 24, 2026
fbf64d6
Merge branch 'main' into constexpr-ops
audiobird Jan 24, 2026
de15b05
remove constructor
audiobird Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions util/colors.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,14 @@ struct Color {
uint8_t r, g, b;
};

constexpr Color() = default;

explicit constexpr Color(uint8_t r, uint8_t g, uint8_t b)
: r_(r)
, g_(g)
, b_(b) {
}

constexpr Color()
: r_(0)
, g_(0)
, b_(0) {
}

constexpr Color(uint16_t rgb565)
: r_((rgb565 & 0xf800) >> 8)
, g_((rgb565 & 0x07e0) >> 3)
Expand All @@ -55,15 +51,15 @@ struct Color {
return b_;
}

const Color operator+(Color const that) const {
constexpr Color operator+(Color const that) const {
return Color(builtin_add_u8(r_, that.r_), builtin_add_u8(g_, that.g_), builtin_add_u8(b_, that.b_));
}

const Color operator*(float phase) const {
constexpr Color operator*(float phase) const {
return Color{0, 0, 0}.blend(*this, phase);
}

bool operator==(Color const &other) const {
constexpr bool operator==(Color const &other) const {
return (r_ == other.r_ && g_ == other.g_ && b_ == other.b_);
}

Expand Down Expand Up @@ -140,7 +136,9 @@ struct Color {
}

private:
uint8_t r_, g_, b_;
uint8_t r_{};
uint8_t g_{};
uint8_t b_{};
};

struct Colors {
Expand Down