@kitware/vtk.js 34.11.2 → 34.11.3

package/Common/DataModel/BoundingBox.js

@@ -234,14 +234,14 @@ function oppositeSign(a, b) {
   return a <= 0 && b >= 0 || a >= 0 && b <= 0;
 }
 function getCorners(bounds, corners) {
-  let count = 0;
-  for (let ix = 0; ix < 2; ix++) {
-    for (let iy = 2; iy < 4; iy++) {
-      for (let iz = 4; iz < 6; iz++) {
-        corners[count++] = [bounds[ix], bounds[iy], bounds[iz]];
-      }
-    }
-  }
+  corners[0] = [bounds[0], bounds[2], bounds[4]];
+  corners[1] = [bounds[0], bounds[2], bounds[5]];
+  corners[2] = [bounds[0], bounds[3], bounds[4]];
+  corners[3] = [bounds[0], bounds[3], bounds[5]];
+  corners[4] = [bounds[1], bounds[2], bounds[4]];
+  corners[5] = [bounds[1], bounds[2], bounds[5]];
+  corners[6] = [bounds[1], bounds[3], bounds[4]];
+  corners[7] = [bounds[1], bounds[3], bounds[5]];
   return corners;
 }
 

package/Interaction/Style/InteractorStyleMPRSlice.js

@@ -1,20 +1,18 @@
 import { m as macro } from '../../macros2.js';
-import { l as normalize, e as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
+import { l as normalize, E as areEquals, e as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
 import vtkMatrixBuilder from '../../Common/Core/MatrixBuilder.js';
+import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
 import vtkInteractorStyleManipulator from './InteractorStyleManipulator.js';
 import vtkMouseCameraTrackballRotateManipulator from '../Manipulators/MouseCameraTrackballRotateManipulator.js';
 import vtkMouseCameraTrackballPanManipulator from '../Manipulators/MouseCameraTrackballPanManipulator.js';
 import vtkMouseCameraTrackballZoomManipulator from '../Manipulators/MouseCameraTrackballZoomManipulator.js';
 import vtkMouseRangeManipulator from '../Manipulators/MouseRangeManipulator.js';
+import { mat4 } from 'gl-matrix';
 
 // ----------------------------------------------------------------------------
 // Global methods
 // ----------------------------------------------------------------------------
 
-function boundsToCorners(bounds) {
-  return [[bounds[0], bounds[2], bounds[4]], [bounds[0], bounds[2], bounds[5]], [bounds[0], bounds[3], bounds[4]], [bounds[0], bounds[3], bounds[5]], [bounds[1], bounds[2], bounds[4]], [bounds[1], bounds[2], bounds[5]], [bounds[1], bounds[3], bounds[4]], [bounds[1], bounds[3], bounds[5]]];
-}
-
 // ----------------------------------------------------------------------------
 
 function clamp(value, min, max) {
@@ -120,9 +118,8 @@ function vtkInteractorStyleMPRSlice(publicAPI, model) {
     const camera = renderer.getActiveCamera();
     if (model.volumeMapper) {
       const range = publicAPI.getSliceRange();
-      const bounds = model.volumeMapper.getBounds();
       const clampedSlice = clamp(slice, ...range);
-      const center = [(bounds[0] + bounds[1]) / 2.0, (bounds[2] + bounds[3]) / 2.0, (bounds[4] + bounds[5]) / 2.0];
+      const center = model.volumeMapper.getCenter();
       const distance = camera.getDistance();
       const dop = camera.getDirectionOfProjection();
       normalize(dop);
@@ -137,28 +134,23 @@ function vtkInteractorStyleMPRSlice(publicAPI, model) {
   publicAPI.getSliceRange = () => {
     if (model.volumeMapper) {
       const sliceNormal = publicAPI.getSliceNormal();
-      if (sliceNormal[0] === cache.sliceNormal[0] && sliceNormal[1] === cache.sliceNormal[1] && sliceNormal[2] === cache.sliceNormal[2]) {
+      if (areEquals(sliceNormal, cache.sliceNormal)) {
         return cache.sliceRange;
       }
-      const bounds = model.volumeMapper.getBounds();
-      const points = boundsToCorners(bounds);
 
       // Get rotation matrix from normal to +X (since bounds is aligned to XYZ)
-      const transform = vtkMatrixBuilder.buildFromDegree().identity().rotateFromDirections(sliceNormal, [1, 0, 0]);
-      points.forEach(pt => transform.apply(pt));
+      const sliceOrientation = vtkMatrixBuilder.buildFromDegree().identity().rotateFromDirections(sliceNormal, [1, 0, 0]);
+      const imageAlongSliceNormal = mat4.create();
+      mat4.multiply(imageAlongSliceNormal, sliceOrientation.getMatrix(), model.volumeMapper.getInputData().getIndexToWorld());
+
+      // Transform the 8 corners of the input data's bounding box
+      // to rotate into the slice plane space without the intermediate
+      // axis-aligned box (provided by getBounds) which would grow the bounds.
+      const transformedBounds = vtkBoundingBox.transformBounds(model.volumeMapper.getInputData().getSpatialExtent(), imageAlongSliceNormal);
 
       // range is now maximum X distance
-      let minX = Infinity;
-      let maxX = -Infinity;
-      for (let i = 0; i < 8; i++) {
-        const x = points[i][0];
-        if (x > maxX) {
-          maxX = x;
-        }
-        if (x < minX) {
-          minX = x;
-        }
-      }
+      const minX = transformedBounds[0];
+      const maxX = transformedBounds[1];
       cache.sliceNormal = sliceNormal;
       cache.sliceRange = [minX, maxX];
       return cache.sliceRange;

package/Rendering/Core/Prop3D.js

@@ -186,6 +186,12 @@ function vtkProp3D(publicAPI, model) {
     }
     return model.properties[mapperInputPort];
   };
+  publicAPI.getProperties = () => {
+    if (model.properties.length === 0) {
+      model.properties[0] = publicAPI.makeProperty?.();
+    }
+    return model.properties;
+  };
   publicAPI.setProperty = (firstArg, secondArg) => {
     // Two options for argument layout:
     // - (mapperInputPort, property)

package/package.json

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