jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix StrokePathIter missing some segments (#3413)

This commit is contained in:
James Lindsay 2025-11-26 07:03:28 +00:00 committed by GitHub
parent 9eb8835bd5
commit 5ebf6d6bc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
node-graph/libraries/vector-types/src/vector/vector_attributes.rs
View File

@ -1041,18 +1041,24 @@ impl<Upstream> Iterator for StrokePathIter<'_, Upstream> {
type Item = (Vec<ManipulatorGroup<PointId>>, bool); type Item = (Vec<ManipulatorGroup<PointId>>, bool);
fn next(&mut self) -> Option<Self::Item> { 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) { let mut current_start = None;
index // First iterate over the single connected points
} else { if !self.done_one {
if !self.done_one { current_start = self.points.iter().enumerate().skip(self.skip).find(|(_, val)| val.connected() == 1);
self.done_one = true; self.done_one = current_start.is_none();
self.skip = 0; self.skip = current_start.map_or(0, |(index, _)| index + 1);
} }
self.points.iter().enumerate().skip(self.skip).find(|(_, val)| val.connected() > 0)?.0
};
self.skip = current_start + 1;
// There will always be one (seeing as we checked above) // 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 at least one segment connected to this one
let mut point_index = current_start; let mut point_index = current_start;
let mut manipulators_list = Vec::new(); let mut manipulators_list = Vec::new();
let mut in_handle = None; let mut in_handle = None;