mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-25 02:37:00 -06:00
Conflicts resolved per file (both sides kept unless noted):
crates/engine/src/atomic.rs | 1 | main's: `write_file` removed (main routes command writes through `crate::io::write_file`); its one caller in file.rs now uses `crate::io::write_file`
crates/engine/src/cmd/datamerge/fill.rs | 1 | next's `Graphic` literal (has `clip` and `wrap`, which next's `Graphic` carries)
crates/engine/src/cmd/datamerge/mod.rs | 1 | main's `read_path_capped` (crate::io metadata/read_capped, roots checked); next's capped read is the same behaviour
crates/engine/src/cmd/datamerge/parse.rs | 1 | main's (`crate::io::metadata`, `crate::io::Metadata`)
crates/engine/src/cmd/edit.rs | 1 | next's `spread_param(p, "edit.paste")` (the second argument is the command id on both sides)
crates/engine/src/cmd/export.rs | 3 | main's: EPUB params doc, `toc_title` once (main's position; next's duplicate dropped)
crates/engine/src/cmd/file.rs | 7 | place doc: next's (lists page/rect/autoflow params #803 checks); next's recent-file functions + main's `foreign_document`; next's open (load_bytes, warnings, non-DesignCraft refusal) with main's checked `crate::io::read_file` for the bytes; main's `check_write` be
crates/engine/src/cmd/find.rs | 7 | main's Find scope (FindContext, scope/selection/story, continuation, UTF-8 repair) on next's `designcraft_compose::grep::Grep` (dialect GREP): find uses `find_all` capped at MAX_MATCHES, change uses `replacements`/`find_all` (literal change text not expanded), fin
crates/engine/src/cmd/fonts.rs | 1 | next's (`has_style`, resolved/replacement face); `has_style` already compares styles ignoring spacing and case, which is main's `same_style` fix; main's test kept
crates/engine/src/cmd/interchange.rs | 1 | next's `import_idml_report_with_previews` (previews for unreadable links)
crates/engine/src/cmd/layout.rs | 8 | pages.insert: main's overflow-safe `after` + next's checked `parent_ref`; main's duplicateSpread doc; layout.section: next's `SectionEdit` (already keeps unnamed settings, #717) with main's `d.repaginate()` moved into `SectionEdit::apply` (remove and set paths),
crates/engine/src/cmd/links.rs | 5 | next's links.list (no doc clone); main's `text_status` via crate::io; `use std::io::Read` dropped (unused after main's read_capped); test literals main's. `link_missing` (next) uses `crate::io::exists` for the file-guard scan
crates/engine/src/cmd/object.rs | 4 | object.fill/stroke tint-alone: main's (23e1680e7; out-of-range tint is an error, which main's test asserts); object.fit doc: next's (lists `axis`)
crates/engine/src/cmd/paths.rs | 1 | next's (shatai transform on outlines)
crates/engine/src/cmd/place_text.rs | 1 | next's `add_flow_frame` (used by autoflow)
crates/engine/src/cmd/preflight.rs | 2 | next's overset/unplacedStory issue (its `overset_location` already applies the parent transform main's #738 fix adds); next's two test modules kept with main's
crates/engine/src/cmd/scripts.rs | 1 | combined: next's `in_undo_step = false` (#406) + main's full rollback of a failed script (#709)
crates/engine/src/cmd/style.rs | 14 | param docs next's (gradient swatch.create, swatch stops, model colours); create_para next's; rename_style main's structure (rename entry, then `redirect_style_refs`), redirect has next's full reference set (cells, defaults, notes, TOC) + main's never-based-on-it
crates/engine/src/cmd/text.rs | 10 | main's selectSentence/Paragraph/Story + select_around; next's selectionAttrs (mixed) + main's openTypeFeatures/type.feature; main's comments; tracked typing: next's `reserve_command_text` + main's `insert_format_at`; empty-paragraph mark formatting main's (with `
crates/engine/src/cmd/thread.rs | 1 | next's `spread_param(p, "text.thread")`
crates/engine/src/dtd.rs | 1 | next's linear, depth-bounded `expand_parameter_entities` with main's budget (input + 1 MiB, `MAX_EXPANDED_BYTES`) and message ("expand the DTD beyond"); 16 MiB constant removed; both sides' tests pass on message
crates/engine/src/guard.rs | 2 | main's whole-transaction snapshot (docs, active, journal; #742) + next's `in_undo_step` restore; tests both
crates/engine/src/lib.rs | 5 | LoadedGraphic doc next's; next's `new_document_preview`; execute: main's `discard_stale_find_scope()` before next's nested-undo run; modules both (tests_autosize, tests_file_guard, tests_params, tests_roots)
crates/engine/src/recovery.rs | 1 | next's test (superset of main's assertion)
crates/engine/src/tests.rs | 4 | moved tests deduplicated (identical on both sides); next's preflight and direct-selection/kerning tests + main's style-delete, locked-frame and baseline-fit tests
crates/engine/src/tests_idml.rs | 3 | main's order (drop cap and margins tests identical on both sides, once each)
crates/ui-egui/src/canvas.rs | 3 | next's screen_options/DisplayKey block and tests kept; two tests that auto-merge had added twice (parent_guides_on_a_page_are_not_picked_there, baseline_grid_lines_are_the_ones_on_the_page) kept once; main's `typing`/`screen_at`/`click` helpers and its tests clicks
crates/ui-egui/src/control.rs | 3 | main's `count` check and pending budget (control queue + synthetic queue); exact-budget test runs both sides' cases (click 255 on 9,492 pending; drag 9492×255)
crates/ui-egui/src/cursors.rs | 1 | main's (same Pen cursor set)
crates/ui-egui/src/dialogs.rs | 14 | dialog body (newDocument … alert match) is next's text, with main's Find/Change scope reset (`set_field`, `reset_find_scope`, `find_change_params`) and main's Create Guides / Margins and Columns arms ported in; `Dialog::new` ruby section (next) + main's `set_fi
crates/ui-egui/src/i18n.rs | 7 | ka and pl modules, languages, statics and lookups both; `category_first` covers uk, ru, pl, ka and `count_label` keeps next's Czech plurals; shared TABLE union; next's duplicate rows for Auto, Number:, Gutter:, Top:, Bottom:, Inside:, Outside:, Left:, Right: dropped
crates/ui-egui/src/i18n/ar.rs | 2 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/it.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/ja.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/pt_br.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/uk.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/icons.rs | 2 | both tests (main's typography icon, next's distribute icons)
crates/ui-egui/src/lib.rs | 11 | UiState: next's tabs_panel + main's last_color/last_gradient; `cursors` field once; next's SVG paste and paste-on-spread-in-view; next's extensionless document open; opens_as_document next's comment; tests both (next's control bar / key-name tests, main's rich black
crates/ui-egui/src/menus.rs | 15 | app.language doc next's text with pl and ka; UI_COMMANDS both (next's Tabs, Toggle Presentation, Apply None text; main's panel commands, Apply Color, Apply Gradient); Edit › Interface Language stays out (next moved it to Preferences); Type menu main's order with
crates/ui-egui/src/panels/glyphs.rs | 1 | next's (already has main's scroll-bar fix); the scroll-bar test module auto-merge had added twice kept once
crates/ui-egui/src/panels/layers.rs | 3 | next's drag-and-drop `object_rows`, with main's features ported into it: selection reveal (layer opens, row scrolls into view once), selected rows highlighted (also a group whose member is selected), double-click rename in place (`object.rename` queued like
crates/ui-egui/src/panels/mod.rs | 6 | tabs + typography modules and color_panel_tests; SelInfo has wrap_side/wrap_contour and wrap_offsets (offsets from the graphic's own wrap when it is selected); next's swatch_picker returning the chip response; next's content_selection_tests
crates/ui-egui/src/panels/pages.rs | 1 | next's (parents dragged by id)
crates/ui-egui/src/panels/properties.rs | 4 | next's swatch popup (Apply To, Tint); main's four wrap offsets then next's Wrap To / Contour Type; test fixtures main's (`..Default::default()`, no unused builder)
crates/ui-egui/src/panels/swatches.rs | 3 | main's Delete Swatch button + next's New Swatch comment; next's draggable rows; click: main's PICKED + fill/stroke in front, with next's no-apply on double-click
crates/ui-egui/src/toolbar.rs | 2 | main's Apply Color / Gradient / None wells and functions; next's apply_none doc line
crates/compose/src/lib.rs | 5 | next's line loop kept (mark_leading + last_line_mark, wrap segments/carry, grid gyoudori); main's mark-chars base_leading block (auto-merged) stays beside it. `fits`: next's #106 rule (baseline fit for horizontal frames, full descent for paths, vertical text, footnote
crates/compose/src/tests.rs | 5 | next's tests (tombstone set, sliver/one-sided/contour/clipping wrap tests, borders, lists, kenten, grid, anchored wrap, balance, shaped frames) plus main's an_empty_last_paragraph_isnt_overset; main's wrap_object_beside_one_narrow_column_leaves_the_other_alone re-ad
crates/doc/src/assets.rs | 1 | main's doc comment (same meaning)
crates/doc/src/build.rs | 3 | parent_page_for: next's parent_page_for_side (RTL-aware); single_sided_page_shows_first_parent_page test kept once, at main's position
crates/doc/src/item.rs | 1 | next's rotated_group_bounds_follow_the_children_outlines test kept
crates/doc/src/lib.rs | 1 | next's kerning_increment field kept; main's "Bulleted & Numbered" wording
crates/doc/src/page.rs | 1 | next's outer_page_indices + parent_page_for_side (integration of parent-margins with rtl-master-sides); main's parent_page_index dropped, its only caller (build.rs) uses parent_page_for_side
crates/doc/src/slice.rs | 5 | extract: next's `marked()` (get-based, fix_notes/fix_endnotes/fix_marks; main's version indexed slices and could panic); insert_story: main's take() limit on endnote/editorial payload copies with next's id comment, redundant `let ne`/`let nn` dropped; main's excess_note
crates/geom/src/corners.rs | 1 | next's box_outline_rounds_only_closed_corners test kept
crates/render/src/damage.rs | 1 | next's wrapping-anchored-object damage test kept
crates/render/src/fx.rs | 2 | feather: next's choke/corners sigma+join inside main's structure (body and clip at device resolution, with_filters(.., None)); inner glow centre: next's blend `mix` with main's clip argument (bp, xf)
crates/render/src/lib.rs | 3 | next's layer comment; next's front baseline grid draw after items; gradient match on g.kind (main's tuple scrutinee did not match the single-pattern arms)
crates/render/src/text.rs | 5 | paint_glyphs: main's paint_stroke closure structure with next's stroke overprint (overprinting helper, stroke `(TextPaint, bool)`); callers pass next's overprint_fill/overprint_stroke
crates/render/tests/placed_pdf.rs | 1 | main's `near` helper version
crates/tools/src/lib.rs | 1 | main's (PenConvert already declared below, avoids a duplicate variant)
crates/tools/src/pen.rs | 1 | main's module doc
crates/tools/src/select.rs | 1 | next's Drag::Corner variant (live corners) kept
crates/tools/src/tests.rs | 4 | next's tests (content drag, live corners, table border drag, eyedropper matchFrom, fitting handles, pen cursors once); eyedropper_ignores_inactive keeps next's samples_image check (main's exact-JSON compare lacks matchFrom) with main's `..Default::default()` Asset lit
crates/tools/src/text.rs | 2 | next's table border drag (BorderDrag, border_at) kept, then main's comment on locked text frames
crates/tools/src/xform.rs | 2 | main's explicit `Vec<&Item>` for shown children; next's eyedropper matchFrom (integration 796e9d713)
Cargo.toml | 2 | main's craft-pdf workspace dep added (craft-print stays once, in next's craft-libs block); [patch.crates-io] keeps next's winit (rust-windowing #4694 backport) and adds main's krilla patch; main's skylartaylor winit left out (see UNSURE 1)
Cargo.lock | 1 | union: next's craft-atomic and craft-cms entries plus main's craft-pdf entry; needs `cargo` normalisation
README.md | 1 | Open bullet combines INDD import via indd-utils (next) and editable PowerPoint export (main); main's paragraph break kept
contributors/people.toml | 1 | both people kept (switch87 from next, Nmarello from main)
apps/designcraft-cli/src/main.rs | 4 | next's `Export` enum dispatch kept; main's .pptx export added as `Export::Pptx` (run prints slides and warnings, script runs file.exportPptx); main's `--pdf-options` null-as-{} parse; usage lines list .pptx
apps/designcraft/src/main.rs | 3 | `startup.leave()` right after `app.ui` (main #380) and next's macOS `sync_movable` kept after the IME discard; next's Apple Events install kept; main's macOS Dock Quit `with_close_requested_on_terminate` block left out (needs the skylartaylor winit; UNSURE 1)
crates/fonts/src/fontdb.rs | 9 | FONT6 aliases (next) combined with #911 WWS names (main): ScannedFace and both CatalogEntry constructors carry `wws` and `aliases`; `canonical_family` falls back to WWS family names; `exact_style_traits` canonicalises then tries typographic, then WWS names (`named_st
crates/format/src/lib.rs | 1 | tests: both sides kept (next's r7a nullable-default tests; main's oversized ZIP entry/asset/entry-count tests)
crates/idml/src/import.rs | 11 | main's bounded `Package` reader under next's `import_idml_report_with_previews` (metadata read through `pkg.part`); next's `tab_list_repaired` kept; ruler origin: next's `settings.ruler_origin`, and main's guide import reads it (main's private `RulerOrigin` enum and
crates/idml/src/tests.rs | 6 | item-level union: all next tests plus main's new ones (ruler guides, package limits, CJK leading model, liquid page rules module, mojikumi); no test dropped
crates/mcp/src/backend.rs | 1 | test comment merged from both
crates/pdf/src/tests.rs | 1 | tests: both sides kept
crates/pdf/src/text.rs | 4 | next's (skew `tan`, cluster `start`, ruby overprint warning); main had no change here beyond base
crates/textimport/src/docx.rs | 5 | next's (ListCounter integration for list levels, page-break test position); main's side was the older form of the same code
crates/epub/src/lib.rs | 30 | non-test code is next's (StoryWriter holds img_src/images/no_alt/heading_ids; covers main's #787/#791/#782 fixes, plus #314 group transforms, anchored images in images_without_alt, endnote story skipped in the TOC); tests: next's set plus main's extra css_weight_style a
docs/control-protocol.md | 2 | next's rows (ui.paste, count 1–255, documentGrid) and wording
docs/file-format-parity.md | 1 | rows combined (next's ICC notes, main's TIFF indexed colour)
docs/gaps.md | 2 | status change notes unioned; Flex Layout removed from missing (main implemented it), next's Parent Options sentence kept
docs/localization-parity.md | 4 | Polish and Georgian rows; 5 languages beyond the twelve; file list includes cs and ka; both history rows
docs/roadmap.md | 1 | M1 next's (#186 fixed on next), M2 main's IME wording
docs/target-app-parity.md | 6 | next's status line; File formats row next's, UI/UX row main's (IME no longer failing); UI line next's plus main's Swatches detail; one Page tool line (main's fuller one); Load styles and main's fuller Pathfinder line both kept, main's duplicate short Pathfinder line r
docs/ui-parity.md | 1 | IME row main's, Font menu row next's
i18n/fr.rs: five rows dropped that main's shared table now has (Row, Open Path, Flex Layout, Current Page Number, Rulers).
377 lines
16 KiB
Rust
377 lines
16 KiB
Rust
//! Golden images for the soft object effects (drop shadow, outer glow, inner shadow, feather),
|
||
//! plus property checks and a multithreaded == single-threaded check.
|
||
//!
|
||
//! Goldens live in `tests/golden/*.png` and are compared with a tolerance (antialiasing and blur
|
||
//! rounding may differ by a few levels between SIMD levels). Regenerate them after an intended
|
||
//! change with `DESIGNCRAFT_BLESS=1 cargo test -p designcraft-render --test effects`.
|
||
|
||
use designcraft_compose::Cache;
|
||
use designcraft_doc::build::NewDocument;
|
||
use designcraft_doc::{Document, Fill, Item, ItemId, ParaFormat, Shape, SpreadRef};
|
||
use designcraft_geom::{Affine, Rect, Vec2, shapes};
|
||
use designcraft_render::{Placed, RenderOptions, Rendered, Renderer};
|
||
|
||
const SIZE: u32 = 160;
|
||
|
||
fn doc() -> Document {
|
||
Document::new(&NewDocument { width: 160.0, height: 160.0, facing_pages: false, ..Default::default() })
|
||
}
|
||
|
||
fn rect_item(d: &mut Document, r: Rect, swatch: &str) -> ItemId {
|
||
let id = ItemId(d.alloc());
|
||
let lid = d.default_layer();
|
||
let mut it = Item::new(id, lid, Shape::Rectangle, shapes::rectangle(r));
|
||
it.fill = Fill::swatch(swatch);
|
||
d.insert_item(SpreadRef::Doc(0), it, None).unwrap();
|
||
id
|
||
}
|
||
|
||
fn render_with(d: &Document, threads: u16) -> Rendered {
|
||
let mut r = Renderer::new();
|
||
r.threads = threads;
|
||
let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
|
||
r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], SIZE, SIZE, Affine::IDENTITY, &opts)
|
||
}
|
||
|
||
fn render(d: &Document) -> Rendered {
|
||
render_with(d, 0)
|
||
}
|
||
|
||
fn lum(p: [u8; 4]) -> u32 {
|
||
p[0] as u32 + p[1] as u32 + p[2] as u32
|
||
}
|
||
|
||
const WHITE: u32 = 765;
|
||
|
||
/// Tolerant comparison with `tests/golden/{name}.png` (written when missing or when blessing).
|
||
fn golden(name: &str, img: &Rendered) {
|
||
let path = format!("{}/tests/golden/{name}.png", env!("CARGO_MANIFEST_DIR"));
|
||
let bless = std::env::var_os("DESIGNCRAFT_BLESS").is_some();
|
||
let Ok(bytes) = std::fs::read(&path).map_err(|_| ()).and_then(|b| if bless { Err(()) } else { Ok(b) }) else {
|
||
std::fs::create_dir_all(format!("{}/tests/golden", env!("CARGO_MANIFEST_DIR"))).unwrap();
|
||
std::fs::write(&path, img.to_png()).unwrap();
|
||
eprintln!("wrote golden {path}");
|
||
return;
|
||
};
|
||
let want = image::load_from_memory(&bytes).unwrap().to_rgba8();
|
||
assert_eq!((want.width(), want.height()), (img.width, img.height), "{name}: size");
|
||
let got = img.to_straight();
|
||
let (mut bad, mut sum, mut worst) = (0usize, 0u64, 0u8);
|
||
for (a, b) in got.as_chunks::<4>().0.iter().zip(want.as_raw().as_chunks::<4>().0) {
|
||
let d = a.iter().zip(b).map(|(x, y)| x.abs_diff(*y)).max().unwrap();
|
||
sum += d as u64;
|
||
worst = worst.max(d);
|
||
if d > 8 {
|
||
bad += 1;
|
||
}
|
||
}
|
||
let n = (img.width * img.height) as usize;
|
||
let mean = sum as f64 / n as f64;
|
||
if bad * 200 > n || mean > 1.0 {
|
||
let out = std::env::temp_dir().join(format!("designcraft-golden-{name}.png"));
|
||
let _ = std::fs::write(&out, img.to_png());
|
||
panic!("{name}: {bad} pixels differ by > 8 (worst {worst}, mean {mean:.2}); got {}", out.display());
|
||
}
|
||
}
|
||
|
||
fn shadow_doc(spread: f64) -> Document {
|
||
let mut d = doc();
|
||
let id = rect_item(&mut d, Rect::new(30.0, 30.0, 100.0, 100.0), "C=100 M=0 Y=0 K=0");
|
||
let ds = &mut d.item_mut(id).unwrap().effects.drop_shadow;
|
||
ds.on = true;
|
||
ds.distance = 12.0;
|
||
ds.angle = 135.0;
|
||
ds.size = 10.0;
|
||
ds.spread = spread;
|
||
ds.opacity = 0.8;
|
||
d
|
||
}
|
||
|
||
#[test]
|
||
fn drop_shadow_is_soft_offset_and_under_the_object() {
|
||
let img = render(&shadow_doc(0.0));
|
||
golden("drop-shadow", &img);
|
||
// The object is unchanged on top.
|
||
let c = img.pixel(60, 60);
|
||
assert!(c[0] < 60 && c[2] > 200, "object on top: {c:?}");
|
||
// Below-right is shadowed, above-left is not.
|
||
assert!(lum(img.pixel(104, 70)) < 500, "shadow below-right: {:?}", img.pixel(104, 70));
|
||
assert_eq!(lum(img.pixel(22, 22)), WHITE);
|
||
// Soft: the shadow fades out gradually past its hard edge (100 + 8.5 offset).
|
||
let row: Vec<u32> = (104..130).map(|x| lum(img.pixel(x, 80))).collect();
|
||
let mid = row.iter().filter(|&&v| v > 60 && v < 700).count();
|
||
assert!(mid >= 6, "gradual falloff: {row:?}");
|
||
assert!(row.windows(2).all(|w| w[1] + 2 >= w[0]), "monotonic: {row:?}");
|
||
}
|
||
|
||
#[test]
|
||
fn drop_shadow_spread_hardens_and_grows() {
|
||
let soft = render(&shadow_doc(0.0));
|
||
let hard = render(&shadow_doc(100.0));
|
||
golden("drop-shadow-spread", &hard);
|
||
// Full spread: no blur, the silhouette grows by `size` → solid well past the offset edge.
|
||
let x = 100 + 8 + 6;
|
||
assert!(lum(hard.pixel(x, 80)) < lum(soft.pixel(x, 80)), "spread grows the shadow");
|
||
assert_eq!(lum(hard.pixel(126, 80)), WHITE, "hard edge");
|
||
}
|
||
|
||
#[test]
|
||
fn drop_shadow_of_text_follows_the_glyphs() {
|
||
let mut d = doc();
|
||
let lid = d.default_layer();
|
||
let (fid, sid) = d.add_text_frame(SpreadRef::Doc(0), Rect::new(10.0, 10.0, 150.0, 150.0), lid, "Shadow", ParaFormat::default()).unwrap();
|
||
d.story_mut(sid).unwrap().format_chars(0..6, |f| f.over.size = Some(40.0));
|
||
let ds = &mut d.item_mut(fid).unwrap().effects.drop_shadow;
|
||
ds.on = true;
|
||
ds.angle = 135.0;
|
||
ds.distance = 4.0;
|
||
ds.size = 3.0;
|
||
let img = render(&d);
|
||
golden("drop-shadow-text", &img);
|
||
// No frame-shaped shadow: the bottom-right of the (unfilled) frame is clear.
|
||
assert_eq!(lum(img.pixel(140, 140)), WHITE);
|
||
}
|
||
|
||
#[test]
|
||
fn outer_glow_surrounds_the_object() {
|
||
let mut d = doc();
|
||
let id = rect_item(&mut d, Rect::new(50.0, 50.0, 110.0, 110.0), "[Black]");
|
||
let g = &mut d.item_mut(id).unwrap().effects.outer_glow;
|
||
g.on = true;
|
||
g.size = 12.0;
|
||
g.color = "C=0 M=100 Y=0 K=0".into();
|
||
g.opacity = 1.0;
|
||
let img = render(&d);
|
||
golden("outer-glow", &img);
|
||
for (x, y) in [(46, 80), (114, 80), (80, 46), (80, 114)] {
|
||
let p = img.pixel(x, y);
|
||
assert!(p[1] < 200 && p[0] > p[1] + 40, "magenta glow at {x},{y}: {p:?}");
|
||
}
|
||
assert_eq!(lum(img.pixel(10, 10)), WHITE);
|
||
}
|
||
|
||
#[test]
|
||
fn inner_shadow_darkens_inside_the_lit_edge() {
|
||
let mut d = doc();
|
||
let id = rect_item(&mut d, Rect::new(30.0, 30.0, 130.0, 130.0), "C=0 M=0 Y=100 K=0");
|
||
let s = &mut d.item_mut(id).unwrap().effects.inner_shadow;
|
||
s.on = true;
|
||
s.angle = 135.0;
|
||
s.distance = 8.0;
|
||
s.size = 8.0;
|
||
s.opacity = 1.0;
|
||
let img = render(&d);
|
||
golden("inner-shadow", &img);
|
||
// Light from the top-left: the shadow sits inside the top-left edges.
|
||
assert!(lum(img.pixel(33, 80)) + 100 < lum(img.pixel(126, 80)), "{:?} vs {:?}", img.pixel(33, 80), img.pixel(126, 80));
|
||
assert!(lum(img.pixel(80, 33)) + 100 < lum(img.pixel(80, 126)));
|
||
// Nothing outside the shape.
|
||
assert_eq!(lum(img.pixel(26, 80)), WHITE);
|
||
}
|
||
|
||
#[test]
|
||
fn feather_fades_the_edge_inward() {
|
||
let mut d = doc();
|
||
let id = rect_item(&mut d, Rect::new(30.0, 30.0, 130.0, 130.0), "[Black]");
|
||
d.item_mut(id).unwrap().effects.feather = 16.0;
|
||
let img = render(&d);
|
||
golden("feather", &img);
|
||
d.item_mut(id).unwrap().effects.feather = 0.0;
|
||
let solid = lum(render(&d).pixel(80, 80));
|
||
let edge = lum(img.pixel(30, 80));
|
||
let mid = lum(img.pixel(38, 80));
|
||
let inside = lum(img.pixel(80, 80));
|
||
assert!(edge > 600, "nearly transparent at the path: {edge}");
|
||
assert!(mid > solid + 60 && mid < 650, "half way: {mid}");
|
||
assert!(inside <= solid + 6, "solid inside: {inside} vs {solid}");
|
||
assert_eq!(lum(img.pixel(27, 80)), WHITE, "nothing outside");
|
||
}
|
||
|
||
#[test]
|
||
fn shadow_of_an_object_outside_the_view_still_reaches_it() {
|
||
let mut d = doc();
|
||
let id = rect_item(&mut d, Rect::new(-60.0, 40.0, -2.0, 120.0), "[Paper]");
|
||
let ds = &mut d.item_mut(id).unwrap().effects.drop_shadow;
|
||
ds.on = true;
|
||
ds.angle = 180.0;
|
||
ds.distance = 20.0;
|
||
ds.size = 2.0;
|
||
ds.opacity = 1.0;
|
||
let img = render(&d);
|
||
assert!(lum(img.pixel(8, 80)) < 200, "{:?}", img.pixel(8, 80));
|
||
}
|
||
|
||
/// Points 70..90 of the page at 8 px a point (400% on a 2x screen), where a wide blur is drawn
|
||
/// offscreen at a lower resolution.
|
||
fn render_zoomed(d: &Document) -> Rendered {
|
||
let mut r = Renderer::new();
|
||
let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
|
||
let view = Affine::scale(8.0) * Affine::translate(Vec2::new(-70.0, -70.0));
|
||
r.render(d, &Cache::new(), &[Placed { spread: SpreadRef::Doc(0), xf: Affine::translate(Vec2::ZERO) }], SIZE, SIZE, view, &opts)
|
||
}
|
||
|
||
#[test]
|
||
fn a_wide_feather_keeps_the_object_sharp_at_high_zoom() {
|
||
let mut d = doc();
|
||
// A huge yellow frame holding a small black square (pt 78..82, px 64..96 when zoomed).
|
||
let id = rect_item(&mut d, Rect::new(-5000.0, -5000.0, 5160.0, 5160.0), "C=0 M=0 Y=100 K=0");
|
||
let kid = Item {
|
||
fill: Fill::swatch("[Black]"),
|
||
..Item::new(ItemId(d.alloc()), d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(78.0, 78.0, 82.0, 82.0)))
|
||
};
|
||
d.item_mut(id).unwrap().content = designcraft_doc::Content::Group { items: vec![std::sync::Arc::new(kid)] };
|
||
let plain = render_zoomed(&d);
|
||
// 3σ of a 1,000 pt feather is 6,000 px here, so its mask is drawn at about 1/6 resolution.
|
||
d.item_mut(id).unwrap().effects.feather = 1000.0;
|
||
let img = render_zoomed(&d);
|
||
let worst = plain.pixels.iter().zip(&img.pixels).map(|(a, b)| a.abs_diff(*b)).max().unwrap();
|
||
assert!(worst <= 4, "the inside of a feathered object matches the object: max channel difference {worst}");
|
||
}
|
||
|
||
#[test]
|
||
fn a_wide_inner_effect_stays_inside_the_shape_at_high_zoom() {
|
||
let mut d = doc();
|
||
// A black backdrop shows a screened glow; white paper shows a shadow.
|
||
let backdrop = rect_item(&mut d, Rect::new(0.0, 0.0, 160.0, 160.0), "[Black]");
|
||
// The shape's right edge is at pt 80, px 80 when zoomed.
|
||
let id = rect_item(&mut d, Rect::new(-2000.0, -2000.0, 80.0, 2160.0), "C=100 M=0 Y=0 K=0");
|
||
for glow in [false, true] {
|
||
d.item_mut(backdrop).unwrap().fill = Fill::swatch(if glow { "[Black]" } else { "[None]" });
|
||
let plain = render_zoomed(&d);
|
||
let e = &mut d.item_mut(id).unwrap().effects;
|
||
// 3σ is 24,000 px, so the effect is drawn at about 1/23 resolution.
|
||
if glow {
|
||
e.inner_glow.on = true;
|
||
e.inner_glow.size = 2000.0;
|
||
e.inner_glow.opacity = 1.0;
|
||
} else {
|
||
e.inner_shadow.on = true;
|
||
e.inner_shadow.color = "[Black]".into();
|
||
e.inner_shadow.distance = 0.0;
|
||
e.inner_shadow.size = 2000.0;
|
||
e.inner_shadow.opacity = 1.0;
|
||
}
|
||
let img = render_zoomed(&d);
|
||
assert_ne!(lum(img.pixel(78, 80)), lum(plain.pixel(78, 80)), "glow {glow}: the effect shows inside the edge");
|
||
for x in 81..110 {
|
||
assert_eq!(lum(img.pixel(x, 80)), lum(plain.pixel(x, 80)), "glow {glow}: nothing outside the edge at x {x}");
|
||
}
|
||
let e = &mut d.item_mut(id).unwrap().effects;
|
||
e.inner_glow.on = false;
|
||
e.inner_shadow.on = false;
|
||
}
|
||
}
|
||
|
||
/// Multithreaded contexts draw effects offscreen; the result must match single-threaded.
|
||
#[test]
|
||
fn multithreaded_effects_match_single_threaded() {
|
||
let mut docs = vec![shadow_doc(0.0), shadow_doc(40.0)];
|
||
let mut d = doc();
|
||
rect_item(&mut d, Rect::new(0.0, 0.0, 160.0, 160.0), "C=0 M=30 Y=60 K=0");
|
||
let id = rect_item(&mut d, Rect::new(30.0, 30.0, 130.0, 130.0), "C=100 M=0 Y=0 K=0");
|
||
{
|
||
let it = d.item_mut(id).unwrap();
|
||
it.effects.feather = 10.0;
|
||
it.effects.inner_shadow.on = true;
|
||
it.effects.outer_glow.on = true;
|
||
it.effects.drop_shadow.on = true;
|
||
it.opacity = 0.8;
|
||
}
|
||
docs.push(d);
|
||
for (i, d) in docs.iter().enumerate() {
|
||
let a = render_with(d, 0);
|
||
let b = render_with(d, 3);
|
||
let worst = a.pixels.iter().zip(&b.pixels).map(|(x, y)| x.abs_diff(*y)).max().unwrap();
|
||
assert!(worst <= 4, "case {i}: max channel difference {worst}");
|
||
}
|
||
}
|
||
|
||
/// A frame (30..130) holding a pasted-in black square that overhangs it (Edit › Paste Into).
|
||
fn pasted_into(d: &mut Document) -> ItemId {
|
||
let id = rect_item(d, Rect::new(30.0, 30.0, 130.0, 130.0), "[None]");
|
||
let kid = Item {
|
||
fill: Fill::swatch("[Black]"),
|
||
..Item::new(ItemId(d.alloc()), d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(0.0, 0.0, 160.0, 160.0)))
|
||
};
|
||
d.item_mut(id).unwrap().content = designcraft_doc::Content::Group { items: vec![std::sync::Arc::new(kid)] };
|
||
assert!(d.item(id).unwrap().has_nested_items());
|
||
id
|
||
}
|
||
|
||
#[test]
|
||
fn effects_apply_to_a_frame_with_pasted_in_items() {
|
||
let mut d = doc();
|
||
let id = pasted_into(&mut d);
|
||
let plain = render(&d);
|
||
let black = lum(plain.pixel(80, 80));
|
||
assert!(black < 200 && lum(plain.pixel(31, 80)) <= black + 6, "the content fills the frame: {:?} {:?}", plain.pixel(31, 80), plain.pixel(80, 80));
|
||
assert_eq!(lum(plain.pixel(27, 80)), WHITE, "clipped by the frame");
|
||
// Basic Feather fades the frame's edge, content and all.
|
||
d.item_mut(id).unwrap().effects.feather = 16.0;
|
||
let img = render(&d);
|
||
assert!(lum(img.pixel(30, 80)) > 600, "nearly transparent at the path: {:?}", img.pixel(30, 80));
|
||
assert!(lum(img.pixel(80, 80)) <= black + 6, "solid inside");
|
||
assert_eq!(lum(img.pixel(27, 80)), WHITE, "still clipped");
|
||
// Inner Glow: white screened in from the edges.
|
||
d.item_mut(id).unwrap().effects.feather = 0.0;
|
||
let g = &mut d.item_mut(id).unwrap().effects.inner_glow;
|
||
g.on = true;
|
||
g.size = 12.0;
|
||
g.opacity = 1.0;
|
||
let img = render(&d);
|
||
assert!(lum(img.pixel(32, 80)) > black + 150, "lit at the edge: {:?}", img.pixel(32, 80));
|
||
assert!(lum(img.pixel(80, 80)) <= black + 6, "dark in the middle");
|
||
// Drop shadow: cast by the content's silhouette, outside the frame.
|
||
d.item_mut(id).unwrap().effects.inner_glow.on = false;
|
||
let ds = &mut d.item_mut(id).unwrap().effects.drop_shadow;
|
||
ds.on = true;
|
||
ds.angle = 180.0;
|
||
ds.global_light = false;
|
||
ds.distance = 12.0;
|
||
ds.size = 0.0;
|
||
ds.opacity = 1.0;
|
||
let img = render(&d);
|
||
assert!(lum(img.pixel(136, 80)) < 300, "the shadow to the right: {:?}", img.pixel(136, 80));
|
||
}
|
||
|
||
#[test]
|
||
fn inner_glow_mode_and_technique() {
|
||
let mut d = doc();
|
||
let id = rect_item(&mut d, Rect::new(30.0, 30.0, 130.0, 130.0), "[Paper]");
|
||
let g = &mut d.item_mut(id).unwrap().effects.inner_glow;
|
||
g.on = true;
|
||
g.color = "[Black]".into();
|
||
g.opacity = 1.0;
|
||
g.size = 20.0;
|
||
// Screen (the default) can't darken white paper; Multiply can.
|
||
let screen = render(&d);
|
||
assert!(lum(screen.pixel(32, 80)) > 740, "{:?}", screen.pixel(32, 80));
|
||
d.item_mut(id).unwrap().effects.inner_glow.mode = designcraft_color::BlendMode::Multiply;
|
||
let soft = render(&d);
|
||
assert!(lum(soft.pixel(32, 80)) + 150 < lum(screen.pixel(32, 80)), "a dark edge: {:?}", soft.pixel(32, 80));
|
||
// Precise keeps the glow nearer the edge than Softer.
|
||
d.item_mut(id).unwrap().effects.inner_glow.technique = designcraft_doc::GlowTechnique::Precise;
|
||
let precise = render(&d);
|
||
assert!(lum(precise.pixel(42, 80)) > lum(soft.pixel(42, 80)) + 30, "{:?} vs {:?}", precise.pixel(42, 80), soft.pixel(42, 80));
|
||
}
|
||
|
||
#[test]
|
||
fn feather_choke_and_corners() {
|
||
let mut d = doc();
|
||
let id = rect_item(&mut d, Rect::new(30.0, 30.0, 130.0, 130.0), "[Black]");
|
||
d.item_mut(id).unwrap().effects.feather = 16.0;
|
||
let diffused = render(&d);
|
||
golden("feather", &diffused);
|
||
// Choke: half the width stays opaque, so the fade is shorter.
|
||
d.item_mut(id).unwrap().effects.feather_options.choke = 50.0;
|
||
let choked = render(&d);
|
||
assert!(lum(choked.pixel(38, 80)) + 60 < lum(diffused.pixel(38, 80)), "{:?} vs {:?}", choked.pixel(38, 80), diffused.pixel(38, 80));
|
||
assert!(lum(choked.pixel(30, 80)) > 500, "still transparent at the path");
|
||
// Sharp corners keep more of the corner than Rounded ones (past the fade, near the corner).
|
||
d.item_mut(id).unwrap().effects.feather_options = designcraft_doc::FeatherOptions { choke: 0.0, corners: designcraft_doc::FeatherCorners::Sharp };
|
||
let sharp = render(&d);
|
||
d.item_mut(id).unwrap().effects.feather_options.corners = designcraft_doc::FeatherCorners::Rounded;
|
||
let rounded = render(&d);
|
||
assert!(lum(sharp.pixel(41, 41)) + 20 < lum(rounded.pixel(41, 41)), "{:?} vs {:?}", sharp.pixel(41, 41), rounded.pixel(41, 41));
|
||
}
|