refactor: Fix resource caching and signature of getProperty()

Kitware · Oct 3, 2024 · 4976534 · 4976534
1 parent 4c481a0
commit 4976534
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/Examples/Volume/VolumeMapperLightAndShadow/index.js b/Examples/Volume/VolumeMapperLightAndShadow/index.js
@@ -13,7 +13,6 @@ import HttpDataAccessHelper from '@kitware/vtk.js/IO/Core/DataAccessHelper/HttpD
 import vtkVolumeController from '@kitware/vtk.js/Interaction/UI/VolumeController';
 import vtkBoundingBox from '@kitware/vtk.js/Common/DataModel/BoundingBox';
 import vtkFPSMonitor from '@kitware/vtk.js/Interaction/UI/FPSMonitor';
-import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
 
 import vtkActor from '@kitware/vtk.js/Rendering/Core/Actor';
 import vtkSphereSource from '@kitware/vtk.js/Filters/Sources/SphereSource';
@@ -87,18 +86,6 @@ function createVolumeShadowViewer(rootContainer, fileContents) {
  actor.setMapper(mapper);
  mapper.addInputData(source);
 
- for (let i = 0; i < 0; ++i) {
- const otherImageData = vtkImageData.newInstance();
- otherImageData.setPointData(source.getPointData());
- otherImageData.setDimensions(...source.getDimensions());
- otherImageData.setSpacing(...source.getSpacing());
- otherImageData.setOrigin(...source.getOrigin());
- otherImageData.setDirection(...source.getDirection());
- otherImageData.setOrigin(...[120 * (i + 1), 0, 0]);
- mapper.addInputData(otherImageData);
- actor.setProperty(actorProperty, 1 + i);
- }
-
  // Add one positional light
  const bounds = actor.getBounds();
  const center = vtkBoundingBox.getCenter(bounds);

diff --git a/Sources/Rendering/Core/ImageSlice/index.d.ts b/Sources/Rendering/Core/ImageSlice/index.d.ts
@@ -126,7 +126,9 @@ export interface vtkImageSlice extends vtkProp3D {
  /**
  *
  * @param {vtkImageProperty} property The vtkImageProperty instance.
+ * @param {number} mapperInputPort Is 0 when not given
  */
+ setProperty(mapperInputPort: number, property: vtkImageProperty): boolean;
  setProperty(property: vtkImageProperty): boolean;
 
  /**

diff --git a/Sources/Rendering/Core/Prop3D/index.js b/Sources/Rendering/Core/Prop3D/index.js
@@ -238,7 +238,15 @@ function vtkProp3D(publicAPI, model) {
  return model.properties[mapperInputPort];
  };
 
- publicAPI.setProperty = (property, mapperInputPort = 0) => {
+ publicAPI.setProperty = (firstArg, secondArg) => {
+ // Two options for argument layout:
+ // - (mapperInputPort, property)
+ // - (property)
+ const useInputPortArgument = Number.isInteger(firstArg);
+ const [mapperInputPort, property] = useInputPortArgument
+ ? [firstArg, secondArg]
+ : [0, firstArg];
+
  if (model.properties[mapperInputPort] === property) {
  return false;
  }

diff --git a/Sources/Rendering/Core/Volume/index.d.ts b/Sources/Rendering/Core/Volume/index.d.ts
@@ -74,9 +74,10 @@ export interface vtkVolume extends vtkProp3D {
  /**
  * Set the volume property for the specified mapper input port, which defaults to 0
  * @param {vtkVolumeProperty} property
- * @param {number} mapperInputPort Defaults to 0
+ * @param {number} mapperInputPort Is 0 when not given
  */
- setProperty(property: vtkVolumeProperty, mapperInputPort?: number): boolean;
+ setProperty(mapperInputPort: number, property: vtkVolumeProperty): boolean;
+ setProperty(property: vtkVolumeProperty): boolean;
 
  /**
  * Set the volume properties array

diff --git a/Sources/Rendering/OpenGL/RenderWindow/resourceSharingHelper.js b/Sources/Rendering/OpenGL/RenderWindow/resourceSharingHelper.js
@@ -11,7 +11,10 @@ export function getTransferFunctionHash(
 }
 
 export 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()}`;
 }
 
 export default { getTransferFunctionHash, getImageDataHash };