From 75ae0de9bdd3376b6e537bf59030059c926114ee Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Wed, 16 Nov 2022 17:42:41 +0100 Subject: feat: SVG styling with icon fill color --- graphics/src/image/vector.rs | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'graphics/src/image/vector.rs') diff --git a/graphics/src/image/vector.rs b/graphics/src/image/vector.rs index 42f4b500..5be5d3c7 100644 --- a/graphics/src/image/vector.rs +++ b/graphics/src/image/vector.rs @@ -7,6 +7,8 @@ use iced_native::Size; use std::collections::{HashMap, HashSet}; use std::fs; +type Fill = Option<[u8; 4]>; + /// Entry in cache corresponding to an svg handle pub enum Svg { /// Parsed svg @@ -33,9 +35,9 @@ impl Svg { #[derive(Debug)] pub struct Cache { svgs: HashMap, - rasterized: HashMap<(u64, u32, u32), T::Entry>, + rasterized: HashMap<(u64, u32, u32, Fill), T::Entry>, svg_hits: HashSet, - rasterized_hits: HashSet<(u64, u32, u32)>, + rasterized_hits: HashSet<(u64, u32, u32, Fill)>, } impl Cache { @@ -88,15 +90,18 @@ impl Cache { (scale * height).ceil() as u32, ); + let appearance = handle.appearance(); + let fill = appearance.fill.map(crate::Color::into_rgba8); + // TODO: Optimize! // 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. - if self.rasterized.contains_key(&(id, width, height)) { + if self.rasterized.contains_key(&(id, width, height, fill)) { let _ = self.svg_hits.insert(id); - let _ = self.rasterized_hits.insert((id, width, height)); + let _ = self.rasterized_hits.insert((id, width, height, fill)); - return self.rasterized.get(&(id, width, height)); + return self.rasterized.get(&(id, width, height, fill)); } match self.load(handle) { @@ -121,15 +126,28 @@ impl Cache { img.as_mut(), )?; - let allocation = - storage.upload(width, height, img.data(), state)?; + let mut rgba = img.take(); + + if let Some(color) = fill { + rgba.chunks_exact_mut(4).for_each(|rgba| { + if rgba[3] > 0 { + rgba[0] = color[0]; + rgba[1] = color[1]; + rgba[2] = color[2]; + } + }); + } + + let allocation = storage.upload(width, height, &rgba, state)?; log::debug!("allocating {} {}x{}", id, width, height); let _ = self.svg_hits.insert(id); - let _ = self.rasterized_hits.insert((id, width, height)); - let _ = self.rasterized.insert((id, width, height), allocation); + let _ = self.rasterized_hits.insert((id, width, height, fill)); + let _ = self + .rasterized + .insert((id, width, height, fill), allocation); - self.rasterized.get(&(id, width, height)) + self.rasterized.get(&(id, width, height, fill)) } Svg::NotFound => None, } -- cgit From b205a663471a8170d7b30cc59894425c09bea563 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 6 Dec 2022 04:34:00 +0100 Subject: Remove `appearance` from `Handle` ... and pass it directly to `Renderer::draw` instead. --- graphics/src/image/vector.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'graphics/src/image/vector.rs') diff --git a/graphics/src/image/vector.rs b/graphics/src/image/vector.rs index 5be5d3c7..0af5be01 100644 --- a/graphics/src/image/vector.rs +++ b/graphics/src/image/vector.rs @@ -1,5 +1,6 @@ //! Vector image loading and caching use crate::image::Storage; +use crate::Color; use iced_native::svg; use iced_native::Size; @@ -78,6 +79,7 @@ impl Cache { pub fn upload( &mut self, handle: &svg::Handle, + color: Option, [width, height]: [f32; 2], scale: f32, state: &mut T::State<'_>, @@ -90,18 +92,18 @@ impl Cache { (scale * height).ceil() as u32, ); - let appearance = handle.appearance(); - let fill = appearance.fill.map(crate::Color::into_rgba8); + let color = color.map(Color::into_rgba8); + let key = (id, width, height, color); // TODO: Optimize! // 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. - if self.rasterized.contains_key(&(id, width, height, fill)) { + if self.rasterized.contains_key(&key) { let _ = self.svg_hits.insert(id); - let _ = self.rasterized_hits.insert((id, width, height, fill)); + let _ = self.rasterized_hits.insert(key); - return self.rasterized.get(&(id, width, height, fill)); + return self.rasterized.get(&key); } match self.load(handle) { @@ -128,7 +130,7 @@ impl Cache { let mut rgba = img.take(); - if let Some(color) = fill { + if let Some(color) = color { rgba.chunks_exact_mut(4).for_each(|rgba| { if rgba[3] > 0 { rgba[0] = color[0]; @@ -142,12 +144,10 @@ impl Cache { log::debug!("allocating {} {}x{}", id, width, height); let _ = self.svg_hits.insert(id); - let _ = self.rasterized_hits.insert((id, width, height, fill)); - let _ = self - .rasterized - .insert((id, width, height, fill), allocation); + let _ = self.rasterized_hits.insert(key); + let _ = self.rasterized.insert(key, allocation); - self.rasterized.get(&(id, width, height, fill)) + self.rasterized.get(&key) } Svg::NotFound => None, } -- cgit From a2f71f42ba300cec5490050a471efeebf627d534 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 6 Dec 2022 04:42:25 +0100 Subject: Rename `Fill` to `ColorFilter` in `graphics::image::vector` --- graphics/src/image/vector.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'graphics/src/image/vector.rs') diff --git a/graphics/src/image/vector.rs b/graphics/src/image/vector.rs index 0af5be01..82d77aff 100644 --- a/graphics/src/image/vector.rs +++ b/graphics/src/image/vector.rs @@ -8,8 +8,6 @@ use iced_native::Size; use std::collections::{HashMap, HashSet}; use std::fs; -type Fill = Option<[u8; 4]>; - /// Entry in cache corresponding to an svg handle pub enum Svg { /// Parsed svg @@ -36,11 +34,13 @@ impl Svg { #[derive(Debug)] pub struct Cache { svgs: HashMap, - rasterized: HashMap<(u64, u32, u32, Fill), T::Entry>, + rasterized: HashMap<(u64, u32, u32, ColorFilter), T::Entry>, svg_hits: HashSet, - rasterized_hits: HashSet<(u64, u32, u32, Fill)>, + rasterized_hits: HashSet<(u64, u32, u32, ColorFilter)>, } +type ColorFilter = Option<[u8; 4]>; + impl Cache { /// Load svg pub fn load(&mut self, handle: &svg::Handle) -> &Svg { -- cgit