diff --git a/crates/render/src/fx/tests.rs b/crates/render/src/fx/tests.rs index 3c2e9ff65a..1832f18580 100644 --- a/crates/render/src/fx/tests.rs +++ b/crates/render/src/fx/tests.rs @@ -1010,7 +1010,7 @@ fn an_edit_out_of_sight_builds_nothing() { let drawn_hidden = extruded(&mut d, 70.0); let ids = [d.insert(Some(l), 0, hidden).unwrap(), group.children().unwrap()[0].id, d.insert(Some(l), 0, drawn_hidden).unwrap()]; d.insert(Some(l), 0, group).unwrap(); - let opts = RenderOptions { hidden: vec![ids[2]], ..Default::default() }; + let opts = RenderOptions { hidden: [ids[2]].into(), ..Default::default() }; let mut r = Renderer::new(); r.render(&d, 100, 100, Affine::IDENTITY, &opts); let mut e = d.clone(); diff --git a/crates/render/src/options.rs b/crates/render/src/options.rs index 671c9b6b97..6f0f7cde99 100644 --- a/crates/render/src/options.rs +++ b/crates/render/src/options.rs @@ -1,3 +1,5 @@ +use std::collections::HashSet; + use super::geometry::region_pixels; use super::{Arc, NodeId, Rect, encode, proof}; @@ -39,8 +41,8 @@ pub struct RenderOptions { pub background: Option<[u8; 4]>, /// Draw artboards as white rectangles (screen view). Export sets this to false. pub artboards: bool, - /// Objects not to draw (e.g. the object being edited by a live drag preview). - pub hidden: Vec, + /// Objects not to draw (e.g. the layers and fold lines the Fold Preview's print leaves out). + pub hidden: HashSet, /// Draw the layers as their Layer Options show them on screen: Preview off in outline, Dim /// Images fading their images (a template layer's too), a template in Preview in Outline view. pub dim_templates: bool, @@ -194,7 +196,7 @@ impl Default for RenderOptions { outline: false, background: None, artboards: false, - hidden: vec![], + hidden: HashSet::new(), dim_templates: true, proof: None, overprint_preview: false, diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs index d3c9b708d5..d63f9e91b4 100644 --- a/crates/render/src/tests.rs +++ b/crates/render/src/tests.rs @@ -224,6 +224,33 @@ fn hidden_and_culled() { assert_eq!(rr.stats.culled, 1); } +#[test] +fn a_render_leaves_out_every_object_of_a_large_hidden_set() { + // 2,000 one-pixel-wide strips; the strips in even columns are in `hidden`. + let mut d = Document::new(100.0, 100.0); + let l = d.layers[0].id; + let mut hidden = std::collections::HashSet::new(); + for row in 0..20 { + for col in 0..100 { + let r = Rect::new(f64::from(col), f64::from(row * 5), f64::from(col + 1), f64::from(row * 5 + 5)); + let n = rect_node(&mut d, r, Paint::solid(Color::BLACK), Paint::None, 0.0); + let id = d.insert(Some(l), usize::MAX, n).unwrap(); + if col % 2 == 0 { + hidden.insert(id); + } + } + } + assert_eq!(hidden.len(), 1_000); + let opts = RenderOptions { hidden, ..Default::default() }; + let r = Renderer::new().render(&d, 100, 100, Affine::IDENTITY, &opts); + for row in 0..20 { + for col in 0..100 { + let want = if col % 2 == 0 { [0, 0, 0, 0] } else { [0, 0, 0, 255] }; + assert_eq!(r.pixel(col, row * 5 + 2), want, "column {col}, row {row}"); + } + } +} + /// A document with symbol "Far" holding a red rectangle `art`, and an instance of it moved by /// (-50, -50): its 20 × 20 square, (-60, -60) to (-40, -40), lies outside a view of the page. fn far_instance(art: Rect) -> Document { diff --git a/crates/render/tests/it/golden.rs b/crates/render/tests/it/golden.rs index d6962e0e67..a9dcb7af63 100644 --- a/crates/render/tests/it/golden.rs +++ b/crates/render/tests/it/golden.rs @@ -473,7 +473,7 @@ fn invisible_and_hidden_nodes_are_not_drawn() { let mut b = DocBuilder::new(100.0, 100.0); let id = b.rect(Rect::new(0.0, 0.0, 100.0, 100.0), Color::BLACK, |_| {}); let d = b.build(); - let opts = vectorcraft_render::RenderOptions { background: Some([255, 255, 255, 255]), hidden: vec![id], ..Default::default() }; + let opts = vectorcraft_render::RenderOptions { background: Some([255, 255, 255, 255]), hidden: [id].into(), ..Default::default() }; let r = vectorcraft_render::Renderer::new().render(&d, 100, 100, vectorcraft_geom::Affine::IDENTITY, &opts); assert_eq!(Image::from_rendered(&r).ink(), 0); } diff --git a/crates/ui-egui/src/addons/packaging/preview.rs b/crates/ui-egui/src/addons/packaging/preview.rs index 97a8ebd988..cb6e9daca2 100644 --- a/crates/ui-egui/src/addons/packaging/preview.rs +++ b/crates/ui-egui/src/addons/packaging/preview.rs @@ -275,7 +275,7 @@ impl Cache { let opts = vectorcraft_render::RenderOptions { skip_templates: true, image_mips: true, - hidden: vectorcraft_engine::cmd::print_hidden(doc, key.fold_lines), + hidden: vectorcraft_engine::cmd::print_hidden(doc, key.fold_lines).into_iter().collect(), ..Default::default() }; if let Some(w) = &self.worker {