diff options
Diffstat (limited to '')
| -rw-r--r-- | wgpu/src/geometry.rs | 46 | ||||
| -rw-r--r-- | wgpu/src/layer.rs | 32 | ||||
| -rw-r--r-- | wgpu/src/layer/quad.rs | 4 |
3 files changed, 8 insertions, 74 deletions
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs index d1d4fd3c..740ec20c 100644 --- a/wgpu/src/geometry.rs +++ b/wgpu/src/geometry.rs @@ -7,6 +7,7 @@ use crate::graphics::geometry::{ use crate::graphics::primitive::{self, Primitive}; use crate::graphics::Gradient; +use iced_graphics::gradient; use lyon::geom::euclid; use lyon::tessellation; use std::borrow::Cow; @@ -74,7 +75,7 @@ impl BufferStack { Box::new(tessellation::BuffersBuilder::new( buffer, GradientVertex2DBuilder { - gradient: pack_gradient(gradient), + gradient: gradient.pack(), }, )) } @@ -97,7 +98,7 @@ impl BufferStack { Box::new(tessellation::BuffersBuilder::new( buffer, GradientVertex2DBuilder { - gradient: pack_gradient(gradient), + gradient: gradient.pack(), }, )) } @@ -490,7 +491,7 @@ impl Frame { } struct GradientVertex2DBuilder { - gradient: [f32; 44], + gradient: gradient::Packed, } impl tessellation::FillVertexConstructor<primitive::GradientVertex2D> @@ -623,42 +624,3 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path { ); }) } - -/// Packs the [`Gradient`] for use in shader code. -fn pack_gradient(gradient: &Gradient) -> [f32; 44] { - match gradient { - Gradient::Linear(linear) => { - let mut pack: [f32; 44] = [0.0; 44]; - let mut offsets: [f32; 8] = [2.0; 8]; - - for (index, stop) in linear.stops.iter().enumerate() { - let [r, g, b, a] = stop - .map_or(crate::core::Color::default(), |s| s.color) - .into_linear(); - - pack[index * 4] = r; - pack[(index * 4) + 1] = g; - pack[(index * 4) + 2] = b; - pack[(index * 4) + 3] = a; - - offsets[index] = stop.map_or(2.0, |s| s.offset); - } - - pack[32] = offsets[0]; - pack[33] = offsets[1]; - pack[34] = offsets[2]; - pack[35] = offsets[3]; - pack[36] = offsets[4]; - pack[37] = offsets[5]; - pack[38] = offsets[6]; - pack[39] = offsets[7]; - - pack[40] = linear.start.x; - pack[41] = linear.start.y; - pack[42] = linear.end.x; - pack[43] = linear.end.y; - - pack - } - } -} diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs index 980d807b..bf5c4c0a 100644 --- a/wgpu/src/layer.rs +++ b/wgpu/src/layer.rs @@ -13,6 +13,7 @@ pub use text::Text; use crate::core; use crate::core::alignment; use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector}; +use crate::graphics::gradient; use crate::graphics::{Primitive, Viewport}; /// A group of primitives that should be clipped together. @@ -182,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(), @@ -310,32 +311,3 @@ impl<'a> Layer<'a> { } } } - -/// Packs the [`Gradient`] for use in shader code. -fn pack_gradient(gradient: &core::Gradient, bounds: Rectangle) -> [f32; 44] { - match gradient { - core::Gradient::Linear(linear) => { - let mut pack: [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(); - - pack[index * 4] = r; - pack[(index * 4) + 1] = g; - pack[(index * 4) + 2] = b; - pack[(index * 4) + 3] = a; - pack[32 + index] = stop.map_or(2.0, |s| s.offset); - } - - let (start, end) = linear.angle.to_distance(&bounds); - - pack[40] = start.x; - pack[41] = start.y; - pack[42] = end.x; - pack[43] = end.y; - - pack - } - } -} diff --git a/wgpu/src/layer/quad.rs b/wgpu/src/layer/quad.rs index 9913cfe0..0bf7837a 100644 --- a/wgpu/src/layer/quad.rs +++ b/wgpu/src/layer/quad.rs @@ -1,5 +1,5 @@ //! A rectangle with certain styled properties. - +use crate::graphics::gradient; use bytemuck::{Pod, Zeroable}; /// The properties of a quad. @@ -38,7 +38,7 @@ pub struct Solid { #[repr(C)] pub struct Gradient { /// The background gradient data of the quad. - pub gradient: [f32; 44], + pub gradient: gradient::Packed, /// The [`Quad`] data of the [`Gradient`]. pub quad: Quad, |