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

Preserve group IDs in the Spline from Points node (#1574)

This commit is contained in:
0HyperCube 2024-01-14 00:49:52 +00:00 committed by GitHub
parent c777d4d430
commit 768bbe820d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/bezier-rs/src/subpath/core.rs
View File

@ -112,6 +112,11 @@ impl<ManipulatorGroupId: crate::Identifier> Subpath<ManipulatorGroupId> {
&self.manipulator_groups &self.manipulator_groups
} }
/// Returns a mutable vec of the [ManipulatorGroup]s in the `Subpath`.
pub fn manipulator_groups_mut(&mut self) -> &mut Vec<ManipulatorGroup<ManipulatorGroupId>> {
&mut self.manipulator_groups
}
/// Returns a vector of all the anchors (DVec2) for this `Subpath`. /// Returns a vector of all the anchors (DVec2) for this `Subpath`.
pub fn anchors(&self) -> Vec<DVec2> { pub fn anchors(&self) -> Vec<DVec2> {
self.manipulator_groups().iter().map(|group| group.anchor).collect() self.manipulator_groups().iter().map(|group| group.anchor).collect()

9
node-graph/gcore/src/vector/vector_nodes.rs
View File

@ -297,7 +297,14 @@ pub struct SplinesFromPointsNode;
#[node_macro::node_fn(SplinesFromPointsNode)] #[node_macro::node_fn(SplinesFromPointsNode)]
fn splines_from_points(mut vector_data: VectorData) -> VectorData { fn splines_from_points(mut vector_data: VectorData) -> VectorData {
for subpath in &mut vector_data.subpaths { for subpath in &mut vector_data.subpaths {
*subpath = Subpath::new_cubic_spline(subpath.anchors()); let mut spline = Subpath::new_cubic_spline(subpath.anchors());
// Preserve the manipulator group ids
for (spline_manipulator_group, original_manipulator_group) in spline.manipulator_groups_mut().iter_mut().zip(subpath.manipulator_groups()) {
spline_manipulator_group.id = original_manipulator_group.id;
}
*subpath = spline;
} }
vector_data vector_data