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

Make the 'Index Points' node index within each vector element instead of across the whole list (#4427)

Browse Source
This commit is contained in:
Keavon Chambers
2026-08-10 21:04:33 -07:00
committed by GitHub
parent 759519782b
commit b593b26ad7
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-graph/nodes/vector/src/vector_nodes.rs
+11 -20
View File
@@ -3251,41 +3251,32 @@ async fn count_points(_: impl Ctx, content: Item<Vector>) -> Item<f64> {
Item::new_from_element(count) Item::new_from_element(count)
} }
/// Retrieves the vec2 position (in local space) of the anchor point at the specified index in a `List` of vector elements. /// Retrieves the vec2 position (in local space) of the anchor point at the specified index within a vector element.
/// If no value exists at that index, the position (0, 0) is returned. /// If no value exists at that index, the position (0, 0) is returned.
#[node_macro::node(category("Vector: Measure"), path(graphene_core::vector))] #[node_macro::node(category("Vector: Measure"), path(graphene_core::vector))]
async fn index_points( async fn index_points(
_: impl Ctx, _: impl Ctx,
/// The vector element or elements containing the anchor points to be retrieved. /// The vector element containing the anchor points to be retrieved.
content: List<Vector>, content: Item<Vector>,
/// The index of the points to retrieve, starting from 0 for the first point. Negative indices count backwards from the end, starting from -1 for the last item. /// The index of the points to retrieve, starting from 0 for the first point. Negative indices count backwards from the end, starting from -1 for the last point.
index: Item<f64>, index: Item<f64>,
) -> Item<DVec2> { ) -> Item<DVec2> {
let index = index.into_element(); let index = index.into_element();
let points_count = content.iter_element_values().map(|vector| vector.point_domain.positions().len()).sum::<usize>(); let positions = content.element().point_domain.positions();
if points_count == 0 { let Some(last_index) = positions.len().checked_sub(1) else {
return Item::new_from_element(DVec2::ZERO); return Item::new_from_element(DVec2::ZERO);
} };
// Clamp and allow negative indexing from the end // Clamp and allow negative indexing from the end
let index = index as isize; let index = index as isize;
let index = if index < 0 { let index = if index < 0 {
(points_count as isize + index).max(0) as usize (positions.len() as isize + index).max(0) as usize
} else { } else {
(index as usize).min(points_count - 1) (index as usize).min(last_index)
}; };
// Find the point at the given index across all vector elements Item::new_from_element(positions[index])
let mut accumulated = 0;
for vector in content.iter_element_values() {
let row_point_count = vector.point_domain.positions().len();
if index - accumulated < row_point_count {
return Item::new_from_element(vector.point_domain.positions()[index - accumulated]);
}
accumulated += row_point_count;
}
Item::new_from_element(DVec2::ZERO)
} }
#[node_macro::node(category("Vector: Measure"), path(core_types::vector))] #[node_macro::node(category("Vector: Measure"), path(core_types::vector))]