@kitware/vtk.js 35.0.0 → 35.1.0

package/IO/Geometry/STLReader.d.ts

@@ -13,7 +13,34 @@ interface ISTLReaderOptions {
 /**
  *
  */
-export interface ISTLReaderInitialValues {}
+export interface ISTLReaderInitialValues {
+  /**
+   * Data access helper used for loading remote resources.
+   */
+  dataAccessHelper?:
+    | HtmlDataAccessHelper
+    | HttpDataAccessHelper
+    | JSZipDataAccessHelper
+    | LiteHttpDataAccessHelper;
+
+  /**
+   * Point locator used for vertex merging.
+   */
+  locator?: any;
+
+  /**
+   * Enable/disable point merging.
+   * Default is true.
+   */
+  merging?: boolean;
+
+  /**
+   * Merge tolerance power.
+   * If >= 0, points within 10^-tolerance are merged.
+   * Default is -1 (disabled).
+   */
+  removeDuplicateVertices?: number;
+}
 
 type vtkSTLReaderBase = vtkObject &
   Omit<
@@ -41,6 +68,16 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
     | JSZipDataAccessHelper
     | LiteHttpDataAccessHelper;
 
+  /**
+   * Get the point locator used for vertex merging.
+   */
+  getLocator(): any;
+
+  /**
+   * Get whether point merging is enabled.
+   */
+  getMerging(): boolean;
+
   /**
    * Get the url of the object to load.
    */
@@ -74,6 +111,7 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
    * @param {String} content The content to parse.
    */
   parseAsText(content: string): void;
+
   /**
    *
    * @param inData
@@ -93,6 +131,16 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
       | LiteHttpDataAccessHelper
   ): boolean;
 
+  /**
+   * Set a point locator used for vertex merging.
+   */
+  setLocator(locator: any): boolean;
+
+  /**
+   * Enable/disable point merging.
+   */
+  setMerging(merging: boolean): boolean;
+
   /**
    * Set the url of the object to load.
    * @param {String} url the url of the object to load.

package/IO/Geometry/STLReader.js

@@ -1,8 +1,10 @@
+import { m as macro } from '../../macros2.js';
 import BinaryHelper from '../Core/BinaryHelper.js';
 import DataAccessHelper from '../Core/DataAccessHelper.js';
-import { m as macro } from '../../macros2.js';
 import vtkDataArray from '../../Common/Core/DataArray.js';
 import vtkMatrixBuilder from '../../Common/Core/MatrixBuilder.js';
+import vtkPoints from '../../Common/Core/Points.js';
+import vtkMergePoints from '../../Common/DataModel/MergePoints.js';
 import vtkPolyData from '../../Common/DataModel/PolyData.js';
 import '../Core/DataAccessHelper/LiteHttpDataAccessHelper.js';
 
@@ -11,7 +13,8 @@ import '../Core/DataAccessHelper/LiteHttpDataAccessHelper.js';
 // import 'vtk.js/Sources/IO/Core/DataAccessHelper/JSZipDataAccessHelper'; // zip
 
 const {
-  vtkErrorMacro
+  vtkErrorMacro,
+  vtkWarningMacro
 } = macro;
 function parseHeader(headerString) {
   const headerSubStr = headerString.split(' ');
@@ -101,54 +104,83 @@ function vtkSTLReader(publicAPI, model) {
       progressCallback
     });
   }
-  function removeDuplicateVertices(tolerance) {
+  function removeDuplicateVertices(tolerancePower) {
     const polydata = model.output[0];
     const points = polydata.getPoints().getData();
     const faces = polydata.getPolys().getData();
     if (!points || !faces) {
-      console.warn('No valid polydata.');
+      vtkWarningMacro('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 inCellNormals = polydata.getCellData().getNormals();
+    const inCellScalars = polydata.getCellData().getScalars();
+    const mergedPoints = vtkPoints.newInstance({
+      dataType: points.constructor
+    });
+    mergedPoints.allocate(points.length / 6, 3);
+    let locator = model.locator;
+    if (!locator) {
+      locator = vtkMergePoints.newInstance();
+    }
+    if (tolerancePower >= 0) {
+      locator.setTolerance(10 ** -tolerancePower);
+    }
+    locator.initPointInsertion(mergedPoints, polydata.getBounds(), Math.floor(points.length / 3 / 2));
+    const mergedCells = [];
+    const keptCellIds = [];
+    for (let i = 0, cellId = 0; i < faces.length; i += 4, cellId++) {
+      if (faces[i] === 3) {
+        const nodeIds = [0, 0, 0];
+        for (let j = 0; j < 3; j++) {
+          const pid = faces[i + 1 + j];
+          const x = [points[pid * 3], points[pid * 3 + 1], points[pid * 3 + 2]];
+          nodeIds[j] = locator.insertUniquePoint(x).id;
+        }
+        if (nodeIds[0] !== nodeIds[1] && nodeIds[0] !== nodeIds[2] && nodeIds[1] !== nodeIds[2]) {
+          mergedCells.push(3, nodeIds[0], nodeIds[1], nodeIds[2]);
+          keptCellIds.push(cellId);
+        }
       }
     }
-    if (pointsChanged) {
-      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 outCellArray = new faces.constructor(mergedCells);
+    polydata.getPoints().setData(mergedPoints.getData(), 3);
+    polydata.getPolys().setData(outCellArray);
+    if (inCellNormals && inCellNormals.getData()) {
+      const inData = inCellNormals.getData();
+      const numComp = inCellNormals.getNumberOfComponents();
+      const outData = new inData.constructor(keptCellIds.length * numComp);
+      for (let i = 0; i < keptCellIds.length; i++) {
+        const srcOffset = keptCellIds[i] * numComp;
+        const dstOffset = i * numComp;
+        for (let c = 0; c < numComp; c++) {
+          outData[dstOffset + c] = inData[srcOffset + c];
+        }
       }
-      const outFaces = new Int32Array(faces.length);
-      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.getCellData().setNormals(vtkDataArray.newInstance({
+        name: inCellNormals.getName() || 'Normals',
+        values: outData,
+        numberOfComponents: numComp
+      }));
+    }
+    if (inCellScalars && inCellScalars.getData()) {
+      const inData = inCellScalars.getData();
+      const numComp = inCellScalars.getNumberOfComponents();
+      const outData = new inData.constructor(keptCellIds.length * numComp);
+      for (let i = 0; i < keptCellIds.length; i++) {
+        const srcOffset = keptCellIds[i] * numComp;
+        const dstOffset = i * numComp;
+        for (let c = 0; c < numComp; c++) {
+          outData[dstOffset + c] = inData[srcOffset + c];
+        }
       }
-      polydata.getPoints().setData(outVerts);
-      polydata.getPolys().setData(outFaces);
-      polydata.modified();
+      polydata.getCellData().setScalars(vtkDataArray.newInstance({
+        name: inCellScalars.getName() || 'Attribute',
+        values: outData,
+        numberOfComponents: numComp
+      }));
     }
+    locator.initialize();
+    polydata.modified();
   }
 
   // Set DataSet url
@@ -296,7 +328,7 @@ function vtkSTLReader(publicAPI, model) {
 
     // Add new output
     model.output[0] = polydata;
-    if (model.removeDuplicateVertices >= 0) {
+    if (model.merging && model.removeDuplicateVertices >= 0) {
       removeDuplicateVertices(model.removeDuplicateVertices);
     }
   };
@@ -329,7 +361,7 @@ function vtkSTLReader(publicAPI, model) {
 
     // Add new output
     model.output[0] = polydata;
-    if (model.removeDuplicateVertices >= 0) {
+    if (model.merging && model.removeDuplicateVertices >= 0) {
       removeDuplicateVertices(model.removeDuplicateVertices);
     }
   };
@@ -345,7 +377,9 @@ function vtkSTLReader(publicAPI, model) {
 const DEFAULT_VALUES = {
   // baseURL: null,
   // dataAccessHelper: null,
+  // locator: null,
   // url: null,
+  merging: true,
   removeDuplicateVertices: -1
 };
 
@@ -357,7 +391,7 @@ function extend(publicAPI, model, initialValues = {}) {
   // Build VTK API
   macro.obj(publicAPI, model);
   macro.get(publicAPI, model, ['url', 'baseURL']);
-  macro.setGet(publicAPI, model, ['dataAccessHelper', 'removeDuplicateVertices']);
+  macro.setGet(publicAPI, model, ['dataAccessHelper', 'locator', 'merging', 'removeDuplicateVertices']);
   macro.algo(publicAPI, model, 0, 1);
 
   // vtkSTLReader methods

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "35.0.0",
+  "version": "35.1.0",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",