mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-04 13:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bezier-rs: Add function to smoothly join bezier curves (#1037)

Browse source 
* Added bezier join

* Stylistic changes per review
This commit is contained in:
Rob Nadal 2023-02-28 18:59:06 -05:00 • committed by Keavon Chambers
parent 8d3daeae78
commit 8bc290fde9
3 changed files with 108 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libraries/bezier-rs/src/bezier/solvers.rs
View file

@ -52,15 +52,19 @@ impl Bezier {
}
}
/// Returns a normalized unit vector representing the tangent at the point `t` along the curve.
/// <iframe frameBorder="0" width="100%" height="400px" src="https://graphite.rs/bezier-rs-demos#bezier/tangent/solo" title="Tangent Demo"></iframe>
pub fn tangent(&self, t: TValue) -> DVec2 {
let t = self.t_value_to_parametric(t);
/// Returns the non-normalized vector representing the tangent at the point `t` along the curve.
fn non_normalized_tangent(&self, t: f64) -> DVec2 {
match self.handles {
BezierHandles::Linear => self.end - self.start,
_ => self.derivative().unwrap().evaluate(TValue::Parametric(t)),
}
.normalize()
}
/// Returns a normalized unit vector representing the tangent at the point `t` along the curve.
/// <iframe frameBorder="0" width="100%" height="400px" src="https://graphite.rs/bezier-rs-demos#bezier/tangent/solo" title="Tangent Demo"></iframe>
pub fn tangent(&self, t: TValue) -> DVec2 {
let t = self.t_value_to_parametric(t);
self.non_normalized_tangent(t).normalize()
}
/// Returns a normalized unit vector representing the direction of the normal at the point `t` along the curve.
@ -390,6 +394,15 @@ impl Bezier {
.flat_map(|bezier| self.intersections(bezier, None, None))
.collect()
}
/// Returns a cubic bezier which joins this with the provided bezier curve.
/// The resulting path formed by the Bezier curves is continuous up to the first derivative.
/// <iframe frameBorder="0" width="100%" height="325px" src="https://graphite.rs/bezier-rs-demos#bezier/join/solo" title="Join Demo"></iframe>
pub fn join(&self, other: &Bezier) -> Bezier {
let handle1 = self.non_normalized_tangent(1.) / 3. + self.end;
let handle2 = other.start - other.non_normalized_tangent(0.) / 3.;
Bezier::from_cubic_dvec2(self.end, handle1, handle2, other.start)
}
}
#[cfg(test)]