@kitware/vtk.js 33.0.0-beta.3 → 33.0.0

package/Rendering/OpenGL/PolyDataMapper.js

@@ -2,7 +2,7 @@ import { mat3, mat4, vec3 } from 'gl-matrix';
 import { n as newInstance$1, e as setGet, o as obj, c as macro } from '../../macros2.js';
 import vtkHelper from './Helper.js';
 import vtkMapper from '../Core/Mapper.js';
-import { l as normalize } from '../../Common/Core/Math/index.js';
+import { l as normalize, u as uninitializeBounds } from '../../Common/Core/Math/index.js';
 import vtkOpenGLTexture from './Texture.js';
 import vtkProp from '../Core/Prop.js';
 import vtkProperty from '../Core/Property.js';
@@ -941,6 +941,13 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
     publicAPI.renderPieceDraw(ren, actor);
     publicAPI.renderPieceFinish(ren, actor);
   };
+  publicAPI.computeBounds = (ren, actor) => {
+    if (!publicAPI.getInput()) {
+      uninitializeBounds(model.bounds);
+      return;
+    }
+    model.bounds = publicAPI.getInput().getBounds();
+  };
   publicAPI.updateBufferObjects = (ren, actor) => {
     // Rebuild buffers if needed
     if (publicAPI.getNeedToRebuildBufferObjects(ren, actor)) {

package/Rendering/OpenGL/RenderWindow/resourceSharingHelper.d.ts

@@ -9,8 +9,8 @@ import { vtkObject } from '../../../interfaces';
  * @param useIndependentComponents A boolean taken from the image or volume property, using getIndependentComponents()
  * @param numberOfComponents Taken from the data array, using getNumberOfComponents()
  */
-export function getTransferFunctionsHash(
-  transferFunctions: (vtkObject | null | undefined)[],
+export function getTransferFunctionHash(
+  transferFunction: vtkObject | undefined,
   useIndependentComponents: boolean,
   numberOfComponents: number
 ): string;
@@ -27,7 +27,7 @@ export function getImageDataHash(
 ): string;
 
 declare const defaultExport: {
-  getTransferFunctionsHash: typeof getTransferFunctionsHash;
+  getTransferFunctionHash: typeof getTransferFunctionHash;
   getImageDataHash: typeof getImageDataHash;
 };
 

package/Rendering/OpenGL/RenderWindow/resourceSharingHelper.js

@@ -1,17 +1,14 @@
 // See typescript header for documentation
 
-function getTransferFunctionsHash(transferFunctions, useIndependentComponents, numberOfComponents) {
-  return transferFunctions.length > 0 ? `${transferFunctions.map(tf => tf?.getMTime() ?? 'x').join('/')}-${useIndependentComponents}-${numberOfComponents}` : '0';
+function getTransferFunctionHash(transferFunction, useIndependentComponents, numberOfComponents) {
+  return transferFunction ? `${transferFunction.getMTime()}-${useIndependentComponents}-${numberOfComponents}` : '0';
 }
 function getImageDataHash(image, scalars) {
-  // Don't use the image data, as the scalars will define the texture
-  // If using the image data in the hash, it will cause issues when two image data
-  // using the same scalars are in the same mapper (for example the VolumeMapper)
-  return `${scalars.getMTime()}`;
+  return `${image.getMTime()}A${scalars.getMTime()}`;
 }
 var resourceSharingHelper = {
-  getTransferFunctionsHash,
+  getTransferFunctionHash,
   getImageDataHash
 };
 
-export { resourceSharingHelper as default, getImageDataHash, getTransferFunctionsHash };
+export { resourceSharingHelper as default, getImageDataHash, getTransferFunctionHash };

package/Rendering/OpenGL/Renderer.js

@@ -24,7 +24,7 @@ function vtkOpenGLRenderer(publicAPI, model) {
       publicAPI.updateLights();
       publicAPI.prepareNodes();
       publicAPI.addMissingNode(model.renderable.getActiveCamera());
-      publicAPI.addMissingNodes(model.renderable.getViewPropsWithNestedProps());
+      publicAPI.addMissingNodes(model.renderable.getViewPropsWithNestedProps(), true);
       publicAPI.removeUnusedNodes();
     }
   };

package/Rendering/OpenGL/Texture.d.ts

@@ -1,9 +1,9 @@
 import { Wrap, Filter } from './Texture/Constants';
 import vtkOpenGLRenderWindow from './RenderWindow';
-import { Nullable } from './../../types';
+import { Extent, 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;
 
   /**
@@ -273,12 +275,16 @@ export interface vtkOpenGLTexture extends vtkViewNode {
 
   /**
    * Creates a 3D texture from raw data.
+   *
+   * updatedExtents is currently incompatible with webgl1, since there's no extent scaling.
+   *
    * @param width The width of the texture.
    * @param height The height of the texture.
    * @param depth The depth of the texture.
    * @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 updatedExtents Only update the specified extents (default: [])
    * @returns {boolean} True if the texture was successfully created, false otherwise.
    */
   create3DFromRaw(
@@ -287,11 +293,15 @@ export interface vtkOpenGLTexture extends vtkViewNode {
     depth: number,
     numComps: number,
     dataType: VtkDataTypes,
-    data: any
+    data: any,
+    updatedExtents?: Extent[]
   ): boolean;
 
   /**
    * Creates a 3D filterable texture from raw data, with a preference for size over accuracy if necessary.
+   *
+   * updatedExtents is currently incompatible with webgl1, since there's no extent scaling.
+   *
    * @param width The width of the texture.
    * @param height The height of the texture.
    * @param depth The depth of the texture.
@@ -299,7 +309,11 @@ 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
+   * @param updatedExtents Only update the specified extents (default: [])
+   * prevent computation of the data ranges.
+   * @returns {boolean} True if the texture was successfully created, false
+   * otherwise.
    */
   create3DFilterableFromRaw(
     width: number,
@@ -308,16 +322,22 @@ export interface vtkOpenGLTexture extends vtkViewNode {
     numComps: number,
     dataType: VtkDataTypes,
     values: any,
-    preferSizeOverAccuracy: boolean
+    preferSizeOverAccuracy: boolean,
+    ranges?: vtkRange[],
+    updatedExtents?: Extent[]
   ): boolean;
 
   /**
    * Creates a 3D filterable texture from a data array, with a preference for size over accuracy if necessary.
+   *
+   * updatedExtents is currently incompatible with webgl1, since there's no extent scaling.
+   *
    * @param width The width of the texture.
    * @param height The height of the texture.
    * @param depth The depth of the texture.
    * @param dataArray The data array to use for the texture.
    * @param preferSizeOverAccuracy Whether to prefer texture size over accuracy.
+   * @param updatedExtents Only update the specified extents (default: [])
    * @returns {boolean} True if the texture was successfully created, false otherwise.
    */
   create3DFilterableFromDataArray(
@@ -325,7 +345,8 @@ export interface vtkOpenGLTexture extends vtkViewNode {
     height: number,
     depth: number,
     dataArray: any,
-    preferSizeOverAccuracy: boolean
+    preferSizeOverAccuracy: boolean,
+    updatedExtents?: Extent[]
   ): boolean;
 
   /**

package/Rendering/OpenGL/Texture.js

@@ -1,3 +1,4 @@
+import DeepEqual from 'fast-deep-equal';
 import Constants from './Texture/Constants.js';
 import HalfFloat from '../../Common/Core/HalfFloat.js';
 import { n as newInstance$1, o as obj, s as set, e as setGet, g as get, i as moveToProtected, a as newTypedArray, c as macro } from '../../macros2.js';
@@ -30,6 +31,16 @@ const {
 function vtkOpenGLTexture(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkOpenGLTexture');
+  function getTexParams() {
+    return {
+      internalFormat: model.internalFormat,
+      format: model.format,
+      openGLDataType: model.openGLDataType,
+      width: model.width,
+      height: model.height
+    };
+  }
+
   // Renders myself
   publicAPI.render = function () {
     let renWin = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
@@ -148,6 +159,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     if (model.context && model.handle) {
       model.context.deleteTexture(model.handle);
     }
+    model._prevTexParams = null;
     model.handle = 0;
     model.numberOfDimensions = 0;
     model.target = 0;
@@ -209,6 +221,7 @@ function vtkOpenGLTexture(publicAPI, model) {
       rwin.activateTexture(publicAPI);
       rwin.deactivateTexture(publicAPI);
       model.context.deleteTexture(model.handle);
+      model._prevTexParams = null;
       model.handle = 0;
       model.numberOfDimensions = 0;
       model.target = 0;
@@ -353,6 +366,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 
   //----------------------------------------------------------------------------
   publicAPI.resetFormatAndType = () => {
+    model._prevTexParams = null;
     model.format = 0;
     model.internalFormat = 0;
     model._forceInternalFormat = false;
@@ -499,6 +513,86 @@ function vtkOpenGLTexture(publicAPI, model) {
     }
   };
 
+  //----------------------------------------------------------------------------
+
+  /**
+   * Gets the extent's size.
+   * @param {Extent} extent
+   */
+  function getExtentSize(extent) {
+    const [xmin, xmax, ymin, ymax, zmin, zmax] = extent;
+    return [xmax - xmin + 1, ymax - ymin + 1, zmax - zmin + 1];
+  }
+
+  //----------------------------------------------------------------------------
+
+  /**
+   * Gets the number of pixels in the extent.
+   * @param {Extent} extent
+   */
+  function getExtentPixelCount(extent) {
+    const [sx, sy, sz] = getExtentSize(extent);
+    return sx * sy * sz;
+  }
+
+  //----------------------------------------------------------------------------
+
+  /**
+   * Reads a flattened extent from the image data and writes to the given output array.
+   *
+   * Assumes X varies the fastest and Z varies the slowest.
+   *
+   * @param {*} data
+   * @param {*} dataDims
+   * @param {Extent} extent
+   * @param {TypedArray} outArray
+   * @param {number} outOffset
+   * @returns
+   */
+  function readExtentIntoArray(data, dataDims, extent, outArray, outOffset) {
+    const [xmin, xmax, ymin, ymax, zmin, zmax] = extent;
+    const [dx, dy] = dataDims;
+    const sxy = dx * dy;
+    let writeOffset = outOffset;
+    for (let zi = zmin; zi <= zmax; zi++) {
+      const zOffset = zi * sxy;
+      for (let yi = ymin; yi <= ymax; yi++) {
+        const zyOffset = zOffset + yi * dx;
+        // explicit alternative to data.subarray,
+        // due to potential perf issues on v8
+        for (let readOffset = zyOffset + xmin, end = zyOffset + xmax; readOffset <= end; readOffset++, writeOffset++) {
+          outArray[writeOffset] = data[readOffset];
+        }
+      }
+    }
+  }
+
+  //----------------------------------------------------------------------------
+
+  /**
+   * Reads several image extents into a contiguous pixel array.
+   *
+   * @param {*} data
+   * @param {Extent[]} extent
+   * @param {TypedArrayConstructor} typedArrayConstructor optional typed array constructor
+   * @returns
+   */
+  function readExtents(data, extents) {
+    let typedArrayConstructor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+    const constructor = typedArrayConstructor || data.constructor;
+    const numPixels = extents.reduce((count, extent) => count + getExtentPixelCount(extent), 0);
+    const extentPixels = new constructor(numPixels);
+    const dataDims = [model.width, model.height, model.depth];
+    let writeOffset = 0;
+    extents.forEach(extent => {
+      readExtentIntoArray(data, dataDims, extent, extentPixels, writeOffset);
+      writeOffset += getExtentPixelCount(extent);
+    });
+    return extentPixels;
+  }
+
+  //----------------------------------------------------------------------------
+
   /**
    * Updates the data array to match the required data type for OpenGL.
    *
@@ -508,23 +602,30 @@ function vtkOpenGLTexture(publicAPI, model) {
    * @param {string} dataType - The original data type of the input data.
    * @param {Array} data - The input data array that needs to be updated.
    * @param {boolean} [depth=false] - Indicates whether the data is a 3D array.
+   * @param {Array<Extent>} imageExtents only consider these image extents (default: [])
    * @returns {Array} The updated data array that matches the OpenGL data type.
    */
   publicAPI.updateArrayDataTypeForGL = function (dataType, data) {
     let depth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    let imageExtents = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
     const pixData = [];
     let pixCount = model.width * model.height * model.components;
     if (depth) {
       pixCount *= model.depth;
     }
+    const onlyUpdateExtents = !!imageExtents.length;
 
     // if the opengl data type is float
     // then the data array must be float
     if (dataType !== VtkDataTypes.FLOAT && model.openGLDataType === model.context.FLOAT) {
       for (let idx = 0; idx < data.length; idx++) {
         if (data[idx]) {
-          const dataArrayToCopy = data[idx].length > pixCount ? data[idx].subarray(0, pixCount) : data[idx];
-          pixData.push(new Float32Array(dataArrayToCopy));
+          if (onlyUpdateExtents) {
+            pixData.push(readExtents(data[idx], imageExtents, Float32Array));
+          } else {
+            const dataArrayToCopy = data[idx].length > pixCount ? data[idx].subarray(0, pixCount) : data[idx];
+            pixData.push(new Float32Array(dataArrayToCopy));
+          }
         } else {
           pixData.push(null);
         }
@@ -536,8 +637,12 @@ function vtkOpenGLTexture(publicAPI, model) {
     if (dataType !== VtkDataTypes.UNSIGNED_CHAR && model.openGLDataType === model.context.UNSIGNED_BYTE) {
       for (let idx = 0; idx < data.length; idx++) {
         if (data[idx]) {
-          const dataArrayToCopy = data[idx].length > pixCount ? data[idx].subarray(0, pixCount) : data[idx];
-          pixData.push(new Uint8Array(dataArrayToCopy));
+          if (onlyUpdateExtents) {
+            pixData.push(readExtents(data[idx], imageExtents, Uint8Array));
+          } else {
+            const dataArrayToCopy = data[idx].length > pixCount ? data[idx].subarray(0, pixCount) : data[idx];
+            pixData.push(new Uint8Array(dataArrayToCopy));
+          }
         } else {
           pixData.push(null);
         }
@@ -556,9 +661,10 @@ function vtkOpenGLTexture(publicAPI, model) {
     if (halfFloat) {
       for (let idx = 0; idx < data.length; idx++) {
         if (data[idx]) {
-          const newArray = new Uint16Array(pixCount);
-          const src = data[idx];
-          for (let i = 0; i < pixCount; i++) {
+          const src = onlyUpdateExtents ? readExtents(data[idx], imageExtents) : data[idx];
+          const newArray = new Uint16Array(onlyUpdateExtents ? src.length : pixCount);
+          const newArrayLen = newArray.length;
+          for (let i = 0; i < newArrayLen; i++) {
             newArray[i] = toHalf(src[i]);
           }
           pixData.push(newArray);
@@ -571,7 +677,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     // The output has to be filled
     if (pixData.length === 0) {
       for (let i = 0; i < data.length; i++) {
-        pixData.push(data[i]);
+        pixData.push(onlyUpdateExtents && data[i] ? readExtents(data[i], imageExtents) : data[i]);
       }
     }
     return pixData;
@@ -986,10 +1092,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) {
@@ -1054,7 +1162,8 @@ function vtkOpenGLTexture(publicAPI, model) {
   };
 
   //----------------------------------------------------------------------------
-  publicAPI.create3DFromRaw = (width, height, depth, numComps, dataType, data) => {
+  publicAPI.create3DFromRaw = function (width, height, depth, numComps, dataType, data) {
+    let updatedExtents = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
     let dataTypeToUse = dataType;
     let dataToUse = data;
     if (!publicAPI.updateVolumeInfoForGL(dataTypeToUse, numComps) && dataToUse) {
@@ -1096,25 +1205,42 @@ function vtkOpenGLTexture(publicAPI, model) {
     model._openGLRenderWindow.activateTexture(publicAPI);
     publicAPI.createTexture();
     publicAPI.bind();
+    const hasUpdatedExtents = updatedExtents.length > 0;
+
+    // It's possible for the texture parameters to change while
+    // streaming, so check for such a change.
+    const rebuildEntireTexture = !hasUpdatedExtents || !DeepEqual(model._prevTexParams, getTexParams());
+
     // Create an array of texture with one texture
     const dataArray = [dataToUse];
     const is3DArray = true;
-    const pixData = publicAPI.updateArrayDataTypeForGL(dataTypeToUse, dataArray, is3DArray);
+    const pixData = publicAPI.updateArrayDataTypeForGL(dataTypeToUse, dataArray, is3DArray, rebuildEntireTexture ? [] : updatedExtents);
     const scaledData = scaleTextureToHighestPowerOfTwo(pixData);
 
     // Source texture data from the PBO.
     // model.context.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
-
-    // openGLDataType
-
-    if (useTexStorage(dataTypeToUse)) {
-      model.context.texStorage3D(model.target, 1, model.internalFormat, model.width, model.height, model.depth);
-      if (scaledData[0] != null) {
-        model.context.texSubImage3D(model.target, 0, 0, 0, 0, model.width, model.height, model.depth, model.format, model.openGLDataType, scaledData[0]);
+    if (rebuildEntireTexture) {
+      if (useTexStorage(dataTypeToUse)) {
+        model.context.texStorage3D(model.target, 1, model.internalFormat, model.width, model.height, model.depth);
+        if (scaledData[0] != null) {
+          model.context.texSubImage3D(model.target, 0, 0, 0, 0, model.width, model.height, model.depth, model.format, model.openGLDataType, scaledData[0]);
+        }
+      } else {
+        model.context.texImage3D(model.target, 0, model.internalFormat, model.width, model.height, model.depth, 0, model.format, model.openGLDataType, scaledData[0]);
+      }
+      model._prevTexParams = getTexParams();
+    } else if (hasUpdatedExtents) {
+      const extentPixels = scaledData[0];
+      let readOffset = 0;
+      for (let i = 0; i < updatedExtents.length; i++) {
+        const extent = updatedExtents[i];
+        const extentSize = getExtentSize(extent);
+        const extentPixelCount = getExtentPixelCount(extent);
+        const textureData = new extentPixels.constructor(extentPixels.buffer, readOffset, extentPixelCount);
+        readOffset += textureData.byteLength;
+        model.context.texSubImage3D(model.target, 0, extent[0], extent[2], extent[4], extentSize[0], extentSize[1], extentSize[2], model.format, model.openGLDataType, textureData);
       }
-    } else {
-      model.context.texImage3D(model.target, 0, model.internalFormat, model.width, model.height, model.depth, 0, model.format, model.openGLDataType, scaledData[0]);
     }
     if (model.generateMipmap) {
       model.context.generateMipmap(model.target);
@@ -1129,17 +1255,21 @@ 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;
+    let updatedExtents = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : [];
     return publicAPI.create3DFilterableFromDataArray(width, height, depth, vtkDataArray.newInstance({
       numberOfComponents,
       dataType,
-      values
-    }), preferSizeOverAccuracy);
+      values,
+      ranges
+    }), preferSizeOverAccuracy, updatedExtents);
   };
 
   //----------------------------------------------------------------------------
   // This method create a 3D texture from dimensions and a DataArray
   publicAPI.create3DFilterableFromDataArray = function (width, height, depth, dataArray) {
     let preferSizeOverAccuracy = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+    let updatedExtents = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
     const {
       numComps,
       dataType,
@@ -1174,7 +1304,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     // WebGL2 path, we have 3d textures etc
     if (model._openGLRenderWindow.getWebgl2()) {
-      return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data);
+      return publicAPI.create3DFromRaw(width, height, depth, numComps, dataType, data, updatedExtents);
     }
     const numPixelsIn = width * height * depth;
     const scaleOffsetsCopy = structuredClone(scaleOffsets);
@@ -1343,6 +1473,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 const DEFAULT_VALUES = {
   _openGLRenderWindow: null,
   _forceInternalFormat: false,
+  _prevTexParams: null,
   context: null,
   handle: 0,
   sendParametersTime: null,