me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated color packing into u32 to consider incorrect web-colors.

Browse source
This commit is contained in:
Bingus 2023-06-06 17:06:40 -07:00
parent 226ce3d6c9
commit 9554c78f3a
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
4 changed files with 61 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

33
graphics/src/gradient.rs
View file

@ -103,11 +103,17 @@ impl Linear {
let mut offsets = [0.0f32; 8];
for (index, stop) in self.stops.iter().enumerate() {
let (color, offset) = stop
.map_or((Color::default().into_u32(), 2.0), |s| {
(s.color.into_u32(), s.offset)
});
colors[index] = color;
let (color, offset) =
stop.map_or((Color::default(), 2.0), |s| (s.color, s.offset));
if color::GAMMA_CORRECTION {
//correct colors, convert to linear before uploading to GPU
colors[index] = color.into_linear_u32();
} else {
//web colors, don't convert to linear before uploading to GPU
colors[index] = color.into_u32();
}
offsets[index] = offset;
}
@ -139,16 +145,17 @@ pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
let mut offsets = [0.0f32; 8];
for (index, stop) in linear.stops.iter().enumerate() {
// let [r, g, b, a] =
// color::pack(stop.map_or(Color::default(), |s| s.color))
// .components();
let (color, offset) = stop
.map_or((Color::default().into_u32(), 2.0), |s| {
(s.color.into_u32(), s.offset)
});
.map_or((Color::default(), 2.0), |s| (s.color, s.offset));
if color::GAMMA_CORRECTION {
//correct colors, convert to linear before uploading to GPU
colors[index] = color.into_linear_u32();
} else {
//web colors, don't convert to linear before uploading to GPU
colors[index] = color.into_u32();
}
colors[index] = color;
offsets[index] = offset;
}