update WASM bindings

Author: timschmidt

src/wasm/mesh_js.rs

@@ -34,8 +34,8 @@ impl MeshJs {
     #[wasm_bindgen(js_name = positions)]
     pub fn positions(&self) -> Float64Array {
         let obj = self.to_arrays();
-        let pos = Reflect::get(&obj, &"positions".into()).unwrap();
-        pos.dyn_into::<Float64Array>().unwrap()
+        let position = Reflect::get(&obj, &"positions".into()).unwrap();
+        position.dyn_into::<Float64Array>().unwrap()
     }
 
     /// Return an interleaved array of vertex normals (nx,ny,nz)*.
@@ -66,11 +66,11 @@ impl MeshJs {
         for poly in &self.inner.polygons {
             for vertex in &poly.vertices {
                 if !vertices.iter().any(|v: &Point3<f64>| {
-                    (v.x - vertex.pos.x).abs() < 1e-8
-                        && (v.y - vertex.pos.y).abs() < 1e-8
-                        && (v.z - vertex.pos.z).abs() < 1e-8
+                    (v.x - vertex.position.x).abs() < 1e-8
+                        && (v.y - vertex.position.y).abs() < 1e-8
+                        && (v.z - vertex.position.z).abs() < 1e-8
                 }) {
-                    vertices.push(vertex.pos);
+                    vertices.push(vertex.position);
                 }
             }
         }
@@ -90,7 +90,7 @@ impl MeshJs {
         let mut idx: u32 = 0;
         for p in &tri.polygons {
             for v in &p.vertices {
-                positions.extend_from_slice(&[v.pos.x as f64, v.pos.y as f64, v.pos.z as f64]);
+                positions.extend_from_slice(&[v.position.x as f64, v.position.y as f64, v.position.z as f64]);
                 normals.extend_from_slice(&[
                     v.normal.x as f64,
                     v.normal.y as f64,
@@ -133,7 +133,7 @@ impl MeshJs {
             let js_vert = Object::new();
 
             // Wrap position and normal in Point3Js / Vector3Js
-            let pos_js = Point3Js::from(v.pos);
+            let pos_js = Point3Js::from(v.position);
             let norm_js = Vector3Js::from(v.normal);
 
             Reflect::set(&js_vert, &"position".into(), &JsValue::from(pos_js)).unwrap();
@@ -469,6 +469,11 @@ impl MeshJs {
         self.inner
             .to_amf_with_color(object_name, units, (r as Real, g as Real, b as Real))
     }
+    
+	#[wasm_bindgen(js_name = toGLTF)]
+    pub fn to_gltf(&self, object_name: &str) -> String {
+        self.inner.to_gltf(object_name)
+    }
 
     #[wasm_bindgen(js_name=fromSketch)]
     pub fn from_sketch(sketch_js: &SketchJs) -> MeshJs {

src/wasm/plane_js.rs

@@ -1,5 +1,6 @@
 use crate::float_types::Real;
-use crate::mesh::{plane::Plane, vertex::Vertex};
+use crate::mesh::plane::Plane;
+use crate::vertex::Vertex;
 use crate::wasm::{
     matrix_js::Matrix4Js, point_js::Point3Js, polygon_js::PolygonJs, vector_js::Vector3Js,
     vertex_js::VertexJs,

src/wasm/polygon_js.rs

@@ -1,4 +1,5 @@
-use crate::mesh::{polygon::Polygon, vertex::Vertex};
+use crate::mesh::polygon::Polygon;
+use crate::vertex::Vertex;
 use crate::wasm::{
     js_metadata_to_string, plane_js::PlaneJs, point_js::Point3Js, vector_js::Vector3Js,
     vertex_js::VertexJs,
@@ -112,9 +113,9 @@ impl PolygonJs {
         let mut data = Vec::with_capacity(self.inner.vertices.len() * 6);
 
         for v in &self.inner.vertices {
-            data.push(v.pos.x as f64);
-            data.push(v.pos.y as f64);
-            data.push(v.pos.z as f64);
+            data.push(v.position.x as f64);
+            data.push(v.position.y as f64);
+            data.push(v.position.z as f64);
             data.push(v.normal.x as f64);
             data.push(v.normal.y as f64);
             data.push(v.normal.z as f64);