diff --git a/Cargo.lock b/Cargo.lock index 7e60d27..3cab93f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "MFEKmath" -version = "0.1.0" +version = "0.1.1" dependencies = [ "flo_curves", "glifparser", diff --git a/src/editor/operations.rs b/src/editor/operations.rs index 8e64a1a..0073fc1 100644 --- a/src/editor/operations.rs +++ b/src/editor/operations.rs @@ -43,7 +43,7 @@ impl Editor { continue; } - let build_result = glif_contour.operation.build(glif_contour); + let build_result = glif_contour.operation().build(glif_contour); for new_contour in build_result { preview_outline.push(new_contour.to_cubic()); diff --git a/src/editor/selection.rs b/src/editor/selection.rs index 4c7483a..b3947de 100644 --- a/src/editor/selection.rs +++ b/src/editor/selection.rs @@ -11,7 +11,6 @@ use serde_json; use shrinkwraprs; use super::Editor; -use crate::contour_operations::ContourOperation; use crate::user_interface::gui; diff --git a/src/main.rs b/src/main.rs index 5d6f960..c63b50c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -194,7 +194,7 @@ fn main() { }*/ Command::DeleteSelection => { if editor.selected.is_empty() && editor.point_idx.is_some() { - editor.simplify_selection(); + editor.simplify_cubic_selection(); } else { editor.delete_selection(); } diff --git a/src/tools/shapes/mod.rs b/src/tools/shapes/mod.rs index 871b8d4..e7cc3f0 100644 --- a/src/tools/shapes/mod.rs +++ b/src/tools/shapes/mod.rs @@ -378,7 +378,7 @@ impl Shapes { }; self.corners = sd.corners; - let mfek_o: Vec> = + let mfek_o: Vec> = o.iter().map(|e| e.into()).collect(); v.get_active_layer_mut().outline.extend(mfek_o); self.dropped_shape = true;