Updated wasm crate; Removed old file

gammelalf · Jun 10, 2022 · b628def · b628def
1 parent f256396
commit b628def
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 194 deletions.
diff --git a/src/polynomial.rs b/src/polynomial.rs
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
@@ -11,4 +11,5 @@ serde = { version = "1.0", features = ["derive"] }
 wasm-bindgen =  { version = "0.2", features = ["serde-serialize"] }
 js-sys = "0.3"
 web-sys = { version = "0.3", features = ["CanvasRenderingContext2d"] }
+nalgebra = "0.31"
 gammalg = { version = "0.1.0", path = ".." }
diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs
@@ -2,7 +2,7 @@ use serde::Deserialize;
 use wasm_bindgen::prelude::*;
 use js_sys::Array;
 use web_sys::CanvasRenderingContext2d;
-use gammalg::vector::Vector;
+use nalgebra::Vector2;
 use gammalg::bezier::BezierCurve;
 use gammalg::bounding_box::BoundingBox;
 use gammalg::graham_scan::convex_hull;
@@ -12,9 +12,9 @@ pub struct Point {
     pub x: f64,
     pub y: f64,
 }
-impl From<Point> for Vector<f64, 2> {
+impl From<Point> for Vector2<f64> {
     fn from(p: Point) -> Self {
-        Vector([p.x, p.y])
+        Vector2::new(p.x, p.y)
     }
 }
 
@@ -151,9 +151,9 @@ impl Curve {
         let width = ctx.line_width();
         let fill = ctx.fill_style();
         let points = self.0.get_intersections(&other.0);
-        for Vector([x, y]) in points.into_iter() {
+        for v in points.into_iter() {
             ctx.begin_path();
-            ctx.arc(x, y, width, 0.0, 6.28);
+            ctx.arc(v.x, v.y, width, 0.0, 6.28);
             ctx.set_fill_style(color);
             ctx.fill();
             ctx.set_fill_style(&fill);