-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for Libra Colour and Clara Colour
Fixes #364.
- Loading branch information
1 parent
8aa30f1
commit 6506454
Showing
36 changed files
with
440 additions
and
347 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,119 @@ | ||
| #![allow(unused)] | ||
|
|
||
| pub const GRAY00: u8 = 0x00; | ||
| pub const GRAY01: u8 = 0x11; | ||
| pub const GRAY02: u8 = 0x22; | ||
| pub const GRAY03: u8 = 0x33; | ||
| pub const GRAY04: u8 = 0x44; | ||
| pub const GRAY05: u8 = 0x55; | ||
| pub const GRAY06: u8 = 0x66; | ||
| pub const GRAY07: u8 = 0x77; | ||
| pub const GRAY08: u8 = 0x88; | ||
| pub const GRAY09: u8 = 0x99; | ||
| pub const GRAY10: u8 = 0xAA; | ||
| pub const GRAY11: u8 = 0xBB; | ||
| pub const GRAY12: u8 = 0xCC; | ||
| pub const GRAY13: u8 = 0xDD; | ||
| pub const GRAY14: u8 = 0xEE; | ||
| pub const GRAY15: u8 = 0xFF; | ||
|
|
||
| pub const BLACK: u8 = GRAY00; | ||
| pub const WHITE: u8 = GRAY15; | ||
|
|
||
| pub const TEXT_NORMAL: [u8; 3] = [WHITE, BLACK, GRAY08]; | ||
| pub const TEXT_BUMP_SMALL: [u8; 3] = [GRAY14, BLACK, GRAY07]; | ||
| pub const TEXT_BUMP_LARGE: [u8; 3] = [GRAY11, BLACK, BLACK]; | ||
|
|
||
| pub const TEXT_INVERTED_SOFT: [u8; 3] = [GRAY05, WHITE, WHITE]; | ||
| pub const TEXT_INVERTED_HARD: [u8; 3] = [BLACK, WHITE, GRAY06]; | ||
|
|
||
| pub const SEPARATOR_NORMAL: u8 = GRAY10; | ||
| pub const SEPARATOR_STRONG: u8 = GRAY07; | ||
|
|
||
| pub const KEYBOARD_BG: u8 = GRAY12; | ||
| pub const BATTERY_FILL: u8 = GRAY12; | ||
| pub const READING_PROGRESS: u8 = GRAY07; | ||
|
|
||
| pub const PROGRESS_FULL: u8 = GRAY05; | ||
| pub const PROGRESS_EMPTY: u8 = GRAY13; | ||
| pub const PROGRESS_VALUE: u8 = GRAY06; | ||
| use serde::{Serialize, Deserialize}; | ||
| use crate::geom::lerp; | ||
|
|
||
| #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)] | ||
| #[serde(rename_all = "kebab-case")] | ||
| pub enum Color { | ||
| Gray(u8), | ||
| Rgb(u8, u8, u8), | ||
| } | ||
|
|
||
| impl Color { | ||
| pub fn gray(&self) -> u8 { | ||
| match *self { | ||
| Color::Gray(level) => level, | ||
| Color::Rgb(red, green, blue) => { | ||
| (red as f32 * 0.2126 + green as f32 * 0.7152 + blue as f32 * 0.0722) as u8 | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| pub fn rgb(&self) -> [u8; 3] { | ||
| match *self { | ||
| Color::Gray(level) => [level; 3], | ||
| Color::Rgb(red, green, blue) => [red, green, blue], | ||
| } | ||
| } | ||
|
|
||
| pub fn from_rgb(rgb: &[u8]) -> Color { | ||
| Color::Rgb(rgb[0], rgb[1], rgb[2]) | ||
| } | ||
|
|
||
| pub fn apply<F>(&self, f: F) -> Color where F: Fn(u8) -> u8 { | ||
| match *self { | ||
| Color::Gray(level) => Color::Gray(f(level)), | ||
| Color::Rgb(red, green, blue) => Color::Rgb(f(red), f(green), f(blue)), | ||
| } | ||
| } | ||
|
|
||
| pub fn lerp(&self, color: Color, alpha: f32) -> Color { | ||
| match (*self, color) { | ||
| (Color::Gray(l1), Color::Gray(l2)) => Color::Gray(lerp(l1 as f32, l2 as f32, alpha) as u8), | ||
| (Color::Rgb(red, green, blue), Color::Gray(level)) => Color::Rgb(lerp(red as f32, level as f32, alpha) as u8, | ||
| lerp(green as f32, level as f32, alpha) as u8, | ||
| lerp(blue as f32, level as f32, alpha) as u8), | ||
| (Color::Gray(level), Color::Rgb(red, green, blue)) => Color::Rgb(lerp(level as f32, red as f32, alpha) as u8, | ||
| lerp(level as f32, green as f32, alpha) as u8, | ||
| lerp(level as f32, blue as f32, alpha) as u8), | ||
| (Color::Rgb(r1, g1, b1), Color::Rgb(r2, g2, b2)) => Color::Rgb(lerp(r1 as f32, r2 as f32, alpha) as u8, | ||
| lerp(g1 as f32, g2 as f32, alpha) as u8, | ||
| lerp(b1 as f32, b2 as f32, alpha) as u8), | ||
| } | ||
| } | ||
|
|
||
| pub fn invert(&mut self) { | ||
| match self { | ||
| Color::Gray(level) => *level = 255 - *level, | ||
| Color::Rgb(red, green, blue) => { | ||
| *red = 255 - *red; | ||
| *green = 255 - *green; | ||
| *blue = 255 - *blue; | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| pub fn shift(&mut self, drift: u8) { | ||
| match self { | ||
| Color::Gray(level) => *level = level.saturating_sub(drift), | ||
| Color::Rgb(red, green, blue) => { | ||
| *red = red.saturating_sub(drift); | ||
| *green = green.saturating_sub(drift); | ||
| *blue = blue.saturating_sub(drift); | ||
| }, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| macro_rules! gray { | ||
| ($a:expr) => ($crate::color::Color::Gray($a)); | ||
| } | ||
|
|
||
| pub const GRAY00: Color = gray!(0x00); | ||
| pub const GRAY01: Color = gray!(0x11); | ||
| pub const GRAY02: Color = gray!(0x22); | ||
| pub const GRAY03: Color = gray!(0x33); | ||
| pub const GRAY04: Color = gray!(0x44); | ||
| pub const GRAY05: Color = gray!(0x55); | ||
| pub const GRAY06: Color = gray!(0x66); | ||
| pub const GRAY07: Color = gray!(0x77); | ||
| pub const GRAY08: Color = gray!(0x88); | ||
| pub const GRAY09: Color = gray!(0x99); | ||
| pub const GRAY10: Color = gray!(0xAA); | ||
| pub const GRAY11: Color = gray!(0xBB); | ||
| pub const GRAY12: Color = gray!(0xCC); | ||
| pub const GRAY13: Color = gray!(0xDD); | ||
| pub const GRAY14: Color = gray!(0xEE); | ||
| pub const GRAY15: Color = gray!(0xFF); | ||
|
|
||
| pub const BLACK: Color = GRAY00; | ||
| pub const WHITE: Color = GRAY15; | ||
|
|
||
| pub const TEXT_NORMAL: [Color; 3] = [WHITE, BLACK, GRAY08]; | ||
| pub const TEXT_BUMP_SMALL: [Color; 3] = [GRAY14, BLACK, GRAY07]; | ||
| pub const TEXT_BUMP_LARGE: [Color; 3] = [GRAY11, BLACK, BLACK]; | ||
|
|
||
| pub const TEXT_INVERTED_SOFT: [Color; 3] = [GRAY05, WHITE, WHITE]; | ||
| pub const TEXT_INVERTED_HARD: [Color; 3] = [BLACK, WHITE, GRAY06]; | ||
|
|
||
| pub const SEPARATOR_NORMAL: Color = GRAY10; | ||
| pub const SEPARATOR_STRONG: Color = GRAY07; | ||
|
|
||
| pub const KEYBOARD_BG: Color = GRAY12; | ||
| pub const BATTERY_FILL: Color = GRAY12; | ||
| pub const READING_PROGRESS: Color = GRAY07; | ||
|
|
||
| pub const PROGRESS_FULL: Color = GRAY05; | ||
| pub const PROGRESS_EMPTY: Color = GRAY13; | ||
| pub const PROGRESS_VALUE: Color = GRAY06; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.