Skip to content
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

Add all basic color constants #859

Merged
merged 3 commits into from Nov 15, 2020
Merged

Add all basic color constants #859

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c765af2
Add all basic color constants
GabyForceQ Nov 13, 2020
818488b
Fix Gold Color position
GabyForceQ Nov 13, 2020
0a5df4a
Rustify color names
gabriel-gheorghe Nov 15, 2020
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
31 changes: 31 additions & 0 deletions crates/bevy_render/src/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,44 @@ pub struct Color {
unsafe impl Byteable for Color {}

impl Color {
pub const ALICEBLUE: Color = Color::rgb_linear(0.94, 0.97, 1.0);
pub const ANTIQUEWHITE: Color = Color::rgb_linear(0.98, 0.92, 0.84);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we "rustify" these multi-word constants? Ex: ANTIQUEWHITE -> ANTIQUE_WHITE

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

pub const AQUAMARINE: Color = Color::rgb_linear(0.49, 1.0, 0.83);
pub const AZURE: Color = Color::rgb_linear(0.94, 1.0, 1.0);
pub const BEIGE: Color = Color::rgb_linear(0.96, 0.96, 0.86);
pub const BISQUE: Color = Color::rgb_linear(1.0, 0.89, 0.77);
pub const BLACK: Color = Color::rgb_linear(0.0, 0.0, 0.0);
pub const BLUE: Color = Color::rgb_linear(0.0, 0.0, 1.0);
pub const CRIMSON: Color = Color::rgb_linear(0.86, 0.08, 0.24);
pub const CYAN: Color = Color::rgb_linear(0.0, 1.0, 1.0);
pub const DARKGRAY: Color = Color::rgb_linear(0.25, 0.25, 0.25);
pub const DARKGREEN: Color = Color::rgb_linear(0.0, 0.5, 0.0);
pub const FUCHSIA: Color = Color::rgb_linear(1.0, 0.0, 1.0);
pub const GOLD: Color = Color::rgb_linear(1.0, 0.84, 0.0);
pub const GRAY: Color = Color::rgb_linear(0.5, 0.5, 0.5);
pub const GREEN: Color = Color::rgb_linear(0.0, 1.0, 0.0);
pub const INDIGO: Color = Color::rgb_linear(0.29, 0.0, 0.51);
pub const LIMEGREEN: Color = Color::rgb_linear(0.2, 0.8, 0.2);
pub const MAROON: Color = Color::rgb_linear(0.5, 0.0, 0.0);
pub const MIDNIGHTBLUE: Color = Color::rgb_linear(0.1, 0.1, 0.44);
pub const NAVY: Color = Color::rgb_linear(0.0, 0.0, 0.5);
pub const NONE: Color = Color::rgba_linear(0.0, 0.0, 0.0, 0.0);
pub const OLIVE: Color = Color::rgb_linear(0.5, 0.5, 0.0);
pub const ORANGE: Color = Color::rgb_linear(1.0, 0.65, 0.0);
pub const ORANGERED: Color = Color::rgb_linear(1.0, 0.27, 0.0);
pub const PINK: Color = Color::rgb_linear(1.0, 0.08, 0.58);
pub const PURPLE: Color = Color::rgb_linear(0.5, 0.0, 0.5);
pub const RED: Color = Color::rgb_linear(1.0, 0.0, 0.0);
pub const SALMON: Color = Color::rgb_linear(0.98, 0.5, 0.45);
pub const SEAGREEN: Color = Color::rgb_linear(0.18, 0.55, 0.34);
pub const SILVER: Color = Color::rgb_linear(0.75, 0.75, 0.75);
pub const TEAL: Color = Color::rgb_linear(0.0, 0.5, 0.5);
pub const TOMATO: Color = Color::rgb_linear(1.0, 0.39, 0.28);
pub const TURQUOISE: Color = Color::rgb_linear(0.25, 0.88, 0.82);
pub const VIOLET: Color = Color::rgb_linear(0.93, 0.51, 0.93);
pub const WHITE: Color = Color::rgb_linear(1.0, 1.0, 1.0);
pub const YELLOW: Color = Color::rgb_linear(1.0, 1.0, 0.0);
pub const YELLOWGREEN: Color = Color::rgb_linear(0.6, 0.8, 0.2);

// TODO: cant make rgb and rgba const due traits not allowed in const functions
// see issue #57563 https://github.com/rust-lang/rust/issues/57563
Expand Down