fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-03 00:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bezier-rs: Updated Bezier function signatures to accept TValue (#967)

Browse Source 
* Create helper for converting d to t values

* Add euclidean option for tangent and normal

* Modified bezier functions signatures to accept ComputeType

* Stylistic changes per review

* Added ComputeType documentation

* Renamed ComputeType to TValue

* Fixed comments

* Fixed failing unit tests

* Code review

* Fix comments in code review

* Renamed compute_type_to_parametric to t_value_to_parametric

---------

Co-authored-by: Linda Zheng <thelindazheng@gmail.com>
Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Rob Nadal
2023-02-13 12:31:51 -05:00
committed by Keavon Chambers
co-authored by Linda Zheng Keavon Chambers
parent f0ad4c91d3
commit a64c856ec4
25 changed files with 456 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/bezier-rs/src/subpath/manipulators.rs
+19 -19
View File
@@ -1,14 +1,14 @@
use super::*;
use crate::consts::MAX_ABSOLUTE_DIFFERENCE;
use crate::utils::f64_compare;
use crate::ComputeType;
use crate::TValue;
impl Subpath {
/// Inserts a `ManipulatorGroup` at a certain point along the subpath based on the parametric `t`-value provided.
/// Expects `t` to be within the inclusive range `[0, 1]`.
pub fn insert(&mut self, t: ComputeType) {
pub fn insert(&mut self, t: TValue) {
match t {
ComputeType::Parametric(t) => {
TValue::Parametric(t) => {
assert!((0.0..=1.).contains(&t));
let number_of_curves = self.len_segments() as f64;
@@ -25,7 +25,7 @@ impl Subpath {
// But the above if case would catch that, since `target_curve_t` would be 0.
let curve = self.iter().nth(target_curve_index as usize).unwrap();
let [first, second] = curve.split(target_curve_t);
let [first, second] = curve.split(TValue::Parametric(target_curve_t));
let new_group = ManipulatorGroup {
anchor: first.end(),
in_handle: first.handle_end(),
@@ -37,8 +37,8 @@ impl Subpath {
self.manipulator_groups[((target_curve_index as usize) + 2) % number_of_groups].in_handle = second.handle_end();
}
// TODO: change this implementation to Euclidean compute
ComputeType::Euclidean(_t) => {}
ComputeType::EuclideanWithinError { t: _, epsilon: _ } => todo!(),
TValue::Euclidean(_t) => {}
TValue::EuclideanWithinError { t: _, error: _ } => todo!(),
}
}
}
@@ -94,9 +94,9 @@ mod tests {
#[test]
fn insert_in_first_segment_of_open_subpath() {
let mut subpath = set_up_open_subpath();
let location = subpath.evaluate(ComputeType::Parametric(0.2));
let split_pair = subpath.iter().next().unwrap().split((0.2 * 3.) % 1.);
subpath.insert(ComputeType::Parametric(0.2));
let location = subpath.evaluate(TValue::Parametric(0.2));
let split_pair = subpath.iter().next().unwrap().split(TValue::Parametric((0.2 * 3.) % 1.));
subpath.insert(TValue::Parametric(0.2));
assert_eq!(subpath.manipulator_groups[1].anchor, location);
assert_eq!(split_pair[0], subpath.iter().next().unwrap());
assert_eq!(split_pair[1], subpath.iter().nth(1).unwrap());
@@ -105,9 +105,9 @@ mod tests {
#[test]
fn insert_in_last_segment_of_open_subpath() {
let mut subpath = set_up_open_subpath();
let location = subpath.evaluate(ComputeType::Parametric(0.9));
let split_pair = subpath.iter().nth(2).unwrap().split((0.9 * 3.) % 1.);
subpath.insert(ComputeType::Parametric(0.9));
let location = subpath.evaluate(TValue::Parametric(0.9));
let split_pair = subpath.iter().nth(2).unwrap().split(TValue::Parametric((0.9 * 3.) % 1.));
subpath.insert(TValue::Parametric(0.9));
assert_eq!(subpath.manipulator_groups[3].anchor, location);
assert_eq!(split_pair[0], subpath.iter().nth(2).unwrap());
assert_eq!(split_pair[1], subpath.iter().nth(3).unwrap());
@@ -117,8 +117,8 @@ mod tests {
fn insert_at_exisiting_manipulator_group_of_open_subpath() {
// This will do nothing to the subpath
let mut subpath = set_up_open_subpath();
let location = subpath.evaluate(ComputeType::Parametric(0.75));
subpath.insert(ComputeType::Parametric(0.75));
let location = subpath.evaluate(TValue::Parametric(0.75));
subpath.insert(TValue::Parametric(0.75));
assert_eq!(subpath.manipulator_groups[3].anchor, location);
assert_eq!(subpath.manipulator_groups.len(), 5);
assert_eq!(subpath.len_segments(), 4);
@@ -127,9 +127,9 @@ mod tests {
#[test]
fn insert_at_last_segment_of_closed_subpath() {
let mut subpath = set_up_closed_subpath();
let location = subpath.evaluate(ComputeType::Parametric(0.9));
let split_pair = subpath.iter().nth(3).unwrap().split((0.9 * 4.) % 1.);
subpath.insert(ComputeType::Parametric(0.9));
let location = subpath.evaluate(TValue::Parametric(0.9));
let split_pair = subpath.iter().nth(3).unwrap().split(TValue::Parametric((0.9 * 4.) % 1.));
subpath.insert(TValue::Parametric(0.9));
assert_eq!(subpath.manipulator_groups[4].anchor, location);
assert_eq!(split_pair[0], subpath.iter().nth(3).unwrap());
assert_eq!(split_pair[1], subpath.iter().nth(4).unwrap());
@@ -140,8 +140,8 @@ mod tests {
fn insert_at_last_manipulator_group_of_closed_subpath() {
// This will do nothing to the subpath
let mut subpath = set_up_closed_subpath();
let location = subpath.evaluate(ComputeType::Parametric(1.));
subpath.insert(ComputeType::Parametric(1.));
let location = subpath.evaluate(TValue::Parametric(1.));
subpath.insert(TValue::Parametric(1.));
assert_eq!(subpath.manipulator_groups[0].anchor, location);
assert_eq!(subpath.manipulator_groups.len(), 4);
assert!(subpath.closed);