@kitware/vtk.js 30.10.0 → 31.0.1

package/Rendering/Misc/FullScreenRenderWindow.js

@@ -104,17 +104,18 @@ function vtkFullScreenRenderWindow(publicAPI, model) {
   publicAPI.toggleControllerVisibility = () => {
     publicAPI.setControllerVisibility(!model.controllerVisibility);
   };
+  function handleKeypress(e) {
+    if (String.fromCharCode(e.charCode) === 'c') {
+      publicAPI.toggleControllerVisibility();
+    }
+  }
   publicAPI.addController = html => {
     model.controlContainer = document.createElement('div');
     applyStyle(model.controlContainer, model.controlPanelStyle || STYLE_CONTROL_PANEL);
     model.rootContainer.appendChild(model.controlContainer);
     model.controlContainer.innerHTML = html;
     publicAPI.setControllerVisibility(model.controllerVisibility);
-    model.rootContainer.addEventListener('keypress', e => {
-      if (String.fromCharCode(e.charCode) === 'c') {
-        publicAPI.toggleControllerVisibility();
-      }
-    });
+    model.rootContainer.addEventListener('keypress', handleKeypress);
   };
 
   // Update BG color
@@ -131,7 +132,10 @@ function vtkFullScreenRenderWindow(publicAPI, model) {
   };
 
   // Properly release GL context
-  publicAPI.delete = macro.chain(publicAPI.setContainer, model.apiSpecificRenderWindow.delete, publicAPI.delete);
+  publicAPI.delete = macro.chain(publicAPI.setContainer, model.apiSpecificRenderWindow.delete, () => {
+    model.rootContainer?.removeEventListener('keypress', handleKeypress);
+    window.removeEventListener('resize', publicAPI.resize);
+  }, publicAPI.delete);
 
   // Handle window resize
   publicAPI.resize = () => {

package/Rendering/Misc/GenericRenderWindow.js

@@ -68,7 +68,9 @@ function vtkGenericRenderWindow(publicAPI, model) {
   };
 
   // Properly release GL context
-  publicAPI.delete = macro.chain(publicAPI.setContainer, model._apiSpecificRenderWindow.delete, publicAPI.delete);
+  publicAPI.delete = macro.chain(publicAPI.setContainer, model._apiSpecificRenderWindow.delete, () => {
+    window.removeEventListener('resize', publicAPI.resize);
+  }, publicAPI.delete);
 
   // Handle size
   if (model.listenWindowResize) {

package/Rendering/OpenGL/Actor.js

@@ -113,7 +113,7 @@ function vtkOpenGLActor(publicAPI, model) {
   // Renders myself
   publicAPI.translucentPass = (prepass, renderPass) => {
     if (prepass) {
-      model.context.depthMask(false);
+      model.context.depthMask(model._openGLRenderer.getSelector() && model.renderable.getNestedPickable());
       publicAPI.activateTextures();
     } else if (model.activeTextures) {
       for (let index = 0; index < model.activeTextures.length; index++) {

package/Rendering/OpenGL/ImageResliceMapper.js

@@ -419,6 +419,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
         const image = model.currentInput;
         const dim = image.getDimensions();
         mat4.copy(model.tmpMat4, image.getIndexToWorld());
+        mat4.translate(model.tmpMat4, model.tmpMat4, [-0.5, -0.5, -0.5]);
         mat4.scale(model.tmpMat4, model.tmpMat4, dim);
         mat4.invert(model.tmpMat4, model.tmpMat4);
         if (inverseShiftScaleMatrix) {
@@ -427,7 +428,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
         program.setUniformMatrix('WCTCMatrix', model.tmpMat4);
       }
       if (program.isUniformUsed('vboScaling')) {
-        program.setUniform3fv('vboScaling', cellBO.getCABO().getCoordScale());
+        program.setUniform3fv('vboScaling', cellBO.getCABO().getCoordScale() ?? [1, 1, 1]);
       }
       cellBO.getAttributeUpdateTime().modified();
     }
@@ -730,15 +731,16 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
       resGeomString = resGeomString.concat(`PolyData${slicePD.getMTime()}`);
     } else if (slicePlane) {
       resGeomString = resGeomString.concat(`Plane${slicePlane.getMTime()}`);
+      // Compute a world-to-image-orientation matrix.
+      const w2io = mat3.create();
       if (image) {
         resGeomString = resGeomString.concat(`Image${image.getMTime()}`);
+        // Ignore the translation component since we are
+        // using it on vectors rather than positions.
+        mat3.set(w2io, ...image.getDirection());
+        mat3.invert(w2io, w2io);
       }
       // Check to see if we can bypass oblique slicing related bounds computation
-      // Compute a world-to-image-orientation matrix.
-      // Ignore the translation component since we are
-      // using it on vectors rather than positions.
-      const w2io = mat3.fromValues(image?.getDirection());
-      mat3.invert(w2io, w2io);
       // transform the cutting plane normal to image local coords
       const imageLocalNormal = [...slicePlane.getNormal()];
       vec3.transformMat3(imageLocalNormal, imageLocalNormal, w2io);
@@ -803,8 +805,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
           const ptsArray = new Float32Array(12);
           const indexSpacePlaneOrigin = image.worldToIndex(slicePlane.getOrigin(), [0, 0, 0]);
           const otherAxes = [(orthoAxis + 1) % 3, (orthoAxis + 2) % 3].sort();
-          const dim = image.getDimensions();
-          const ext = [0, dim[0] - 1, 0, dim[1] - 1, 0, dim[2] - 1];
+          const ext = image.getSpatialExtent();
           let ptIdx = 0;
           for (let i = 0; i < 2; ++i) {
             for (let j = 0; j < 2; ++j) {

package/Rendering/OpenGL/RenderWindow.d.ts

@@ -1,6 +1,6 @@
 import { Nullable, Size, Vector2, Vector3 } from './../../types';
+import { vtkAlgorithm } from './../../interfaces';
 import { VtkDataTypes } from './../../Common/Core/DataArray';
-import { vtkAlgorithm, vtkObject } from './../../interfaces';
 import vtkBufferObject from './BufferObject';
 import vtkCellArray from './../../Common/Core/CellArray';
 import vtkDataArray from './../../Common/Core/DataArray';
@@ -8,6 +8,7 @@ import vtkOpenGLTexture from './Texture';
 import vtkPoints from './../../Common/Core/Points';
 import vtkRenderer from './../Core/Renderer';
 import vtkTexture from './../Core/Texture';
+import vtkViewNode from './../SceneGraph/ViewNode';
 import vtkViewStream from './../../IO/Core/ImageStream/ViewStream';
 
 /**
@@ -41,18 +42,7 @@ export interface ICaptureOptions {
   scale?: number;
 }
 
-type vtkOpenGLRenderWindowBase = vtkObject &
-  Omit<
-    vtkAlgorithm,
-    | 'getInputData'
-    | 'setInputData'
-    | 'setInputConnection'
-    | 'getInputConnection'
-    | 'addInputConnection'
-    | 'addInputData'
-  >;
-
-export interface vtkOpenGLRenderWindow extends vtkOpenGLRenderWindowBase {
+export interface vtkOpenGLRenderWindow extends vtkViewNode {
   /**
    * Builds myself.
    * @param {Boolean} prepass
@@ -98,6 +88,11 @@ export interface vtkOpenGLRenderWindow extends vtkOpenGLRenderWindowBase {
    */
   getCanvas(): Nullable<HTMLCanvasElement>;
 
+  /**
+   * Set the webgl canvas.
+   */
+  setCanvas(canvas: Nullable<HTMLCanvasElement>): boolean;
+
   /**
    * Check if a point is in the viewport.
    * @param {Number} x The x coordinate.

package/package.json

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