mirror of
https://github.com/bevyengine/bevy
synced 2024-11-23 05:03:47 +00:00
# Objective Fixes #7757 New function `Color::as_lcha` was added and `Color::as_lch_f32` changed name to `Color::as_lcha_f32`. ---- As a side note I did it as in every other Color function, that is I created very simillar code in `as_lcha` as was in `as_lcha_f32`. However it is totally possible to avoid this code duplication in LCHA and other color variants by doing something like : ``` pub fn as_lcha(self: &Color) -> Color { let (lightness, chroma, hue, alpha) = self.as_lcha_f32(); return Color::Lcha { lightness, chroma, hue, alpha }; } ``` This is maybe slightly less efficient but it avoids copy-pasting this huge match expression which is error prone. Anyways since it is my first commit here I wanted to be consistent with the rest of code but can refactor all variants in separate PR if somebody thinks it is good idea.
This commit is contained in:
parent
6124b20f4b
commit
04b42132a8
1 changed files with 59 additions and 3 deletions
|
@ -591,6 +591,61 @@ impl Color {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Converts a `Color` to variant `Color::Lcha`
|
||||||
|
pub fn as_lcha(self: &Color) -> Color {
|
||||||
|
match self {
|
||||||
|
Color::Rgba {
|
||||||
|
red,
|
||||||
|
green,
|
||||||
|
blue,
|
||||||
|
alpha,
|
||||||
|
} => {
|
||||||
|
let (lightness, chroma, hue) =
|
||||||
|
LchRepresentation::nonlinear_srgb_to_lch([*red, *green, *blue]);
|
||||||
|
Color::Lcha {
|
||||||
|
lightness,
|
||||||
|
chroma,
|
||||||
|
hue,
|
||||||
|
alpha: *alpha,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Color::RgbaLinear {
|
||||||
|
red,
|
||||||
|
green,
|
||||||
|
blue,
|
||||||
|
alpha,
|
||||||
|
} => {
|
||||||
|
let (lightness, chroma, hue) = LchRepresentation::nonlinear_srgb_to_lch([
|
||||||
|
red.linear_to_nonlinear_srgb(),
|
||||||
|
green.linear_to_nonlinear_srgb(),
|
||||||
|
blue.linear_to_nonlinear_srgb(),
|
||||||
|
]);
|
||||||
|
Color::Lcha {
|
||||||
|
lightness,
|
||||||
|
chroma,
|
||||||
|
hue,
|
||||||
|
alpha: *alpha,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Color::Hsla {
|
||||||
|
hue,
|
||||||
|
saturation,
|
||||||
|
lightness,
|
||||||
|
alpha,
|
||||||
|
} => {
|
||||||
|
let rgb = HslRepresentation::hsl_to_nonlinear_srgb(*hue, *saturation, *lightness);
|
||||||
|
let (lightness, chroma, hue) = LchRepresentation::nonlinear_srgb_to_lch(rgb);
|
||||||
|
Color::Lcha {
|
||||||
|
lightness,
|
||||||
|
chroma,
|
||||||
|
hue,
|
||||||
|
alpha: *alpha,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Color::Lcha { .. } => *self,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Converts a `Color` to a `[f32; 4]` from sRGB colorspace
|
/// Converts a `Color` to a `[f32; 4]` from sRGB colorspace
|
||||||
pub fn as_rgba_f32(self: Color) -> [f32; 4] {
|
pub fn as_rgba_f32(self: Color) -> [f32; 4] {
|
||||||
match self {
|
match self {
|
||||||
|
@ -737,7 +792,7 @@ impl Color {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Converts a `Color` to a `[f32; 4]` from LCH colorspace
|
/// Converts a `Color` to a `[f32; 4]` from LCH colorspace
|
||||||
pub fn as_lch_f32(self: Color) -> [f32; 4] {
|
pub fn as_lcha_f32(self: Color) -> [f32; 4] {
|
||||||
match self {
|
match self {
|
||||||
Color::Rgba {
|
Color::Rgba {
|
||||||
red,
|
red,
|
||||||
|
@ -958,7 +1013,7 @@ impl AddAssign<Color> for Color {
|
||||||
hue,
|
hue,
|
||||||
alpha,
|
alpha,
|
||||||
} => {
|
} => {
|
||||||
let rhs = rhs.as_lch_f32();
|
let rhs = rhs.as_lcha_f32();
|
||||||
*lightness += rhs[0];
|
*lightness += rhs[0];
|
||||||
*chroma += rhs[1];
|
*chroma += rhs[1];
|
||||||
*hue += rhs[2];
|
*hue += rhs[2];
|
||||||
|
@ -1021,7 +1076,7 @@ impl Add<Color> for Color {
|
||||||
hue,
|
hue,
|
||||||
alpha,
|
alpha,
|
||||||
} => {
|
} => {
|
||||||
let rhs = rhs.as_lch_f32();
|
let rhs = rhs.as_lcha_f32();
|
||||||
|
|
||||||
Color::Lcha {
|
Color::Lcha {
|
||||||
lightness: lightness + rhs[0],
|
lightness: lightness + rhs[0],
|
||||||
|
@ -1617,6 +1672,7 @@ impl encase::private::ReadFrom for Color {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl encase::private::CreateFrom for Color {
|
impl encase::private::CreateFrom for Color {
|
||||||
fn create_from<B>(reader: &mut encase::private::Reader<B>) -> Self
|
fn create_from<B>(reader: &mut encase::private::Reader<B>) -> Self
|
||||||
where
|
where
|
||||||
|
|
Loading…
Reference in a new issue