@kitware/vtk.js 30.5.0 → 30.5.2

package/Common/Core/Points.d.ts

@@ -73,8 +73,9 @@ export interface vtkPoints extends vtkDataArray {
 	 * @param {Number} x The x coordinate.
 	 * @param {Number} y The y coordinate.
 	 * @param {Number} z The z coordinate.
+	 * @returns {Number} Index of the inserted point.
 	 */
-	insertNextPoint(x: number, y: number, z: number): void;
+	insertNextPoint(x: number, y: number, z: number): number;
 }
 
 /**

package/Rendering/OpenGL/ImageResliceMapper.js

@@ -181,7 +181,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
     const numComp = scalars.getNumberOfComponents();
     let toString = `${image.getMTime()}A${scalars.getMTime()}`;
     const tex = model._openGLRenderWindow.getGraphicsResourceForObject(scalars);
-    const reBuildTex = !tex?.vtkObj || tex?.hash !== toString || model.openGLTextureString !== toString;
+    const reBuildTex = !tex?.vtkObj || tex?.hash !== toString;
     if (reBuildTex) {
       if (!model.openGLTexture) {
         model.openGLTexture = vtkOpenGLTexture.newInstance();
@@ -194,13 +194,11 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
       model.openGLTexture.releaseGraphicsResources(model._openGLRenderWindow);
       model.openGLTexture.resetFormatAndType();
       model.openGLTexture.create3DFilterableFromDataArray(dims[0], dims[1], dims[2], scalars);
-      model.openGLTextureString = toString;
       if (scalars) {
-        model._openGLRenderWindow.setGraphicsResourceForObject(scalars, model.openGLTexture, model.openGLTextureString);
+        model._openGLRenderWindow.setGraphicsResourceForObject(scalars, model.openGLTexture, toString);
       }
     } else {
       model.openGLTexture = tex.vtkObj;
-      model.openGLTextureString = tex.hash;
     }
     const ppty = actor.getProperty();
     const iComps = ppty.getIndependentComponents();
@@ -873,7 +871,6 @@ const DEFAULT_VALUES = {
   lastSlabTrapezoidIntegration: 0,
   lastSlabType: -1,
   openGLTexture: null,
-  openGLTextureString: null,
   colorTextureString: null,
   pwfTextureString: null,
   resliceGeom: null,

package/Rendering/OpenGL/VolumeMapper.js

@@ -1242,7 +1242,6 @@ const DEFAULT_VALUES = {
   context: null,
   VBOBuildTime: null,
   scalarTexture: null,
-  scalarTextureString: null,
   opacityTexture: null,
   opacityTextureString: null,
   colorTexture: null,

package/Widgets/Widgets3D/ImageCroppingWidget/behavior.js

@@ -1,5 +1,5 @@
 import { m as macro } from '../../../macros2.js';
-import { handleTypeFromName, AXES, transformVec3, rotateVec3 } from './helpers.js';
+import { handleTypeFromName, AXES, calculateCropperCenter, calculateDirection, transformVec3 } from './helpers.js';
 
 function widgetBehavior(publicAPI, model) {
   model._isDragging = false;
@@ -47,23 +47,20 @@ function widgetBehavior(publicAPI, model) {
           worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
         }
         if (type === 'faces') {
-          // constraint axis is line defined by the index and center point.
-          // Since our index point is defined inside a box [0, 2, 0, 2, 0, 2],
-          // center point is [1, 1, 1].
-          const constraintAxis = [1 - index[0], 1 - index[1], 1 - index[2]];
-
           // get center of current crop box
-          const center = [(planes[0] + planes[1]) / 2, (planes[2] + planes[3]) / 2, (planes[4] + planes[5]) / 2];
-
-          // manipulator should be a line manipulator
-          manipulator.setHandleOrigin(transformVec3(center, indexToWorldT));
-          manipulator.setHandleNormal(rotateVec3(constraintAxis, indexToWorldT));
+          const worldCenter = calculateCropperCenter(planes, indexToWorldT);
+          manipulator.setHandleOrigin(worldCenter);
+          manipulator.setHandleNormal(calculateDirection(model.activeState.getOrigin(), worldCenter));
           worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
         }
         if (type === 'edges') {
           // constrain to a plane with a normal parallel to the edge
           const edgeAxis = index.map(a => a === 1 ? a : 0);
-          manipulator.setHandleNormal(rotateVec3(edgeAxis, indexToWorldT));
+          const faceName = edgeAxis.map(i => AXES[i + 1]).join('');
+          const handle = model.widgetState.getStatesWithLabel(faceName)[0];
+          // get center of current crop box
+          const worldCenter = calculateCropperCenter(planes, indexToWorldT);
+          manipulator.setHandleNormal(calculateDirection(handle.getOrigin(), worldCenter));
           worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
         }
         if (worldCoords.length) {

package/Widgets/Widgets3D/ImageCroppingWidget/helpers.js

@@ -34,5 +34,16 @@ function handleTypeFromName(name) {
   }
   return 'faces';
 }
+function calculateCropperCenter(planes, transform) {
+  // get center of current crop box
+  const center = [(planes[0] + planes[1]) / 2, (planes[2] + planes[3]) / 2, (planes[4] + planes[5]) / 2];
+  return transformVec3(center, transform);
+}
+function calculateDirection(v1, v2) {
+  const direction = vec3.create();
+  vec3.subtract(direction, v1, v2);
+  vec3.normalize(direction, direction);
+  return direction;
+}
 
-export { AXES, handleTypeFromName, rotateVec3, transformVec3 };
+export { AXES, calculateCropperCenter, calculateDirection, handleTypeFromName, rotateVec3, transformVec3 };

package/package.json

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