pauljd/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-11-08 08:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

.ai import: a placed file's tick operator gets its own method

Browse Source
This commit is contained in:
bflatastic
2026-11-02 14:32:56 +07:00
parent 01bc69cc80
commit 71d706fdcc
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/eps/src/import/ai/read/ops.rs
+17 -13
View File
@@ -57,6 +57,22 @@ impl<'a> Reader<'a> {
self.end_layer_in_mask()
}
/// A placed file's `` ` ``: its matrix, box and path; a second one, or operands of another
/// shape, leave it unreadable.
fn place_tick(&mut self, vals: &[V], hidden: bool) {
let unseen = hidden || self.gs.hidden || !self.shown();
let p = self.place.get_or_insert_with(|| Place { hidden: unseen, ..Place::default() });
if p.ticked {
p.broken = true;
} else {
p.ticked = true;
match tick(vals) {
Some((m, b, path)) => (p.matrix, p.bounds, p.path) = (Some(m), Some(b), path),
None => p.broken = true,
}
}
}
pub(super) fn op(&mut self, w: &str, hidden: bool) -> Result<(), String> {
if self.blend_record.is_some() {
self.end_blend();
@@ -291,19 +307,7 @@ impl<'a> Reader<'a> {
// `[a b c d tx ty] llx lly urx ury (path) `` ` ``, three more numbers before the path in
// newer files: the version 7 form has no `%AI5_BeginPlace` before it. Before the art,
// the setup's procedures run.
"`" if self.place.is_some() || !self.frames.is_empty() => {
let unseen = hidden || self.gs.hidden || !self.shown();
let p = self.place.get_or_insert_with(|| Place { hidden: unseen, ..Place::default() });
if p.ticked {
p.broken = true;
} else {
p.ticked = true;
match tick(&vals) {
Some((m, b, path)) => (p.matrix, p.bounds, p.path) = (Some(m), Some(b), path),
None => p.broken = true,
}
}
}
"`" if self.place.is_some() || !self.frames.is_empty() => self.place_tick(&vals, hidden),
"~" if self.place.is_some() => self.end_place(hidden)?,
// Type in the legacy format.
"To" => self.begin_text(&vals, hidden),