@kitware/vtk.js 29.4.2 → 29.4.4

package/Filters/General/ContourTriangulator/helper.js

@@ -440,8 +440,8 @@ function vtkCCSMakePolysFromLines(polyData, firstLine, endLine, oriented, newPol
             let ptsEnd = npts - 1;
             if (endIdx === 1) {
               pit = npts - 1 - (completePoly ? 1 : 0);
-              ptsIt = pts + 1;
-              ptsEnd = pts + npts - (completePoly ? 1 : 0);
+              ptsIt = 1;
+              ptsEnd = npts - (completePoly ? 1 : 0);
             }
             while (ptsIt !== ptsEnd) {
               poly[--pit] = poly[ptsIt++];

package/Rendering/Core/Picker.js

@@ -33,6 +33,35 @@ function vtkPicker(publicAPI, model) {
     model.globalTMin = Number.MAX_VALUE;
   }
 
+  /**
+   * Compute the tolerance in world coordinates.
+   * Do this by determining the world coordinates of the diagonal points of the
+   * window, computing the width of the window in world coordinates, and
+   * multiplying by the tolerance.
+   * @param {Number} selectionZ
+   * @param {Number} aspect
+   * @param {vtkRenderer} renderer
+   * @returns {Number} the computed tolerance
+   */
+  function computeTolerance(selectionZ, aspect, renderer) {
+    let tolerance = 0.0;
+    const view = renderer.getRenderWindow().getViews()[0];
+    const viewport = renderer.getViewport();
+    const winSize = view.getSize();
+    let x = winSize[0] * viewport[0];
+    let y = winSize[1] * viewport[1];
+    const normalizedLeftDisplay = view.displayToNormalizedDisplay(x, y, selectionZ);
+    const windowLowerLeft = renderer.normalizedDisplayToWorld(normalizedLeftDisplay[0], normalizedLeftDisplay[1], normalizedLeftDisplay[2], aspect);
+    x = winSize[0] * viewport[2];
+    y = winSize[1] * viewport[3];
+    const normalizedRightDisplay = view.displayToNormalizedDisplay(x, y, selectionZ);
+    const windowUpperRight = renderer.normalizedDisplayToWorld(normalizedRightDisplay[0], normalizedRightDisplay[1], normalizedRightDisplay[2], aspect);
+    for (let i = 0; i < 3; i++) {
+      tolerance += (windowUpperRight[i] - windowLowerLeft[i]) * (windowUpperRight[i] - windowLowerLeft[i]);
+    }
+    return Math.sqrt(tolerance);
+  }
+
   // Intersect data with specified ray.
   // Project the center point of the mapper onto the ray and determine its parametric value
   publicAPI.intersectWithLine = (p1, p2, tol, mapper) => {
@@ -73,13 +102,6 @@ function vtkPicker(publicAPI, model) {
     let tB;
     const p1World = [];
     const p2World = [];
-    let viewport = [];
-    let winSize = [];
-    let x;
-    let y;
-    let windowLowerLeft = [];
-    let windowUpperRight = [];
-    let tol = 0.0;
     let props = [];
     let pickable = false;
     const p1Mapper = new Float64Array(4);
@@ -108,6 +130,7 @@ function vtkPicker(publicAPI, model) {
     displayCoords = renderer.worldToNormalizedDisplay(cameraFP[0], cameraFP[1], cameraFP[2], aspect);
     displayCoords = view.normalizedDisplayToDisplay(displayCoords[0], displayCoords[1], displayCoords[2]);
     selectionZ = displayCoords[2];
+    const tolerance = computeTolerance(selectionZ, aspect, renderer) * model.tolerance;
 
     // Convert the selection point into world coordinates.
     const normalizedDisplay = view.displayToNormalizedDisplay(selectionX, selectionY, selectionZ);
@@ -150,27 +173,6 @@ function vtkPicker(publicAPI, model) {
     }
     p1World[3] = 1.0;
     p2World[3] = 1.0;
-
-    // Compute the tolerance in world coordinates.  Do this by
-    // determining the world coordinates of the diagonal points of the
-    // window, computing the width of the window in world coordinates, and
-    // multiplying by the tolerance.
-    viewport = renderer.getViewport();
-    if (renderer.getRenderWindow()) {
-      winSize = renderer.getRenderWindow().getViews()[0].getSize();
-    }
-    x = winSize[0] * viewport[0];
-    y = winSize[1] * viewport[1];
-    const normalizedLeftDisplay = view.displayToNormalizedDisplay(x, y, selectionZ);
-    windowLowerLeft = renderer.normalizedDisplayToWorld(normalizedLeftDisplay[0], normalizedLeftDisplay[1], normalizedLeftDisplay[2], aspect);
-    x = winSize[0] * viewport[2];
-    y = winSize[1] * viewport[3];
-    const normalizedRightDisplay = view.displayToNormalizedDisplay(x, y, selectionZ);
-    windowUpperRight = renderer.normalizedDisplayToWorld(normalizedRightDisplay[0], normalizedRightDisplay[1], normalizedRightDisplay[2], aspect);
-    for (let i = 0; i < 3; i++) {
-      tol += (windowUpperRight[i] - windowLowerLeft[i]) * (windowUpperRight[i] - windowLowerLeft[i]);
-    }
-    tol = Math.sqrt(tol) * model.tolerance;
     if (model.pickFromList) {
       props = model.pickList;
     } else {
@@ -209,12 +211,12 @@ function vtkPicker(publicAPI, model) {
         }
         if (mapper) {
           bbox.setBounds(mapper.getBounds());
-          bbox.inflate(tol);
+          bbox.inflate(tolerance);
         } else {
           bbox.reset();
         }
         if (bbox.intersectBox(p1Mapper, ray, hitPosition, t)) {
-          t[0] = publicAPI.intersectWithLine(p1Mapper, p2Mapper, tol * 0.333 * (scale[0] + scale[1] + scale[2]), prop, mapper);
+          t[0] = publicAPI.intersectWithLine(p1Mapper, p2Mapper, tolerance * 0.333 * (scale[0] + scale[1] + scale[2]), prop, mapper);
           if (t[0] < Number.MAX_VALUE) {
             const p = [];
             p[0] = (1.0 - t[0]) * p1World[0] + t[0] * p2World[0];

package/Widgets/Widgets3D/PaintWidget/behavior.js

@@ -24,29 +24,30 @@ function widgetBehavior(publicAPI, model) {
   };
   publicAPI.handleEvent = callData => {
     const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
-    if (manipulator && model.activeState && model.activeState.getActive()) {
-      const normal = model._camera.getDirectionOfProjection();
-      const up = model._camera.getViewUp();
-      const right = [];
-      vec3.cross(right, up, normal);
-      model.activeState.setUp(...up);
-      model.activeState.setRight(...right);
-      model.activeState.setDirection(...normal);
-      const {
-        worldCoords
-      } = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
-      if (worldCoords.length) {
-        model.widgetState.setTrueOrigin(...worldCoords);
-        model.activeState.setOrigin(...worldCoords);
-        if (model.painting) {
-          const trailCircle = model.widgetState.addTrail();
-          trailCircle.set(model.activeState.get('origin', 'up', 'right', 'direction', 'scale1'));
-        }
-      }
-      publicAPI.invokeInteractionEvent();
-      return macro.EVENT_ABORT;
+    if (!(manipulator && model.activeState && model.activeState.getActive())) {
+      return macro.VOID;
+    }
+    const normal = model._camera.getDirectionOfProjection();
+    const up = model._camera.getViewUp();
+    const right = [];
+    vec3.cross(right, up, normal);
+    model.activeState.setUp(...up);
+    model.activeState.setRight(...right);
+    model.activeState.setDirection(...normal);
+    const {
+      worldCoords
+    } = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    if (!worldCoords.length) {
+      return macro.VOID;
     }
-    return macro.VOID;
+    model.widgetState.setTrueOrigin(...worldCoords);
+    model.activeState.setOrigin(...worldCoords);
+    if (model.painting) {
+      const trailCircle = model.widgetState.addTrail();
+      trailCircle.set(model.activeState.get('origin', 'up', 'right', 'direction', 'scale1'));
+    }
+    publicAPI.invokeInteractionEvent();
+    return macro.EVENT_ABORT;
   };
   publicAPI.grabFocus = () => {
     if (!model.hasFocus) {

package/Widgets/Widgets3D/ResliceCursorWidget.d.ts

@@ -75,7 +75,7 @@ export interface vtkResliceCursorWidget extends vtkAbstractWidgetFactory {
    * Return an array of the first and the last possible points of the plane
    * along its normal.
    * @param {ViewTypes} viewType
-   * @returns {[Vector3, Vector3]} first and last points
+   * @returns {Array<Vector3>} two Vector3 arrays (first and last points)
    */
   getPlaneExtremities(viewType: ViewTypes): Array<Vector3>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "29.4.2",
+  "version": "29.4.4",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -118,7 +118,6 @@
     "string-replace-loader": "3.1.0",
     "style-loader": "3.3.1",
     "tape": "5.5.3",
-    "tape-catch": "1.0.6",
     "webpack": "5.76.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-cli": "4.9.2",