@kitware/vtk.js 32.6.2 → 33.0.0-beta.2

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, u as uninitializeBounds } from '../../Common/Core/Math/index.js';
+import { l as normalize } from '../../Common/Core/Math/index.js';
 import vtkOpenGLTexture from './Texture.js';
 import vtkProp from '../Core/Prop.js';
 import vtkProperty from '../Core/Property.js';
@@ -941,13 +941,6 @@ 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 getTransferFunctionHash(
-  transferFunction: vtkObject | undefined,
+export function getTransferFunctionsHash(
+  transferFunctions: (vtkObject | null | undefined)[],
   useIndependentComponents: boolean,
   numberOfComponents: number
 ): string;
@@ -27,7 +27,7 @@ export function getImageDataHash(
 ): string;
 
 declare const defaultExport: {
-  getTransferFunctionHash: typeof getTransferFunctionHash;
+  getTransferFunctionsHash: typeof getTransferFunctionsHash;
   getImageDataHash: typeof getImageDataHash;
 };
 

package/Rendering/OpenGL/RenderWindow/resourceSharingHelper.js

@@ -1,14 +1,17 @@
 // See typescript header for documentation
 
-function getTransferFunctionHash(transferFunction, useIndependentComponents, numberOfComponents) {
-  return transferFunction ? `${transferFunction.getMTime()}-${useIndependentComponents}-${numberOfComponents}` : '0';
+function getTransferFunctionsHash(transferFunctions, useIndependentComponents, numberOfComponents) {
+  return transferFunctions.length > 0 ? `${transferFunctions.map(tf => tf?.getMTime() ?? 'x').join('/')}-${useIndependentComponents}-${numberOfComponents}` : '0';
 }
 function getImageDataHash(image, scalars) {
-  return `${image.getMTime()}A${scalars.getMTime()}`;
+  // 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()}`;
 }
 var resourceSharingHelper = {
-  getTransferFunctionHash,
+  getTransferFunctionsHash,
   getImageDataHash
 };
 
-export { resourceSharingHelper as default, getImageDataHash, getTransferFunctionHash };
+export { resourceSharingHelper as default, getImageDataHash, getTransferFunctionsHash };