@kitware/vtk.js 29.4.5 → 29.4.6

package/Widgets/Manipulators/LineManipulator.js

@@ -1,8 +1,14 @@
 import { m as macro } from '../../macros2.js';
-import { s as subtract, j as cross, d as dot, w as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
+import { d as dot, s as subtract, j as cross, w as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
 import vtkAbstractManipulator from './AbstractManipulator.js';
+import { EPSILON } from '../../Common/Core/Math/Constants.js';
 
 function projectDisplayToLine(x, y, lineOrigin, lineDirection, renderer, glRenderWindow) {
+  // if the active camera viewPlaneNormal and line direction are parallel, no change is allowed
+  const dotProduct = Math.abs(dot(renderer.getActiveCamera().getViewPlaneNormal(), lineDirection));
+  if (1 - dotProduct < EPSILON) {
+    return [];
+  }
   const near = glRenderWindow.displayToWorld(x, y, 0, renderer);
   const far = glRenderWindow.displayToWorld(x, y, 1, renderer);
   const viewDir = [0, 0, 0];

package/Widgets/Manipulators/PickerManipulator.js

@@ -15,11 +15,13 @@ function vtkPickerManipulator(publicAPI, model) {
       pokedRenderer
     } = callData;
     model.picker.pick([position.x, position.y, 0.0], pokedRenderer);
-    if (model.picker.getActors().length > 0) {
+    if (model.picker.getPickedPositions().length > 0) {
       model.position = model.picker.getPickedPositions()[0];
+    } else {
+      model.position = null;
     }
     return {
-      worldCoords: model.position || null
+      worldCoords: model.position
     };
   };
 }

package/Widgets/Widgets3D/PaintWidget/behavior.js

@@ -3,8 +3,17 @@ import { vec3 } from 'gl-matrix';
 
 function widgetBehavior(publicAPI, model) {
   model.painting = model._factory.getPainting();
-  publicAPI.handleLeftButtonPress = () => {
-    if (!model.activeState || !model.activeState.getActive()) {
+  publicAPI.handleLeftButtonPress = callData => {
+    const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
+    if (!(manipulator && model.activeState && model.activeState.getActive())) {
+      model.painting = false;
+      return macro.VOID;
+    }
+    const {
+      worldCoords
+    } = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    if (!worldCoords?.length) {
+      model.painting = false;
       return macro.VOID;
     }
     model.painting = true;
@@ -20,11 +29,12 @@ function widgetBehavior(publicAPI, model) {
       model.widgetState.clearTrailList();
     }
     model.painting = false;
-    return model.hasFocus ? macro.EVENT_ABORT : macro.VOID;
+    return macro.VOID;
   };
   publicAPI.handleEvent = callData => {
     const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
     if (!(manipulator && model.activeState && model.activeState.getActive())) {
+      model.painting = false;
       return macro.VOID;
     }
     const normal = model._camera.getDirectionOfProjection();
@@ -45,6 +55,8 @@ function widgetBehavior(publicAPI, model) {
     if (model.painting) {
       const trailCircle = model.widgetState.addTrail();
       trailCircle.set(model.activeState.get('origin', 'up', 'right', 'direction', 'scale1'));
+    } else {
+      return macro.VOID;
     }
     publicAPI.invokeInteractionEvent();
     return macro.EVENT_ABORT;

package/Widgets/Widgets3D/SeedWidget/behavior.js

@@ -30,13 +30,13 @@ function widgetBehavior(publicAPI, model) {
     }
     const worldCoords = currentWorldCoords(e);
     if (model.activeState === moveHandle) {
-      if (!moveHandle.getOrigin()) {
+      if (!moveHandle.getOrigin() && worldCoords) {
         moveHandle.setOrigin(worldCoords);
+        model.previousPosition = [...worldCoords];
       }
     }
     model._isDragging = true;
     model._apiSpecificRenderWindow.setCursor('grabbing');
-    model.previousPosition = [...currentWorldCoords(e)];
     publicAPI.invokeStartInteractionEvent();
     return macro.EVENT_ABORT;
   };
@@ -63,8 +63,10 @@ function widgetBehavior(publicAPI, model) {
     }
     if (!model.activeState) throw Error('no activestate');
     const worldCoords = currentWorldCoords(e);
-    model.activeState.setOrigin(worldCoords);
-    model.previousPosition = worldCoords;
+    if (worldCoords) {
+      model.activeState.setOrigin(worldCoords);
+      model.previousPosition = worldCoords;
+    }
     return macro.VOID;
   };
   publicAPI.grabFocus = () => {

package/package.json

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