@kitware/vtk.js 34.17.0 → 35.0.0

package/Rendering/Core/Prop3D.js

@@ -128,24 +128,20 @@ function vtkProp3D(publicAPI, model) {
       model.matrixMTime.modified();
     }
   };
-  publicAPI.getBoundsByReference = () => {
+  publicAPI.computeBounds = () => {
     if (model.mapper === null) {
-      return model.bounds;
+      vtkBoundingBox.reset(model.bounds);
+      return;
     }
 
-    // Check for the special case when the mapper's bounds are unknown
+    // Check for the special case when the mapper's bounds are invalid
     const bds = model.mapper.getBounds();
-    if (!bds || bds.length !== 6) {
-      return bds;
-    }
-
-    // Check for the special case when the actor is empty.
-    if (bds[0] > bds[1]) {
+    if (!bds || bds.length !== 6 || !vtkBoundingBox.isValid(bds)) {
       // No need to copy bds, a new array is created when calling getBounds()
       model.mapperBounds = bds;
-      model.bounds = [...vtkBoundingBox.INIT_BOUNDS];
+      vtkBoundingBox.reset(model.bounds);
       model.boundsMTime.modified();
-      return bds;
+      return;
     }
 
     // Check if we have cached values for these bounds - we cache the
@@ -165,22 +161,22 @@ function vtkProp3D(publicAPI, model) {
       vtkBoundingBox.transformBounds(bds, transposedMatrix, model.bounds);
       model.boundsMTime.modified();
     }
-    return model.bounds;
   };
+  const superGetBounds = publicAPI.getBounds;
   publicAPI.getBounds = () => {
-    const bounds = publicAPI.getBoundsByReference();
-    // Handle case when bounds are not iterable (for example null or undefined)
-    try {
-      return [...bounds];
-    } catch {
-      return bounds;
-    }
+    publicAPI.computeBounds();
+    return superGetBounds();
+  };
+  const superGetBoundsByReference = publicAPI.getBoundsByReference;
+  publicAPI.getBoundsByReference = () => {
+    publicAPI.computeBounds();
+    return superGetBoundsByReference();
   };
-  publicAPI.getCenter = () => vtkBoundingBox.getCenter(model.bounds);
-  publicAPI.getLength = () => vtkBoundingBox.getLength(model.bounds);
-  publicAPI.getXRange = () => vtkBoundingBox.getXRange(model.bounds);
-  publicAPI.getYRange = () => vtkBoundingBox.getYRange(model.bounds);
-  publicAPI.getZRange = () => vtkBoundingBox.getZRange(model.bounds);
+  publicAPI.getCenter = () => vtkBoundingBox.getCenter(publicAPI.getBoundsByReference());
+  publicAPI.getLength = () => vtkBoundingBox.getLength(publicAPI.getBoundsByReference());
+  publicAPI.getXRange = () => vtkBoundingBox.getXRange(publicAPI.getBoundsByReference());
+  publicAPI.getYRange = () => vtkBoundingBox.getYRange(publicAPI.getBoundsByReference());
+  publicAPI.getZRange = () => vtkBoundingBox.getZRange(publicAPI.getBoundsByReference());
   publicAPI.getUserMatrix = () => model.userMatrix;
   function updateIdentityFlag() {
     publicAPI.computeMatrix();
@@ -227,12 +223,12 @@ function vtkProp3D(publicAPI, model) {
 // ----------------------------------------------------------------------------
 
 const DEFAULT_VALUES = {
+  bounds: [...vtkBoundingBox.INIT_BOUNDS],
   origin: [0, 0, 0],
   position: [0, 0, 0],
   orientation: [0, 0, 0],
   rotation: null,
   scale: [1, 1, 1],
-  bounds: [...vtkBoundingBox.INIT_BOUNDS],
   properties: [],
   userMatrix: null,
   userMatrixMTime: null,
@@ -256,6 +252,7 @@ function extend(publicAPI, model, initialValues = {}) {
   macro.getArray(publicAPI, model, ['orientation']);
   macro.setGetArray(publicAPI, model, ['origin', 'position', 'scale'], 3);
   macro.setGet(publicAPI, model, ['properties']);
+  macro.getArray(publicAPI, model, ['bounds'], 6);
 
   // Object internal instance
   model.matrix = mat4.identity(new Float64Array(16));

package/Rendering/Core/VolumeMapper.js

@@ -40,12 +40,16 @@ function vtkVolumeMapper(publicAPI, model) {
   const superClass = {
     ...publicAPI
   };
-  publicAPI.getBounds = () => {
+  publicAPI.computeBounds = () => {
+    const input = publicAPI.getInputData();
+    if (!input) {
+      vtkBoundingBox.reset(model.bounds);
+      return;
+    }
     if (!model.static) {
       publicAPI.update();
     }
-    model.bounds = [...publicAPI.getInputData().getBounds()];
-    return model.bounds;
+    vtkBoundingBox.setBounds(model.bounds, input.getBounds());
   };
   publicAPI.setBlendModeToComposite = () => {
     publicAPI.setBlendMode(BlendMode.COMPOSITE_BLEND);