fix(STLReader): apply requested changes in removeDuplicateVertices

Author: jreyero12

Sources/IO/Geometry/STLReader/example/index.js

@@ -13,6 +13,7 @@ import vtkPolyDataNormals from '@kitware/vtk.js/Filters/Core/PolyDataNormals';
 // ----------------------------------------------------------------------------
 
 const reader = vtkSTLReader.newInstance();
+reader.setRemoveDuplicateVertices(5);
 const mapper = vtkMapper.newInstance({ scalarVisibility: false });
 const actor = vtkActor.newInstance();
 
@@ -56,7 +57,6 @@ function handleFile(event) {
     const fileReader = new FileReader();
     fileReader.onload = function onLoad(e) {
       reader.parseAsArrayBuffer(fileReader.result);
-      reader.removeDuplicateVertices(5);
       update();
     };
     fileReader.readAsArrayBuffer(files[0]);

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

@@ -46,6 +46,11 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
    */
   getUrl(): string;
 
+  /**
+   * Get tolerance when removeDuplicateVertices is set
+   */
+  getRemoveDuplicateVertices(): number;
+
   /**
    * Load the object data.
    * @param {ISTLReaderOptions} [options]
@@ -76,6 +81,12 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
    */
   requestData(inData: any, outData: any): void;
 
+  /**
+   *
+   * @param tolerance
+   */
+  removeDuplicateVertices(tolerance: number = 5): void;
+
   /**
    *
    * @param dataAccessHelper
@@ -96,10 +107,10 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
   setUrl(url: string, option?: ISTLReaderOptions): Promise<string | any>;
 
   /**
-   *
-   * @param offset
+   * Turn on/off automatic removeDuplicateVertices
+   * @param {Number} tolerance
    */
-  removeDuplicateVertices(offset: number = 5): void;
+  setRemoveDuplicateVertices(tolerance: number): boolean;
 }
 
 /**

Sources/IO/Geometry/STLReader/index.js

@@ -289,6 +289,10 @@ function vtkSTLReader(publicAPI, model) {
 
     // Add new output
     model.output[0] = polydata;
+
+    if (model.removeDuplicateVertices > 0) {
+      publicAPI.removeDuplicateVertices(model.removeDuplicateVertices);
+    }
   };
 
   publicAPI.parseAsText = (content) => {
@@ -326,37 +330,43 @@ function vtkSTLReader(publicAPI, model) {
 
     // Add new output
     model.output[0] = polydata;
+
+    if (model.removeDuplicateVertices > 0) {
+      publicAPI.removeDuplicateVertices(model.removeDuplicateVertices);
+    }
   };
 
   publicAPI.requestData = (inData, outData) => {
     publicAPI.parse(model.parseData);
   };
 
-  publicAPI.removeDuplicateVertices = (offset = 5) => {
+  publicAPI.removeDuplicateVertices = (tolerance = 5) => {
     if (!model.output || !model.output[0]) {
       console.warn('Load polydata first.');
       return;
     }
     const polydata = model.output[0];
 
-    const vertices = polydata.getPoints().getData();
+    const points = polydata.getPoints().getData();
     const faces = polydata.getPolys().getData();
 
-    if (!vertices || !faces) {
+    if (!points || !faces) {
       console.warn('No valid polydata.');
       return;
     }
 
     const vMap = new Map();
     const vIndexMap = new Map();
     let vInc = 0;
-    for (let i = 0; i < vertices.length; i += 3) {
-      const k1 = (vertices[i] * 10 ** offset).toFixed(0);
-      const k2 = (vertices[i + 1] * 10 ** offset).toFixed(0);
-      const k3 = (vertices[i + 2] * 10 ** offset).toFixed(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);
@@ -365,12 +375,15 @@ function vtkSTLReader(publicAPI, model) {
     }
 
     const outVerts = new Float32Array(vMap.size * 3);
-    vMap.keys().forEach((k) => {
+    const keys = Array.from(vMap.keys());
+    for (let i = 0; i < keys.length; i++) {
+      const k = keys[i];
       const j = vMap.get(k) * 3;
-      [outVerts[j], outVerts[j + 1], outVerts[j + 2]] = k
-        .split(',')
-        .map((e) => +e * 10 ** -offset);
-    });
+      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) {
@@ -383,7 +396,9 @@ function vtkSTLReader(publicAPI, model) {
     polydata.getPoints().setData(outVerts);
     polydata.getPolys().setData(outFaces);
 
-    publicAPI.modified();
+    if (pointsChanged) {
+      publicAPI.modified();
+    }
   };
 }
 
@@ -395,6 +410,7 @@ const DEFAULT_VALUES = {
   // baseURL: null,
   // dataAccessHelper: null,
   // url: null,
+  removeDuplicateVertices: 0,
 };
 
 // ----------------------------------------------------------------------------
@@ -405,7 +421,10 @@ export function extend(publicAPI, model, initialValues = {}) {
   // Build VTK API
   macro.obj(publicAPI, model);
   macro.get(publicAPI, model, ['url', 'baseURL']);
-  macro.setGet(publicAPI, model, ['dataAccessHelper']);
+  macro.setGet(publicAPI, model, [
+    'dataAccessHelper',
+    'removeDuplicateVertices',
+  ]);
   macro.algo(publicAPI, model, 0, 1);
 
   // vtkSTLReader methods