diff options
| -rw-r--r-- | graphics/Cargo.toml | 2 | ||||
| -rw-r--r-- | wgpu/Cargo.toml | 9 | ||||
| -rw-r--r-- | wgpu/src/image/vector.rs | 45 |
3 files changed, 36 insertions, 20 deletions
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index 73dc47bf..aac9ccf2 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -44,7 +44,7 @@ version = "0.12" optional = true [dependencies.font-kit] -version = "0.8" +version = "0.10" optional = true [package.metadata.docs.rs] diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 5f4699a8..d469da0a 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT AND OFL-1.1" repository = "https://github.com/hecrj/iced" [features] -svg = ["resvg"] +svg = ["resvg", "usvg"] canvas = ["iced_graphics/canvas"] qr_code = ["iced_graphics/qr_code"] default_system_font = ["iced_graphics/font-source"] @@ -40,8 +40,11 @@ version = "0.23" optional = true [dependencies.resvg] -version = "0.9" -features = ["raqote-backend"] +version = "0.12" +optional = true + +[dependencies.usvg] +version = "0.12" optional = true [package.metadata.docs.rs] diff --git a/wgpu/src/image/vector.rs b/wgpu/src/image/vector.rs index 95df2e99..ab0f67d0 100644 --- a/wgpu/src/image/vector.rs +++ b/wgpu/src/image/vector.rs @@ -3,7 +3,7 @@ use iced_native::svg; use std::collections::{HashMap, HashSet}; pub enum Svg { - Loaded(resvg::usvg::Tree), + Loaded(usvg::Tree), NotFound, } @@ -43,17 +43,15 @@ impl Cache { return self.svgs.get(&handle.id()).unwrap(); } - let opt = resvg::Options::default(); - let svg = match handle.data() { svg::Data::Path(path) => { - match resvg::usvg::Tree::from_file(path, &opt.usvg) { + match usvg::Tree::from_file(path, &Default::default()) { Ok(tree) => Svg::Loaded(tree), Err(_) => Svg::NotFound, } } svg::Data::Bytes(bytes) => { - match resvg::usvg::Tree::from_data(&bytes, &opt.usvg) { + match usvg::Tree::from_data(&bytes, &Default::default()) { Ok(tree) => Svg::Loaded(tree), Err(_) => Svg::NotFound, } @@ -101,23 +99,38 @@ impl Cache { // We currently rerasterize the SVG when its size changes. This is slow // as heck. A GPU rasterizer like `pathfinder` may perform better. // It would be cool to be able to smooth resize the `svg` example. - let screen_size = - resvg::ScreenSize::new(width, height).unwrap(); + let img = resvg::render( + tree, + if width > height { + usvg::FitTo::Width(width) + } else { + usvg::FitTo::Height(height) + }, + None, + )?; + let width = img.width(); + let height = img.height(); - let mut canvas = - resvg::raqote::DrawTarget::new(width as i32, height as i32); + let mut rgba = img.take().into_iter(); - resvg::backend_raqote::render_to_canvas( - tree, - &resvg::Options::default(), - screen_size, - &mut canvas, - ); + // TODO: Perform conversion in the GPU + let bgra: Vec<u8> = std::iter::from_fn(move || { + use std::iter::once; + + let r = rgba.next()?; + let g = rgba.next()?; + let b = rgba.next()?; + let a = rgba.next()?; + + Some(once(b).chain(once(g)).chain(once(r)).chain(once(a))) + }) + .flatten() + .collect(); let allocation = texture_atlas.upload( width, height, - bytemuck::cast_slice(canvas.get_data()), + bytemuck::cast_slice(bgra.as_slice()), device, encoder, )?; |