@kitware/vtk.js 32.9.0 → 32.10.0

package/Common/Core/URLExtract.js

@@ -27,12 +27,8 @@ function extractURLParameters() {
   let query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window.location.search;
   const summary = {};
   const convert = castToNativeType ? toNativeType : identity;
-  const queryTokens = (query || '').replace(/#.*/, '') // remove hash query
-  .replace('?', '') // Remove ? from the head
-  .split('&'); // extract token pair
-
-  queryTokens.forEach(token => {
-    const [key, value] = token.split('=').map(s => decodeURIComponent(s));
+  const params = new URLSearchParams(query);
+  params.forEach((value, key) => {
     if (key) {
       summary[key] = value ? convert(value) : true;
     }

package/Common/DataModel/Line.js

@@ -92,6 +92,7 @@ function intersection(a1, a2, b1, b2, u, v) {
       obj = distanceToLine(p[i], l1[i], l2[i]);
       if (obj.distance < minDist) {
         minDist = obj.distance;
+        obj.t;
       }
     }
     return IntersectionState.ON_LINE;

package/Common/DataModel/PolyLine.js

@@ -28,6 +28,10 @@ function vtkPolyLine(publicAPI, model) {
           outObj.subId = subId;
           outObj.t = lineIntersected.t;
           pDistMin = pDist;
+          for (let k = 0; k < 3; k++) {
+            x[k];
+            pCoords[k];
+          }
         }
       }
     }

package/IO/Core/DataAccessHelper/JSZipDataAccessHelper.js

@@ -1,4 +1,4 @@
-import { strToU8, unzipSync, strFromU8, decompressSync } from 'fflate';
+import { unzipSync, strFromU8, decompressSync, strToU8 } from 'fflate';
 import { m as macro } from '../../../macros2.js';
 import Endian from '../../../Common/Core/Endian.js';
 import { DataTypeByteSize } from '../../../Common/Core/DataArray/Constants.js';

package/IO/Geometry/STLReader.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]
@@ -94,6 +99,15 @@ export interface vtkSTLReader extends vtkSTLReaderBase {
    * @param {ISTLReaderOptions} [option] The STL reader options.
    */
   setUrl(url: string, option?: ISTLReaderOptions): Promise<string | any>;
+
+  /**
+   * Turn on/off automatic removeDuplicateVertices
+   * 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;
 }
 
 /**

package/IO/Geometry/STLReader.js

@@ -103,6 +103,55 @@ function vtkSTLReader(publicAPI, model) {
       progressCallback
     });
   }
+  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 = function (url) {
@@ -251,6 +300,9 @@ function vtkSTLReader(publicAPI, model) {
 
     // Add new output
     model.output[0] = polydata;
+    if (model.removeDuplicateVertices >= 0) {
+      removeDuplicateVertices(model.removeDuplicateVertices);
+    }
   };
   publicAPI.parseAsText = content => {
     if (!content) {
@@ -281,6 +333,9 @@ function vtkSTLReader(publicAPI, model) {
 
     // Add new output
     model.output[0] = polydata;
+    if (model.removeDuplicateVertices >= 0) {
+      removeDuplicateVertices(model.removeDuplicateVertices);
+    }
   };
   publicAPI.requestData = (inData, outData) => {
     publicAPI.parse(model.parseData);
@@ -295,6 +350,7 @@ const DEFAULT_VALUES = {
   // baseURL: null,
   // dataAccessHelper: null,
   // url: null,
+  removeDuplicateVertices: -1
 };
 
 // ----------------------------------------------------------------------------
@@ -306,7 +362,7 @@ function extend(publicAPI, model) {
   // 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

package/Rendering/Core/Glyph3DMapper.d.ts

@@ -12,11 +12,11 @@ interface IPrimitiveCount {
 export interface IGlyph3DMapperInitialValues extends IMapperInitialValues {
   orient?: boolean;
   orientationMode?: OrientationModes;
-  orientationArray?: number[];
+  orientationArray?: string;
   scaling?: boolean;
   scaleFactor?: number;
   scaleMode?: ScaleModes;
-  scaleArray?: number[];
+  scaleArray?: string;
   matrixArray?: number[];
   normalArray?: number[];
   colorArray?: number[];
@@ -24,29 +24,26 @@ export interface IGlyph3DMapperInitialValues extends IMapperInitialValues {
 
 export interface vtkGlyph3DMapper extends vtkMapper {
   /**
-   * An orientation array is a vtkDataArray with 3 components. The first
-   * component is the angle of rotation along the X axis. The second component
-   * is the angle of rotation along the Y axis. The third component is the
-   * angle of rotation along the Z axis. Orientation is specified in X,Y,Z
-   * order but the rotations are performed in Z,X an Y.
-   *
-   * This definition is compliant with SetOrientation method on vtkProp3D.
+   * Get the bounds for this mapper as [xmin, xmax, ymin, ymax,zmin, zmax].
+   * @return {Bounds} The bounds for the mapper.
+   */
+  getBounds(): Bounds;
+
+  /**
    *
-   * By using vector or normal there is a degree of freedom or rotation left
-   * (underconstrained). With the orientation array, there is no degree of
-   * freedom left.
    */
-  getOrientationMode(): OrientationModes;
+  buildArrays(): void;
 
   /**
-   * Get orientation as string
+   *
    */
-  getOrientationModeAsString(): string;
+  getPrimitiveCount(): IPrimitiveCount;
 
   /**
-   * Get orientation as array
+   * Get scale mode
+   * @default `SCALE_BY_MAGNITUDE`
    */
-  getOrientationArrayData(): number[];
+  getScaleMode(): ScaleModes;
 
   /**
    * Get scale factor to scale object by.
@@ -54,15 +51,20 @@ export interface vtkGlyph3DMapper extends vtkMapper {
   getScaleFactor(): number;
 
   /**
-   * Get scale mode
-   * @default `SCALE_BY_MAGNITUDE`
+   * Get scale mode as string
    */
-  getScaleMode(): ScaleModes;
+  getScaleModeAsString(): string;
 
   /**
-   * Get scale mode as string
+   * Sets the name of the array to use as scale values.
+   * @param {String} arrayName Name of the array
    */
-  getScaleModeAsString(): string;
+  setScaleArray(arrayName: Nullable<string>): boolean;
+
+  /**
+   * Gets the name of the array used as scale values.
+   */
+  getScaleArray(): string;
 
   /**
    * Get scale mode as array
@@ -70,20 +72,29 @@ export interface vtkGlyph3DMapper extends vtkMapper {
   getScaleArrayData(): number[];
 
   /**
-   * Get the bounds for this mapper as [xmin, xmax, ymin, ymax,zmin, zmax].
-   * @return {Bounds} The bounds for the mapper.
+   * An orientation array is a vtkDataArray with 3 components. The first
+   * component is the angle of rotation along the X axis. The second component
+   * is the angle of rotation along the Y axis. The third component is the
+   * angle of rotation along the Z axis. Orientation is specified in X,Y,Z
+   * order but the rotations are performed in Z,X an Y.
+   *
+   * This definition is compliant with SetOrientation method on vtkProp3D.
+   *
+   * By using vector or normal there is a degree of freedom or rotation left
+   * (underconstrained). With the orientation array, there is no degree of
+   * freedom left.
    */
-  getBounds(): Bounds;
+  getOrientationMode(): OrientationModes;
 
   /**
-   *
+   * Get orientation as string
    */
-  buildArrays(): void;
+  getOrientationModeAsString(): string;
 
   /**
-   *
+   * Get orientation as array
    */
-  getPrimitiveCount(): IPrimitiveCount;
+  getOrientationArrayData(): number[];
 
   /**
    * Sets the name of the array to use as orientation.
@@ -91,6 +102,11 @@ export interface vtkGlyph3DMapper extends vtkMapper {
    */
   setOrientationArray(arrayName: Nullable<string>): boolean;
 
+  /**
+   * Gets the name of the array used as orientation values.
+   */
+  getOrientationArray(): string;
+
   /**
    * Orientation mode indicates if the OrientationArray provides the direction
    * vector for the orientation or the rotations around each axes.

package/Rendering/Core/ImageCPRMapper.js

@@ -1,4 +1,4 @@
-import { vec3, mat4, quat } from 'gl-matrix';
+import { quat, vec3, mat4 } from 'gl-matrix';
 import CoincidentTopologyHelper from './Mapper/CoincidentTopologyHelper.js';
 import vtkAbstractImageMapper from './AbstractImageMapper.js';
 import { m as macro } from '../../macros2.js';

package/Rendering/Core/PointPicker.js

@@ -80,6 +80,9 @@ function vtkPointPicker(publicAPI, model) {
             if (maxDist <= tolerance && maxDist < minPtDist) {
               // within tolerance
               minPtId = ptId;
+              x[0];
+              x[1];
+              x[2];
               minPtDist = maxDist;
               tMin = t;
             }
@@ -108,6 +111,9 @@ function vtkPointPicker(publicAPI, model) {
           if (maxDist <= tolerance && maxDist < minPtDist) {
             // within tolerance
             minPtId = ptId;
+            x[0];
+            x[1];
+            x[2];
             minPtDist = maxDist;
             tMin = t;
           }

package/Rendering/Misc/SynchronizableRenderWindow/ObjectManager.d.ts

@@ -1,6 +1,6 @@
 import { vtkObject } from './../../../interfaces';
 import { Nullable } from './../../../types';
-import { ISynchronizerContext, IViewState } from '..';
+import { ISynchronizerContext, IViewState } from '../SynchronizableRenderWindow';
 
 export type BuilderFunction = <T extends vtkObject>(
   type: string,

package/Widgets/Widgets3D/InteractiveOrientationWidget.js

@@ -2,7 +2,7 @@ import { m as macro } from '../../macros2.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkConvexFaceContextRepresentation from '../Representations/ConvexFaceContextRepresentation.js';
 import widgetBehavior from './InteractiveOrientationWidget/behavior.js';
-import { generateState, INITIAL_POINTS } from './InteractiveOrientationWidget/state.js';
+import { INITIAL_POINTS, generateState } from './InteractiveOrientationWidget/state.js';
 import { Behavior } from '../Representations/WidgetRepresentation/Constants.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "32.9.0",
+  "version": "32.10.0",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -53,8 +53,8 @@
     "@babel/eslint-parser": "7.22.11",
     "@babel/plugin-transform-runtime": "7.22.10",
     "@babel/preset-env": "7.22.10",
-    "@commitlint/cli": "16.2.4",
-    "@commitlint/config-conventional": "16.2.4",
+    "@commitlint/cli": "19.7.1",
+    "@commitlint/config-conventional": "19.7.1",
     "@mapbox/node-pre-gyp": "1.0.9",
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-babel": "5.3.1",
@@ -62,6 +62,7 @@
     "@rollup/plugin-eslint": "8.0.2",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.1.3",
+    "@types/node": "^22.13.1",
     "autoprefixer": "10.4.7",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
@@ -72,7 +73,7 @@
     "cross-env": "7.0.3",
     "css-loader": "6.7.1",
     "dotenv": "16.0.1",
-    "dox": "0.9.1",
+    "dox": "1.0.0",
     "eslint": "8.15.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-config-prettier": "8.5.0",
@@ -105,7 +106,7 @@
     "prettier": "2.6.2",
     "process": "0.11.10",
     "regenerator-runtime": "0.13.9",
-    "rollup": "2.73.0",
+    "rollup": "2.79.2",
     "rollup-plugin-auto-external": "2.0.0",
     "rollup-plugin-copy": "3.4.0",
     "rollup-plugin-ignore": "1.0.10",
@@ -119,14 +120,14 @@
     "string-replace-loader": "3.1.0",
     "style-loader": "3.3.1",
     "tape": "5.5.3",
-    "webpack": "5.76.0",
+    "webpack": "5.97.1",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.9.2",
     "webpack-dashboard": "3.3.7",
     "webpack-dev-server": "4.9.0",
     "webpack-merge": "5.8.0",
     "webpack-notifier": "1.15.0",
-    "wslink": "1.6.4",
+    "wslink": "1.12.4",
     "xml2js": "0.5.0"
   },
   "peerDependencies": {
@@ -142,7 +143,7 @@
     "lint": "eslint Sources Examples",
     "doc": "kw-doc -c ./Documentation/config.js",
     "doc:www": "npm t -- --single-run && kw-doc -c ./Documentation/config.js -s",
-    "doc:publish": "kw-doc -c ./Documentation/config.js -mp",
+    "doc:minified": "kw-doc -c ./Documentation/config.js -m",
     "doc:generate-api": "node ./Documentation/generate-api-docs.js",
     "example": "node ./Utilities/ExampleRunner/example-runner-cli.js -c ./Documentation/config.js",
     "example:https": "node ./Utilities/ExampleRunner/example-runner-cli.js --server-type https -c ./Documentation/config.js",
@@ -150,7 +151,7 @@
     "dev:esm": "npm run build:esm -- -w",
     "dev:umd": "webpack --watch --config webpack.dev.js --progress",
     "build": "npm run build:release",
-    "build:esm": "npm run patch-build-deps && rollup -c rollup.config.js",
+    "build:esm": "rollup -c rollup.config.js",
     "build:umd": "webpack --config webpack.prod.js --progress",
     "build:release": "npm run lint && concurrently \"cross-env NOLINT=1 npm run build:esm\" \"cross-env NOLINT=1 npm run build:umd\"",
     "release:create-packages": "node ./Utilities/ci/build-npm-package.js",
@@ -163,7 +164,7 @@
     "commit": "git cz",
     "semantic-release": "semantic-release",
     "prepare": "node ./Utilities/prepare.js",
-    "patch-build-deps": "patch-package --patch-dir ./Utilities/build/patches"
+    "postinstall": "patch-package"
   },
   "config": {
     "commitizen": {