Skip to content

Fix 'Morph' node lerping the target paths to its end point instead of start point #2754

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
merged 4 commits into from
Jun 26, 2025
Merged

Fix 'Morph' node lerping the target paths to its end point instead of start point #2754

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4f17f5
fix lerping the target paths to the point at the end of path instead …
indierusty Jun 25, 2025
5f69763
comment
indierusty Jun 25, 2025
8ea2552
append a MoveTo element first if the bezpath is empty
indierusty Jun 25, 2025
59f3bf6
Merge branch 'master' into ir/fix-morph
Keavon Jun 26, 2025
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
29 changes: 19 additions & 10 deletions node-graph/gcore/src/vector/vector_nodes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::vector::{FillId, PointDomain, RegionId};
use crate::{CloneVarArgs, Color, Context, Ctx, ExtractAll, GraphicElement, GraphicGroupTable, OwnedContextImpl};
use bezier_rs::{Join, ManipulatorGroup, Subpath};
use glam::{DAffine2, DVec2};
use kurbo::{Affine, BezPath, DEFAULT_ACCURACY, ParamCurve, PathEl, PathSeg, Point, Shape};
use kurbo::{Affine, BezPath, DEFAULT_ACCURACY, ParamCurve, PathEl, PathSeg, Shape};
use rand::{Rng, SeedableRng};
use std::collections::hash_map::DefaultHasher;
use std::f64::consts::PI;
Expand Down Expand Up @@ -1591,6 +1591,9 @@ async fn morph(_: impl Ctx, source: VectorDataTable, #[expose] target: VectorDat
}

for segment in new_segments {
if bezpath.elements().is_empty() {
bezpath.move_to(segment.start())
}
bezpath.push(segment.as_path_el());
}

Expand Down Expand Up @@ -1666,7 +1669,10 @@ async fn morph(_: impl Ctx, source: VectorDataTable, #[expose] target: VectorDat
for mut source_path in source_paths {
source_path.apply_affine(Affine::new(source_transform.to_cols_array()));

let end: Point = source_path.elements().last().and_then(|element| element.end_point()).unwrap_or_default();
// Skip if the path has no segments else get the point at the end of the path.
let Some(end) = source_path.segments().last().and_then(|element| Some(element.end())) else {
continue;
};

for element in source_path.elements_mut() {
match element {
Expand All @@ -1690,20 +1696,23 @@ async fn morph(_: impl Ctx, source: VectorDataTable, #[expose] target: VectorDat
for mut target_path in target_paths {
target_path.apply_affine(Affine::new(source_transform.to_cols_array()));

let end: Point = target_path.elements().last().and_then(|element| element.end_point()).unwrap_or_default();
// Skip if the path has no segments else get the point at the start of the path.
let Some(start) = target_path.segments().next().and_then(|element| Some(element.start())) else {
continue;
};

for element in target_path.elements_mut() {
match element {
PathEl::MoveTo(point) => *point = point.lerp(end, time),
PathEl::LineTo(point) => *point = point.lerp(end, time),
PathEl::MoveTo(point) => *point = start.lerp(*point, time),
PathEl::LineTo(point) => *point = start.lerp(*point, time),
PathEl::QuadTo(point, point1) => {
*point = point.lerp(end, time);
*point1 = point1.lerp(end, time);
*point = start.lerp(*point, time);
*point1 = start.lerp(*point1, time);
}
PathEl::CurveTo(point, point1, point2) => {
*point = point.lerp(end, time);
*point1 = point1.lerp(end, time);
*point2 = point2.lerp(end, time);
*point = start.lerp(*point, time);
*point1 = start.lerp(*point1, time);
*point2 = start.lerp(*point2, time);
}
PathEl::ClosePath => {}
}
Expand Down
Loading