@kitware/vtk.js 32.10.0 → 32.11.0

package/Common/Core/DataArray.d.ts

@@ -83,6 +83,23 @@ export interface vtkDataArray extends vtkObject {
    */
   setRange(rangeValue: vtkRange, componentIndex: number): Range;
 
+  /**
+   * Returns an array of the ranges for each component of the DataArray.
+   * Defaults to computing all the ranges if they aren't already computed.
+   *
+   * If the number of components is greater than 1, the last element in the
+   * ranges array is the min,max magnitude of the dataset. This is the same as
+   * calling `getRange(-1)`.
+   *
+   * Passing `getRanges(false)` will return  a clone of the ranges that have
+   * already been computed. This is useful when you want to avoid recomputing
+   * the ranges, which can be expensive.
+   *
+   * @param {boolean} [computeRanges] (default: true)
+   * @returns {vtkRange[]}
+   */
+  getRanges(computeRanges: boolean): vtkRange[];
+
   /**
    * Set the given tuple at the given index.
    * @param {Number} idx

package/Common/Core/DataArray.js

@@ -268,6 +268,35 @@ function vtkDataArray(publicAPI, model) {
     model.rangeTuple[1] = range.max;
     return model.rangeTuple;
   };
+  publicAPI.getRanges = function () {
+    let computeRanges = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    if (!computeRanges) {
+      return structuredClone(model.ranges);
+    }
+    /** @type {import('../../../interfaces').vtkRange[]} */
+    const ranges = [];
+    for (let i = 0; i < model.numberOfComponents; i++) {
+      const [min, max] = publicAPI.getRange(i);
+      /** @type {import('../../../interfaces').vtkRange} */
+      const range = {
+        min,
+        max
+      };
+      ranges.push(range);
+    }
+    // where the number of components is greater than 1, the last element in
+    // the range array is the min,max magnitude of the entire dataset.
+    if (model.numberOfComponents > 1) {
+      const [min, max] = publicAPI.getRange(-1);
+      /** @type {import('../../../interfaces').vtkRange} */
+      const range = {
+        min,
+        max
+      };
+      ranges.push(range);
+    }
+    return ranges;
+  };
   publicAPI.setTuple = (idx, tuple) => {
     const offset = idx * model.numberOfComponents;
     for (let i = 0; i < model.numberOfComponents; i++) {
@@ -426,12 +455,19 @@ function vtkDataArray(publicAPI, model) {
     }
     return sortedObj;
   };
+
+  /**
+   * @param {import("./index").vtkDataArray} other
+   */
   publicAPI.deepCopy = other => {
     // Retain current dataType and array reference before shallowCopy call.
     const currentType = publicAPI.getDataType();
     const currentArray = model.values;
     publicAPI.shallowCopy(other);
 
+    // set the ranges
+    model.ranges = structuredClone(other.getRanges());
+
     // Avoid array reallocation if size already sufficient
     // and dataTypes match.
     if (currentArray?.length >= other.getNumberOfValues() && currentType === other.getDataType()) {

package/Rendering/OpenGL/ImageMapper.js

@@ -863,10 +863,25 @@ function vtkOpenGLImageMapper(publicAPI, model) {
         vtkErrorMacro('Reformat slicing not yet supported.');
       }
 
+      /**
+       *
+       * Fetch the ranges of the source volume, `imgScalars`, and use them when
+       * creating the texture. Whilst the pre-calculated ranges may not be
+       * strictly correct for the slice, it is guaranteed to be within the
+       * source volume's range.
+       *
+       * There is a significant performance improvement by pre-setting the range
+       * of the scalars array particularly when scrolling through the source
+       * volume as there is no need to calculate the range of the slice scalar.
+       *
+       * @type{ import("../../../interfaces").vtkRange[] }
+       */
+      const ranges = imgScalars.getRanges();
+
       // Don't share this resource as `scalars` is created in this function
       // so it is impossible to share
       model.openGLTexture.resetFormatAndType();
-      model.openGLTexture.create2DFilterableFromRaw(dims[0], dims[1], numComp, imgScalars.getDataType(), scalars, model.renderable.getPreferSizeOverAccuracy?.());
+      model.openGLTexture.create2DFilterableFromRaw(dims[0], dims[1], numComp, imgScalars.getDataType(), scalars, model.renderable.getPreferSizeOverAccuracy?.(), ranges);
       model.openGLTexture.activate();
       model.openGLTexture.sendParameters();
       model.openGLTexture.deactivate();

package/Rendering/OpenGL/Texture.d.ts

@@ -3,7 +3,7 @@ import vtkOpenGLRenderWindow from './RenderWindow';
 import { Nullable } from './../../types';
 import { VtkDataTypes } from './../../Common/Core/DataArray';
 import { vtkViewNode } from './../SceneGraph/ViewNode';
-import { vtkObject } from './../../interfaces';
+import { vtkObject, vtkRange } from './../../interfaces';
 
 /**
  * Initial values for creating a new instance of vtkOpenGLTexture.
@@ -244,7 +244,8 @@ export interface vtkOpenGLTexture extends vtkViewNode {
    * @param numComps The number of components in the texture.
    * @param dataType The data type of the texture.
    * @param data The raw data for the texture.
-   * @param preferSizeOverAccuracy Whether to prefer texture size over accuracy.
+   * @param [preferSizeOverAccuracy=false] Whether to prefer texture size over accuracy. Defaults to false.
+   * @param [ranges] The precomputed ranges of the data (optional). Provided to prevent computation of the data ranges.
    * @returns {boolean} True if the texture was successfully created, false otherwise.
    */
   create2DFilterableFromRaw(
@@ -253,7 +254,8 @@ export interface vtkOpenGLTexture extends vtkViewNode {
     numComps: number,
     dataType: VtkDataTypes,
     data: any,
-    preferSizeOverAccuracy: boolean
+    preferSizeOverAccuracy?: boolean,
+    ranges?: vtkRange[]
   ): boolean;
 
   /**
@@ -299,7 +301,10 @@ export interface vtkOpenGLTexture extends vtkViewNode {
    * @param dataType The data type of the texture.
    * @param values The raw data for the texture.
    * @param preferSizeOverAccuracy Whether to prefer texture size over accuracy.
-   * @returns {boolean} True if the texture was successfully created, false otherwise.
+   * @param [ranges] The precomputed ranges of the data (optional). Provided to
+   * prevent computation of the data ranges.
+   * @returns {boolean} True if the texture was successfully created, false
+   * otherwise.
    */
   create3DFilterableFromRaw(
     width: number,
@@ -308,7 +313,8 @@ export interface vtkOpenGLTexture extends vtkViewNode {
     numComps: number,
     dataType: VtkDataTypes,
     values: any,
-    preferSizeOverAccuracy: boolean
+    preferSizeOverAccuracy: boolean,
+    ranges?: vtkRange[]
   ): boolean;
 
   /**

package/Rendering/OpenGL/Texture.js

@@ -986,10 +986,12 @@ function vtkOpenGLTexture(publicAPI, model) {
   }
   publicAPI.create2DFilterableFromRaw = function (width, height, numberOfComponents, dataType, values) {
     let preferSizeOverAccuracy = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+    let ranges = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : undefined;
     return publicAPI.create2DFilterableFromDataArray(width, height, vtkDataArray.newInstance({
       numberOfComponents,
       dataType,
-      values
+      values,
+      ranges
     }), preferSizeOverAccuracy);
   };
   publicAPI.create2DFilterableFromDataArray = function (width, height, dataArray) {
@@ -1129,10 +1131,12 @@ function vtkOpenGLTexture(publicAPI, model) {
   // Prefer create3DFilterableFromDataArray to enable caching of min and max values
   publicAPI.create3DFilterableFromRaw = function (width, height, depth, numberOfComponents, dataType, values) {
     let preferSizeOverAccuracy = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+    let ranges = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : undefined;
     return publicAPI.create3DFilterableFromDataArray(width, height, depth, vtkDataArray.newInstance({
       numberOfComponents,
       dataType,
-      values
+      values,
+      ranges
     }), preferSizeOverAccuracy);
   };
 

package/Rendering/WebXR/RenderWindowHelper.js

@@ -140,6 +140,15 @@ function vtkWebXRRenderWindowHelper(publicAPI, model) {
       model.renderWindow.getRenderable().getInteractor().returnFromXRAnimation();
       const gl = model.renderWindow.get3DContext();
       gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+
+      // Remove controllers ray
+      const ren = model.renderWindow.getRenderable().getRenderers()[0];
+      model.xrSession.inputSources.forEach(inputSource => {
+        if (model.inputSourceToRay[inputSource.handedness]) {
+          ren.removeActor(model.inputSourceToRay[inputSource.handedness].actor);
+          model.inputSourceToRay[inputSource.handedness].visible = false;
+        }
+      });
       await model.xrSession.end().catch(error => {
         if (!(error instanceof DOMException)) {
           throw error;

package/package.json

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