fix(STLReader): apply new requested changes in removeDuplicateVertices

Author: jreyero12

Sources/IO/Geometry/STLReader/index.d.ts

@@ -81,12 +81,6 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
    */
   requestData(inData: any, outData: any): void;
 
-  /**
-   *
-   * @param tolerance
-   */
-  removeDuplicateVertices(tolerance: number = 5): void;
-
   /**
    *
    * @param dataAccessHelper
@@ -108,7 +102,10 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
 
   /**
    * Turn on/off automatic removeDuplicateVertices
-   * @param {Number} tolerance
+   * After reading the STL file, if `tolerance` is >= 0, then points with the same coordinates at 10 power tolerance are merged.
+   * For a smooth rendering, you might want to compute normals with vtkPolyDataNormals.
+   *
+   *  @param {Number} tolerance
    */
   setRemoveDuplicateVertices(tolerance: number): boolean;
 }

Sources/IO/Geometry/STLReader/index.js

@@ -122,6 +122,64 @@ function vtkSTLReader(publicAPI, model) {
     });
   }
 
+  function removeDuplicateVertices(tolerance) {
+    const polydata = model.output[0];
+
+    const points = polydata.getPoints().getData();
+    const faces = polydata.getPolys().getData();
+
+    if (!points || !faces) {
+      console.warn('No valid polydata.');
+      return;
+    }
+
+    const vMap = new Map();
+    const vIndexMap = new Map();
+    let vInc = 0;
+    let pointsChanged = false;
+    for (let i = 0; i < points.length; i += 3) {
+      const k1 = (points[i] * 10 ** tolerance).toFixed(0);
+      const k2 = (points[i + 1] * 10 ** tolerance).toFixed(0);
+      const k3 = (points[i + 2] * 10 ** tolerance).toFixed(0);
+      const key = `${k1},${k2},${k3}`;
+      if (vMap.get(key) !== undefined) {
+        vIndexMap.set(i / 3, vMap.get(key));
+        pointsChanged = true;
+      } else {
+        vIndexMap.set(i / 3, vInc);
+        vMap.set(key, vInc);
+        vInc++;
+      }
+    }
+
+    const outVerts = new Float32Array(vMap.size * 3);
+    const keys = Array.from(vMap.keys());
+
+    for (let i = 0; i < keys.length; i++) {
+      const k = keys[i];
+      const j = vMap.get(k) * 3;
+      const coords = k.split(',').map((e) => +e * 10 ** -tolerance);
+      outVerts[j] = coords[0];
+      outVerts[j + 1] = coords[1];
+      outVerts[j + 2] = coords[2];
+    }
+
+    const outFaces = new Int32Array(faces);
+    for (let i = 0; i < faces.length; i += 4) {
+      outFaces[i] = 3;
+      outFaces[i + 1] = vIndexMap.get(faces[i + 1]);
+      outFaces[i + 2] = vIndexMap.get(faces[i + 2]);
+      outFaces[i + 3] = vIndexMap.get(faces[i + 3]);
+    }
+
+    polydata.getPoints().setData(outVerts);
+    polydata.getPolys().setData(outFaces);
+
+    if (pointsChanged) {
+      publicAPI.modified();
+    }
+  }
+
   // Set DataSet url
   publicAPI.setUrl = (url, option = { binary: true }) => {
     model.url = url;
@@ -290,8 +348,8 @@ function vtkSTLReader(publicAPI, model) {
     // Add new output
     model.output[0] = polydata;
 
-    if (model.removeDuplicateVertices > 0) {
-      publicAPI.removeDuplicateVertices(model.removeDuplicateVertices);
+    if (model.removeDuplicateVertices >= 0) {
+      removeDuplicateVertices(model.removeDuplicateVertices);
     }
   };
 
@@ -331,75 +389,14 @@ function vtkSTLReader(publicAPI, model) {
     // Add new output
     model.output[0] = polydata;
 
-    if (model.removeDuplicateVertices > 0) {
-      publicAPI.removeDuplicateVertices(model.removeDuplicateVertices);
+    if (model.removeDuplicateVertices >= 0) {
+      removeDuplicateVertices(model.removeDuplicateVertices);
     }
   };
 
   publicAPI.requestData = (inData, outData) => {
     publicAPI.parse(model.parseData);
   };
-
-  publicAPI.removeDuplicateVertices = (tolerance = 5) => {
-    if (!model.output || !model.output[0]) {
-      console.warn('Load polydata first.');
-      return;
-    }
-    const polydata = model.output[0];
-
-    const points = polydata.getPoints().getData();
-    const faces = polydata.getPolys().getData();
-
-    if (!points || !faces) {
-      console.warn('No valid polydata.');
-      return;
-    }
-
-    const vMap = new Map();
-    const vIndexMap = new Map();
-    let vInc = 0;
-    let pointsChanged = false;
-    for (let i = 0; i < points.length; i += 3) {
-      const k1 = (points[i] * 10 ** tolerance).toFixed(0);
-      const k2 = (points[i + 1] * 10 ** tolerance).toFixed(0);
-      const k3 = (points[i + 2] * 10 ** tolerance).toFixed(0);
-      const key = `${k1},${k2},${k3}`;
-      if (vMap.get(key) !== undefined) {
-        vIndexMap.set(i / 3, vMap.get(key));
-        pointsChanged = true;
-      } else {
-        vIndexMap.set(i / 3, vInc);
-        vMap.set(key, vInc);
-        vInc++;
-      }
-    }
-
-    const outVerts = new Float32Array(vMap.size * 3);
-    const keys = Array.from(vMap.keys());
-    for (let i = 0; i < keys.length; i++) {
-      const k = keys[i];
-      const j = vMap.get(k) * 3;
-      const coords = k.split(',').map((e) => +e * 10 ** -tolerance);
-      outVerts[j] = coords[0];
-      outVerts[j + 1] = coords[1];
-      outVerts[j + 2] = coords[2];
-    }
-
-    const outFaces = new Int32Array(faces);
-    for (let i = 0; i < faces.length; i += 4) {
-      outFaces[i] = 3;
-      outFaces[i + 1] = vIndexMap.get(faces[i + 1]);
-      outFaces[i + 2] = vIndexMap.get(faces[i + 2]);
-      outFaces[i + 3] = vIndexMap.get(faces[i + 3]);
-    }
-
-    polydata.getPoints().setData(outVerts);
-    polydata.getPolys().setData(outFaces);
-
-    if (pointsChanged) {
-      publicAPI.modified();
-    }
-  };
 }
 
 // ----------------------------------------------------------------------------