diff --git a/demo/common/src/lib.rs b/demo/common/src/lib.rs index c3635dfb..baa3d0d2 100644 --- a/demo/common/src/lib.rs +++ b/demo/common/src/lib.rs @@ -42,7 +42,7 @@ use pathfinder_renderer::options::{BuildOptions, RenderTransform}; use pathfinder_renderer::paint::Paint; use pathfinder_renderer::scene::{DrawPath, RenderTarget, Scene}; use pathfinder_resources::ResourceLoader; -use pathfinder_svg::BuiltSVG; +use pathfinder_svg::SVGScene; use pathfinder_ui::{MousePosition, UIEvent}; use std::fs::File; use std::io::{BufWriter, Read}; @@ -759,7 +759,7 @@ fn load_scene(resource_loader: &dyn ResourceLoader, input_path: &SVGPath, viewport_size: Vector2I, filter: Option) - -> (BuiltSVG, Tree) { + -> (SVGScene, Tree) { let mut data; match *input_path { SVGPath::Default => data = resource_loader.slurp(DEFAULT_SVG_VIRTUAL_PATH).unwrap(), @@ -778,7 +778,7 @@ fn load_scene(resource_loader: &dyn ResourceLoader, // FIXME(pcwalton): Rework how transforms work in the demo. The transform affects the final // composite steps, breaking this approach. fn build_svg_tree(tree: &Tree, viewport_size: Vector2I, filter: Option) - -> BuiltSVG { + -> SVGScene { let mut scene = Scene::new(); let filter_info = filter.map(|filter| { let scale = match filter { @@ -792,7 +792,7 @@ fn build_svg_tree(tree: &Tree, viewport_size: Vector2I, filter: Option Vector2F { window_size.device_size().to_f32() * 0.5 } -fn get_svg_building_message(built_svg: &BuiltSVG) -> String { +fn get_svg_building_message(built_svg: &SVGScene) -> String { if built_svg.result_flags.is_empty() { return String::new(); } diff --git a/demo/magicleap/src/immersive.rs b/demo/magicleap/src/immersive.rs index 891b92cc..90705330 100644 --- a/demo/magicleap/src/immersive.rs +++ b/demo/magicleap/src/immersive.rs @@ -24,7 +24,7 @@ use pathfinder_geometry::transform3d::Transform4F32; use pathfinder_geometry::transform3d::Perspective; use pathfinder_gpu::Device; use pathfinder_simd::default::F32x4; -use pathfinder_svg::BuiltSVG; +use pathfinder_svg::SVGScene; use pathfinder_renderer::scene::Scene; use pathfinder_renderer::builder::RenderTransform; @@ -58,7 +58,7 @@ impl ImmersiveDemo { let options = Options::get(); let svg_data = resources.slurp(DEFAULT_SVG_VIRTUAL_PATH)?; let tree = usvg::Tree::from_data(&svg_data[..], &usvg::Options::default())?; - let svg = BuiltSVG::from_tree(tree); + let svg = SVGScene::from_tree(tree); let svg_size = svg.scene.view_box.size(); let scene_thread_proxy = SceneThreadProxy::new(svg.scene, options); let _ = scene_thread_proxy.sender.send(MainToSceneMsg::SetDrawableSize(display.size())); diff --git a/demo/magicleap/src/lib.rs b/demo/magicleap/src/lib.rs index fdfc1065..ff8d9a0c 100644 --- a/demo/magicleap/src/lib.rs +++ b/demo/magicleap/src/lib.rs @@ -48,7 +48,7 @@ use pathfinder_renderer::options::RenderTransform; use pathfinder_resources::ResourceLoader; use pathfinder_resources::fs::FilesystemResourceLoader; use pathfinder_simd::default::F32x4; -use pathfinder_svg::BuiltSVG; +use pathfinder_svg::SVGScene; use std::collections::HashMap; use std::ffi::CStr; @@ -135,7 +135,7 @@ pub unsafe extern "C" fn magicleap_pathfinder_demo_load(app: *mut c_void, svg_fi struct MagicLeapPathfinder { renderers: HashMap<(EGLSurface, EGLDisplay), Renderer>, - svgs: HashMap, + svgs: HashMap, resources: FilesystemResourceLoader, } @@ -185,7 +185,7 @@ pub unsafe extern "C" fn magicleap_pathfinder_render(pf: *mut c_void, options: * let svg_filename = CStr::from_ptr(options.svg_filename).to_string_lossy(); let data = resources.slurp(&*svg_filename).unwrap(); let tree = Tree::from_data(&data, &UsvgOptions::default()).unwrap(); - BuiltSVG::from_tree(tree) + SVGScene::from_tree(tree) }); let mut width = 0; diff --git a/svg/src/lib.rs b/svg/src/lib.rs index 291bba80..859060c9 100644 --- a/svg/src/lib.rs +++ b/svg/src/lib.rs @@ -37,7 +37,7 @@ use usvg::{Transform as UsvgTransform, Tree, Visibility}; const HAIRLINE_STROKE_WIDTH: f32 = 0.0333; -pub struct BuiltSVG { +pub struct SVGScene { pub scene: Scene, pub result_flags: BuildResultFlags, pub clip_paths: HashMap, @@ -60,18 +60,18 @@ bitflags! { } } -impl BuiltSVG { +impl SVGScene { // TODO(pcwalton): Allow a global transform to be set. #[inline] - pub fn from_tree(tree: &Tree) -> BuiltSVG { - BuiltSVG::from_tree_and_scene(tree, Scene::new()) + pub fn from_tree(tree: &Tree) -> SVGScene { + SVGScene::from_tree_and_scene(tree, Scene::new()) } // TODO(pcwalton): Allow a global transform to be set. - pub fn from_tree_and_scene(tree: &Tree, scene: Scene) -> BuiltSVG { + pub fn from_tree_and_scene(tree: &Tree, scene: Scene) -> SVGScene { // TODO(pcwalton): Maybe have a `SVGBuilder` type to hold the clip path IDs and other - // transient data separate from `BuiltSVG`? - let mut built_svg = BuiltSVG { + // transient data separate from `SVGScene`? + let mut built_svg = SVGScene { scene, result_flags: BuildResultFlags::empty(), clip_paths: HashMap::new(), diff --git a/utils/convert/src/main.rs b/utils/convert/src/main.rs index f7923f69..e45432f9 100644 --- a/utils/convert/src/main.rs +++ b/utils/convert/src/main.rs @@ -2,7 +2,7 @@ use std::fs::File; use std::io::{Read, BufWriter}; use std::error::Error; use std::path::PathBuf; -use pathfinder_svg::BuiltSVG; +use pathfinder_svg::SVGScene; use pathfinder_export::{Export, FileFormat}; use usvg::{Tree, Options}; @@ -13,7 +13,7 @@ fn main() -> Result<(), Box> { let mut data = Vec::new(); File::open(input)?.read_to_end(&mut data)?; - let svg = BuiltSVG::from_tree(&Tree::from_data(&data, &Options::default()).unwrap()); + let svg = SVGScene::from_tree(&Tree::from_data(&data, &Options::default()).unwrap()); let scene = &svg.scene; let mut writer = BufWriter::new(File::create(&output)?);