fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-03 01:18:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Carry only the element in the map vararg

Browse Source
This commit is contained in:
Dennis Kobert
2026-08-21 12:19:54 +00:00
parent 95e2cbca15
commit 7914a09d4b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-graph/nodes/graphic/src/record.rs
+12 -12
View File
@@ -75,11 +75,10 @@ fn flatten_extent(content: ListIn<'_, Graphic>, fully_flatten: ValueIn<'_, bool>
} }
/// One content row as the production vararg shape: a single-item legacy list /// One content row as the production vararg shape: a single-item legacy list
/// carrying the row's declared attributes. /// carrying the row's element only, so the list's dyn-hash is a complete
/// cache key over the observables.
fn vararg_row(content: core_types::node::List<'_, Graphic>, row: usize) -> core_types::list::List<Graphic> { fn vararg_row(content: core_types::node::List<'_, Graphic>, row: usize) -> core_types::list::List<Graphic> {
let mut item = core_types::list::List::new_from_element(content.element_ref(row).clone()); core_types::list::List::new_from_element(content.element_ref(row).clone())
item.set_attribute(ATTR_TRANSFORM, 0, content.lane(row).attr::<Transform>());
item
} }
/// Rank-model Map: one subgraph invocation per content row, the row riding as /// Rank-model Map: one subgraph invocation per content row, the row riding as
@@ -351,29 +350,30 @@ mod tests {
} }
/// A subgraph source deriving its rows from the vararg: a `Text` row of /// A subgraph source deriving its rows from the vararg: a `Text` row of
/// string `s` expands to `s.len()` lanes labeled `s{k}`, each translated by /// string `s` expands to `s.len()` lanes labeled `s{k}`, each translated
/// the row's transform plus `k`. /// by `k`. The vararg is attr-less, so the content rows' transforms must
/// not reach these lanes.
struct PerRowSource { struct PerRowSource {
layout: Layout, layout: Layout,
} }
fn vararg_text(input: &ContextImpl<'_>) -> Option<(String, DAffine2)> { fn vararg_text(input: &ContextImpl<'_>) -> Option<String> {
let arg = core_types::ExtractVarArgs::vararg(input, 0).ok()?; let arg = core_types::ExtractVarArgs::vararg(input, 0).ok()?;
let list = arg.downcast_ref::<core_types::list::List<Graphic>>()?; let list = arg.downcast_ref::<core_types::list::List<Graphic>>()?;
let Graphic::Text(text) = list.element(0)? else { return None }; let Graphic::Text(text) = list.element(0)? else { return None };
Some((text.element(0)?.clone(), list.attribute_cloned_or_default(ATTR_TRANSFORM, 0))) Some(text.element(0)?.clone())
} }
impl<'e> Node<ContextImpl<'e>> for PerRowSource { impl<'e> Node<ContextImpl<'e>> for PerRowSource {
type Output = RecordValue<'e>; type Output = RecordValue<'e>;
fn eval(&self, input: &ContextImpl<'e>) -> GPoll<RecordValue<'e>> { fn eval(&self, input: &ContextImpl<'e>) -> GPoll<RecordValue<'e>> {
let Some((label, transform)) = vararg_text(input) else { let Some(label) = vararg_text(input) else {
return GPoll::error("the subgraph fixture expects a text vararg"); return GPoll::error("the subgraph fixture expects a text vararg");
}; };
let lane = input.innermost_index(); let lane = input.innermost_index();
let graphic = text(&format!("{label}{lane}")); let graphic = text(&format!("{label}{lane}"));
let translated = DAffine2::from_translation(transform.translation + glam::DVec2::new(lane as f64, 0.)); let translated = DAffine2::from_translation(glam::DVec2::new(lane as f64, 0.));
let dst = stack::push(self.layout.frame_bytes()); let dst = stack::push(self.layout.frame_bytes());
if unsafe { record::write_element(dst, graphic, input.arena()) }.is_none() { if unsafe { record::write_element(dst, graphic, input.arena()) }.is_none() {
return GPoll::arena_exhausted(); return GPoll::arena_exhausted();
@@ -387,7 +387,7 @@ mod tests {
fn extent_at(&self, input: &ContextImpl<'e>, _level: u8) -> GPoll<Extent> { fn extent_at(&self, input: &ContextImpl<'e>, _level: u8) -> GPoll<Extent> {
match vararg_text(input) { match vararg_text(input) {
Some((label, _)) => GPoll::Final(Extent::Exactly(label.len())), Some(label) => GPoll::Final(Extent::Exactly(label.len())),
None => GPoll::error("the subgraph fixture expects a text vararg"), None => GPoll::error("the subgraph fixture expects a text vararg"),
} }
} }
@@ -413,7 +413,7 @@ mod tests {
} }
} }
const RAGGED_FLAT: [(&str, f64); 5] = [("ab0", 10.), ("ab1", 11.), ("xyz0", 20.), ("xyz1", 21.), ("xyz2", 22.)]; const RAGGED_FLAT: [(&str, f64); 5] = [("ab0", 0.), ("ab1", 1.), ("xyz0", 0.), ("xyz1", 1.), ("xyz2", 2.)];
#[test] #[test]
fn map_scans_ragged_rows() { fn map_scans_ragged_rows() {