Skip to content

Draw vector pool paths in their stored order and direction instead of re-walking segments #4737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keavon merged 4 commits into from
Oct 17, 2026
Merged

Draw vector pool paths in their stored order and direction instead of re-walking segments #4737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0955514
Stitch contours from stored path order and direction in place of the …
Keavon Oct 4, 2026
c4d6799
Keep each path's boundary through the working form
Keavon Oct 4, 2026
33c1c22
Bake the straightest route through junctions into legacy segment soups
Keavon Oct 4, 2026
ae0b600
Keep Extrude's split pieces in their segment's place and order shared…
Keavon Oct 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions node-graph/libraries/vector-types/src/vector/algorithms/merge_by_distance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,12 @@ impl MergeByDistanceExt for Vector {

// Drop the collapsed segments, then the merged-away points, remapping segment endpoints
let keep_segment: Vec<bool> = working.segment_ids.iter().map(|id| !segments_to_delete.contains(id)).collect();
working.carry_path_beginnings(&keep_segment);
retain_by(&mut working.segment_ids, &keep_segment);
retain_by(&mut working.segment_start, &keep_segment);
retain_by(&mut working.segment_end, &keep_segment);
retain_by(&mut working.segment_handles, &keep_segment);
retain_by(&mut working.segment_begins_path, &keep_segment);

let mut point_map = Vec::with_capacity(working.point_ids.len());
let mut new_index = 0;
Expand All @@ -130,7 +132,7 @@ impl MergeByDistanceExt for Vector {
}

fn merge_by_distance_spatial(&mut self, paths: &mut List<Path>, transform: DAffine2, distance: f64) {
let working = WorkingVector::flatten(self, paths);
let mut working = WorkingVector::flatten(self, paths);
let point_count = working.point_positions.len();

// Find min x and y for grid cell normalization
Expand Down Expand Up @@ -212,24 +214,29 @@ impl MergeByDistanceExt for Vector {
}
}

// Build the merged working form, skipping segments with endpoints that collapsed together
// Segments with endpoints that collapsed together drop out, handing on any path they began
let keep_segment: Vec<bool> = (0..working.segment_ids.len())
.map(|segment_index| point_index_map[working.segment_start[segment_index]] != point_index_map[working.segment_end[segment_index]])
.collect();
working.carry_path_beginnings(&keep_segment);

// Build the merged working form from the kept segments
let mut merged = WorkingVector {
point_ids: merged_indices,
point_positions: merged_positions,
colinear: working.colinear,
..Default::default()
};

for segment_index in 0..working.segment_ids.len() {
for segment_index in (0..working.segment_ids.len()).filter(|&segment_index| keep_segment[segment_index]) {
let new_start = point_index_map[working.segment_start[segment_index]].unwrap();
let new_end = point_index_map[working.segment_end[segment_index]].unwrap();

if new_start != new_end {
merged.segment_ids.push(working.segment_ids[segment_index]);
merged.segment_start.push(new_start);
merged.segment_end.push(new_end);
merged.segment_handles.push(working.segment_handles[segment_index]);
}
merged.segment_ids.push(working.segment_ids[segment_index]);
merged.segment_start.push(new_start);
merged.segment_end.push(new_end);
merged.segment_handles.push(working.segment_handles[segment_index]);
merged.segment_begins_path.push(working.segment_begins_path.get(segment_index).copied().unwrap_or(false));
}

merged.reweave(self, paths);
Expand Down
Loading
Loading