Commit 7c28a53

authored

Fix the Spline node to maintain stable segment IDs (#3321)

Stable segment ids in the spline node

1 parent 1b9a492 commit 7c28a53Copy full SHA for 7c28a53

File tree

1 file changed

-3

lines changed

node-graph/gcore/src/vector
- vector_nodes.rs

1 file changed

-3

lines changed

`‎node-graph/gcore/src/vector/vector_nodes.rs‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -821,16 +821,17 @@ async fn vec2_to_point(_: impl Ctx, vec2: DVec2) -> Table<Vector> {`
`821`	`821`	`async fn points_to_polyline(_: impl Ctx, mut points: Table<Vector>, #[default(true)] closed: bool) -> Table<Vector> {`
`822`	`822`	`for row in points.iter_mut() {`
`823`	`823`	`let mut segment_domain = SegmentDomain::new();`
	`824`	`+ let mut next_id = SegmentId::ZERO;`
`824`	`825`
`825`	`826`	`let points_count = row.element.point_domain.ids().len();`
`826`	`827`
`827`	`828`	`if points_count > 2 {`
`828`	`829`	`(0..points_count - 1).for_each(\|i\| {`
`829`		`- segment_domain.push(SegmentId::generate(), i, i + 1, BezierHandles::Linear, StrokeId::generate());`
	`830`	`+ segment_domain.push(next_id.next_id(), i, i + 1, BezierHandles::Linear, StrokeId::generate());`
`830`	`831`	`});`
`831`	`832`
`832`	`833`	`if closed {`
`833`		`- segment_domain.push(SegmentId::generate(), points_count - 1, 0, BezierHandles::Linear, StrokeId::generate());`
	`834`	`+ segment_domain.push(next_id.next_id(), points_count - 1, 0, BezierHandles::Linear, StrokeId::generate());`
`834`	`835`
`835`	`836`	`row.element`
`836`	`837`	`.region_domain`
`@@ -1394,6 +1395,7 @@ async fn spline(_: impl Ctx, content: Table<Vector>) -> Table<Vector> {`
`1394`	`1395`	`}`
`1395`	`1396`
`1396`	`1397`	`let mut segment_domain = SegmentDomain::default();`
	`1398`	`+ let mut next_id = SegmentId::ZERO;`
`1397`	`1399`	`for (manipulator_groups, closed) in row.element.stroke_manipulator_groups() {`
`1398`	`1400`	`let positions = manipulator_groups.iter().map(\|manipulators\| manipulators.anchor).collect::<Vec<_>>();`
`1399`	`1401`	`let closed = closed && positions.len() > 2;`
`@@ -1418,7 +1420,7 @@ async fn spline(_: impl Ctx, content: Table<Vector>) -> Table<Vector> {`
`1418`	`1420`	`let handle_end = positions[next_index] * 2. - first_handles[next_index];`
`1419`	`1421`	`let handles = BezierHandles::Cubic { handle_start, handle_end };`
`1420`	`1422`
`1421`		`- segment_domain.push(SegmentId::generate(), start_index, end_index, handles, stroke_id);`
	`1423`	`+ segment_domain.push(next_id.next_id(), start_index, end_index, handles, stroke_id);`
`1422`	`1424`	`}`
`1423`	`1425`	`}`
`1424`	`1426`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 7c28a53

File tree

1 file changed

1 file changed

`‎node-graph/gcore/src/vector/vector_nodes.rs‎`

0 commit comments