fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-20 11:28:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Carry group content across memo seams in an owned form

Browse Source
This commit is contained in:
Dennis Kobert
2026-08-27 11:27:26 +00:00
parent 20e70e7bc9
commit 92ec2069ad
6 changed files with 394 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
node-graph/nodes/gcore/src/memo.rs
View File

@@ -359,7 +359,11 @@ mod tests {
let value = unsafe { core_types::record::borrow_element::<Payload>(core_types::record::Rec::new(ptr)) };
Box::new(Payload(value.0.clone(), value.1 + 1))
}
core_types::record::register_deep_element_clone::<Payload>(deep);
unsafe fn deep_repark(value: &(dyn std::any::Any + Send + Sync), dst: *mut u8, arena: &Arena) -> Option<()> {
let value = value.downcast_ref::<Payload>().expect("an element replays at its own type");
unsafe { core_types::record::write_element(dst, Payload(value.0.clone(), value.1 + 1), arena) }
}
core_types::record::register_deep_element_clone::<Payload>(deep, deep_repark);
let arena = Arena::new(4096).unwrap();
let generations = [];
@@ -371,7 +375,7 @@ mod tests {
let memoized = core_types::record::RecordExtract::<Payload, _>::new(memoized, &layout);
assert_eq!(memoized.eval(&ctx), GPoll::Final(Payload("deep".to_string(), 0)), "the miss serves the live value");
assert_eq!(memoized.eval(&ctx), GPoll::Final(Payload("deep".to_string(), 1)), "the hit replays the deep copy");
assert_eq!(memoized.eval(&ctx), GPoll::Final(Payload("deep".to_string(), 2)), "the hit replays through both halves of the deep glue");
}
#[test]

25
node-graph/nodes/graphic/src/record.rs
View File

@@ -743,7 +743,7 @@ mod tests {
}
#[test]
fn a_group_element_deep_copies_to_its_legacy_form() {
fn a_group_element_deep_copies_to_its_owned_form_and_replays() {
let arena = Arena::new(1 << 16).unwrap();
let generations = [];
let scope = scope_fixture(&generations, &arena);
@@ -763,12 +763,25 @@ mod tests {
panic!("expected a final record");
};
let copy = unsafe { (out.element.clone_out)(out.rec(&value).ptr()) };
let Graphic::Graphic(list) = *copy.downcast::<Graphic>().expect("the deep copy replays at the element's own type") else {
panic!("expected the legacy-converted form");
let replay_arena = Arena::new(1 << 16).unwrap();
let mut slot = [0u8; 8];
unsafe { (out.element.repark)(&*copy, slot.as_mut_ptr(), &replay_arena) }.expect("the arena holds the replay");
// SAFETY: the re-park wrote a parked `Graphic` element into `slot`.
let Graphic::Group(group) = (unsafe { record::borrow_element::<Graphic>(record::Rec::new(slot.as_ptr())) }) else {
panic!("the replay restores the group element");
};
assert_eq!(list.len(), 2);
assert_eq!(text_of(list.element(0).unwrap()), "a");
assert_eq!(text_of(list.element(1).unwrap()), "b");
let record::GroupContent::Run(item) = &group.content else {
panic!("expected a single run");
};
assert_eq!(item.len(), 2);
let lanes = item.typed_lanes::<Graphic>().expect("the run holds the adopted graphic lanes");
let offset = item.layout().offset_of(ATTR_TRANSFORM, 0).unwrap();
for (lane, (label, x)) in [("a", 1.), ("b", 2.)].into_iter().enumerate() {
assert_eq!(text_of(lanes.element_ref(lane)), label, "lane {lane}");
let transform: DAffine2 = unsafe { item.lanes().get(lane).rec().read(offset) };
assert_eq!(transform.translation.x, x, "lane {lane}");
}
}
#[test]