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

Make Packed fully opaque

Browse source 
... by only allowing direct conversion from our `Gradient` types
This commit is contained in:
Héctor Ramón Jiménez 2023-05-29 20:56:51 +02:00
parent 902e333148
commit 8ca7b884c0
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 28 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

31
graphics/src/gradient.rs
View file

@ -4,7 +4,7 @@
//!
//! [`Gradient`]: crate::core::Gradient;
use crate::core::gradient::ColorStop;
use crate::core::{Color, Point};
use crate::core::{self, Color, Point, Rectangle};
use std::cmp::Ordering;
#[derive(Debug, Clone, PartialEq)]
@ -125,8 +125,31 @@ impl Linear {
#[repr(C)]
pub struct Packed([f32; 44]);
impl From<[f32; 44]> for Packed {
fn from(value: [f32; 44]) -> Self {
Self(value)
/// Creates a new [`Packed`] gradient for use in shader code.
pub fn pack(gradient: &core::Gradient, bounds: Rectangle) -> Packed {
match gradient {
core::Gradient::Linear(linear) => {
let mut data: [f32; 44] = [0.0; 44];
for (index, stop) in linear.stops.iter().enumerate() {
let [r, g, b, a] =
stop.map_or(Color::default(), |s| s.color).into_linear();
data[index * 4] = r;
data[(index * 4) + 1] = g;
data[(index * 4) + 2] = b;
data[(index * 4) + 3] = a;
data[32 + index] = stop.map_or(2.0, |s| s.offset);
}
let (start, end) = linear.angle.to_distance(&bounds);
data[40] = start.x;
data[41] = start.y;
data[42] = end.x;
data[43] = end.y;
Packed(data)
}
}
}

34
wgpu/src/layer.rs
View file

@ -183,7 +183,7 @@ impl<'a> Layer<'a> {
}
Background::Gradient(gradient) => {
let quad = quad::Gradient {
gradient: pack_gradient(
gradient: gradient::pack(
gradient,
Rectangle::new(
quad.position.into(),
@ -311,35 +311,3 @@ impl<'a> Layer<'a> {
}
}
}
/// Packs the [`Gradient`] for use in shader code.
fn pack_gradient(
gradient: &core::Gradient,
bounds: Rectangle,
) -> gradient::Packed {
match gradient {
core::Gradient::Linear(linear) => {
let mut data: [f32; 44] = [0.0; 44];
for (index, stop) in linear.stops.iter().enumerate() {
let [r, g, b, a] =
stop.map_or(Color::default(), |s| s.color).into_linear();
data[index * 4] = r;
data[(index * 4) + 1] = g;
data[(index * 4) + 2] = b;
data[(index * 4) + 3] = a;
data[32 + index] = stop.map_or(2.0, |s| s.offset);
}
let (start, end) = linear.angle.to_distance(&bounds);
data[40] = start.x;
data[41] = start.y;
data[42] = end.x;
data[43] = end.y;
data.into()
}
}
}