forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Color::as_rgba_linear for Color::Lcha (#8040)

Browse Source 
Co-authored-by: James Liu <contact@jamessliu.com>
This commit is contained in:
Gilbert Röhrbein 2023-03-11 13:12:31 +01:00 committed by GitHub
parent ee0e6f4855
commit 9e9ae5b830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/bevy_render/src/color/mod.rs
View File

@ -525,7 +525,7 @@ impl Color {
let [red, green, blue] = let [red, green, blue] =
LchRepresentation::lch_to_nonlinear_srgb(*lightness, *chroma, *hue); LchRepresentation::lch_to_nonlinear_srgb(*lightness, *chroma, *hue);
Color::Rgba { Color::RgbaLinear {
red: red.nonlinear_to_linear_srgb(), red: red.nonlinear_to_linear_srgb(),
green: green.nonlinear_to_linear_srgb(), green: green.nonlinear_to_linear_srgb(),
blue: blue.nonlinear_to_linear_srgb(), blue: blue.nonlinear_to_linear_srgb(),
@ -1858,4 +1858,22 @@ mod tests {
assert_eq!(starting_color * transformation, mutated_color,); assert_eq!(starting_color * transformation, mutated_color,);
} }
// regression test for https://github.com/bevyengine/bevy/pull/8040
#[test]
fn convert_to_rgba_linear() {
let rgba = Color::rgba(0., 0., 0., 0.);
let rgba_l = Color::rgba_linear(0., 0., 0., 0.);
let hsla = Color::hsla(0., 0., 0., 0.);
let lcha = Color::Lcha {
lightness: 0.0,
chroma: 0.0,
hue: 0.0,
alpha: 0.0,
};
assert_eq!(rgba_l, rgba_l.as_rgba_linear());
let Color::RgbaLinear { .. } = rgba.as_rgba_linear() else { panic!("from Rgba") };
let Color::RgbaLinear { .. } = hsla.as_rgba_linear() else { panic!("from Hsla") };
let Color::RgbaLinear { .. } = lcha.as_rgba_linear() else { panic!("from Lcha") };
}
} }