Skip to content

Fix StrokePathIter missing some segments #3413

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix StrokePathIter missing some segments #3413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 17 additions & 11 deletions node-graph/libraries/vector-types/src/vector/vector_attributes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,18 +1041,24 @@ impl<Upstream> Iterator for StrokePathIter<'_, Upstream> {
type Item = (Vec<ManipulatorGroup<PointId>>, bool);

fn next(&mut self) -> Option<Self::Item> {
let current_start = if let Some((index, _)) = self.points.iter().enumerate().skip(self.skip).find(|(_, val)| val.connected() == 1) {
index
} else {
if !self.done_one {
self.done_one = true;
self.skip = 0;
}
self.points.iter().enumerate().skip(self.skip).find(|(_, val)| val.connected() > 0)?.0
};
self.skip = current_start + 1;
let mut current_start = None;
// First iterate over the single connected points
if !self.done_one {
current_start = self.points.iter().enumerate().skip(self.skip).find(|(_, val)| val.connected() == 1);
self.done_one = current_start.is_none();
self.skip = current_start.map_or(0, |(index, _)| index + 1);
}

// If we've already done the single connected, then go through looking at multi connected
if current_start.is_none() {
current_start = self.points.iter().enumerate().skip(self.skip).find(|(_, val)| val.connected() > 0);
self.skip = current_start.map_or(self.points.len(), |(index, _)| index);
}

// If there is no starting point, exit
let current_start = current_start?.0;

// There will always be one (seeing as we checked above)
// There will always be at least one segment connected to this one
let mut point_index = current_start;
let mut manipulators_list = Vec::new();
let mut in_handle = None;
Expand Down
Loading