@kitware/vtk.js 30.6.2 → 30.7.0

package/Rendering/Core/RenderWindow.d.ts

@@ -148,6 +148,12 @@ export interface vtkRenderWindow extends vtkObject {
    */
   removeRenderer(renderer: vtkRenderer): void;
 
+  /**
+   * Remove a child render window added using addRenderWindow(renderWindow)
+   * @param {vtkRenderWindow} renderWindow The vtkRenderWindow instance.
+   */
+  removeRenderWindow(renderWindow: vtkRenderWindow): boolean;
+
   /**
    * Remove renderer
    * @param view

package/Rendering/Core/RenderWindow.js

@@ -144,6 +144,15 @@ function vtkRenderWindow(publicAPI, model) {
     publicAPI.modified();
     return true;
   };
+  publicAPI.removeRenderWindow = child => {
+    const childIndex = model.childRenderWindows.findIndex(x => x === child);
+    if (childIndex < 0) {
+      return false;
+    }
+    model.childRenderWindows.splice(childIndex, 1);
+    publicAPI.modified();
+    return true;
+  };
 }
 
 // ----------------------------------------------------------------------------

package/Rendering/OpenGL/Actor.js

@@ -14,7 +14,7 @@ function vtkOpenGLActor(publicAPI, model) {
   // Builds myself.
   publicAPI.buildPass = prepass => {
     if (prepass) {
-      model._openGLRenderWindow = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderWindow');
+      model._openGLRenderWindow = publicAPI.getLastAncestorOfType('vtkOpenGLRenderWindow');
       model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       model.context = model._openGLRenderWindow.getContext();
       publicAPI.prepareNodes();

package/Rendering/OpenGL/Actor2D.js

@@ -16,7 +16,7 @@ function vtkOpenGLActor2D(publicAPI, model) {
       if (!model.renderable) {
         return;
       }
-      model._openGLRenderWindow = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderWindow');
+      model._openGLRenderWindow = publicAPI.getLastAncestorOfType('vtkOpenGLRenderWindow');
       model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       model.context = model._openGLRenderWindow.getContext();
       publicAPI.prepareNodes();

package/Rendering/OpenGL/ImageMapper.js

@@ -551,13 +551,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
       publicAPI.buildBufferObjects(ren, actor);
     }
   };
-  publicAPI.getNeedToRebuildBufferObjects = (ren, actor) => {
-    // first do a coarse check
-    if (model.VBOBuildTime.getMTime() < publicAPI.getMTime() || model.VBOBuildTime.getMTime() < actor.getMTime() || model.VBOBuildTime.getMTime() < model.renderable.getMTime() || model.VBOBuildTime.getMTime() < actor.getProperty().getMTime() || model.VBOBuildTime.getMTime() < model.currentInput.getMTime()) {
-      return true;
-    }
-    return false;
-  };
+  publicAPI.getNeedToRebuildBufferObjects = (ren, actor) => model.VBOBuildTime.getMTime() < publicAPI.getMTime() || model.VBOBuildTime.getMTime() < actor.getMTime() || model.VBOBuildTime.getMTime() < model.renderable.getMTime() || model.VBOBuildTime.getMTime() < actor.getProperty().getMTime() || model.VBOBuildTime.getMTime() < model.currentInput.getMTime() || !model.openGLTexture?.getHandle() || !model.colorTexture?.getHandle() || !model.labelOutlineThicknessTexture?.getHandle() || !model.pwfTexture?.getHandle();
   publicAPI.buildBufferObjects = (ren, actor) => {
     const image = model.currentInput;
     if (!image) {
@@ -577,7 +571,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
     const colorTransferFunc = actorProperty.getRGBTransferFunction();
     const cfunToString = computeFnToString(actorProperty, colorTransferFunc, numIComps);
     const cTex = model._openGLRenderWindow.getGraphicsResourceForObject(colorTransferFunc);
-    const reBuildC = !cTex?.vtkObj || cTex?.hash !== cfunToString || model.colorTextureString !== cfunToString;
+    const reBuildC = !cTex?.vtkObj?.getHandle() || cTex?.hash !== cfunToString || model.colorTextureString !== cfunToString;
     if (reBuildC) {
       const cWidth = 1024;
       const cSize = cWidth * textureHeight * 3;
@@ -640,7 +634,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
     const pwfunToString = computeFnToString(actorProperty, pwFunc, numIComps);
     const pwfTex = model._openGLRenderWindow.getGraphicsResourceForObject(pwFunc);
     // rebuild opacity tfun?
-    const reBuildPwf = !pwfTex?.vtkObj || pwfTex?.hash !== pwfunToString || model.pwfTextureString !== pwfunToString;
+    const reBuildPwf = !pwfTex?.vtkObj?.getHandle() || pwfTex?.hash !== pwfunToString || model.pwfTextureString !== pwfunToString;
     if (reBuildPwf) {
       const pwfWidth = 1024;
       const pwfSize = pwfWidth * textureHeight;
@@ -852,7 +846,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
         vtkErrorMacro('Reformat slicing not yet supported.');
       }
       const tex = model._openGLRenderWindow.getGraphicsResourceForObject(scalars);
-      if (!tex?.vtkObj) {
+      if (!tex?.vtkObj?.getHandle()) {
         if (model._scalars !== scalars) {
           model._openGLRenderWindow.releaseGraphicsResourcesForObject(model._scalars);
           model._scalars = scalars;
@@ -913,7 +907,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
     // we can use it to decide whether to rebuild the labelOutlineThicknessTexture
     // or not
     const toString = `${labelOutlineThicknessArray.join('-')}`;
-    const reBuildL = !lTex?.vtkObj || lTex?.hash !== toString || model.labelOutlineThicknessTextureString !== toString;
+    const reBuildL = !lTex?.vtkObj?.getHandle() || lTex?.hash !== toString || model.labelOutlineThicknessTextureString !== toString;
     if (reBuildL) {
       const lWidth = 1024;
       const lHeight = 1;

package/Rendering/OpenGL/ImageResliceMapper.js

@@ -164,7 +164,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
       publicAPI.buildBufferObjects(ren, actor);
     }
   };
-  publicAPI.getNeedToRebuildBufferObjects = (ren, actor) => model.VBOBuildTime.getMTime() < publicAPI.getMTime() || model.VBOBuildTime.getMTime() < actor.getMTime() || model.VBOBuildTime.getMTime() < model.renderable.getMTime() || model.VBOBuildTime.getMTime() < actor.getProperty().getMTime() || model.VBOBuildTime.getMTime() < model.currentInput.getMTime() || model.VBOBuildTime.getMTime() < model.resliceGeom.getMTime();
+  publicAPI.getNeedToRebuildBufferObjects = (ren, actor) => model.VBOBuildTime.getMTime() < publicAPI.getMTime() || model.VBOBuildTime.getMTime() < actor.getMTime() || model.VBOBuildTime.getMTime() < model.renderable.getMTime() || model.VBOBuildTime.getMTime() < actor.getProperty().getMTime() || model.VBOBuildTime.getMTime() < model.currentInput.getMTime() || model.VBOBuildTime.getMTime() < model.resliceGeom.getMTime() || !model.openGLTexture?.getHandle() || !model.colorTexture?.getHandle() || !model.pwfTexture?.getHandle();
   publicAPI.buildBufferObjects = (ren, actor) => {
     const image = model.currentInput;
     if (!image) {
@@ -181,7 +181,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
     const numComp = scalars.getNumberOfComponents();
     let toString = `${image.getMTime()}A${scalars.getMTime()}`;
     const tex = model._openGLRenderWindow.getGraphicsResourceForObject(scalars);
-    const reBuildTex = !tex?.vtkObj || tex?.hash !== toString;
+    const reBuildTex = !tex?.vtkObj?.getHandle() || tex?.hash !== toString;
     if (reBuildTex) {
       if (!model.openGLTexture) {
         model.openGLTexture = vtkOpenGLTexture.newInstance();
@@ -207,7 +207,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
     const colorTransferFunc = ppty.getRGBTransferFunction();
     toString = computeFnToString(ppty, colorTransferFunc, numIComps);
     const cTex = model._openGLRenderWindow.getGraphicsResourceForObject(colorTransferFunc);
-    const reBuildC = !cTex?.vtkObj || cTex?.hash !== toString || model.colorTextureString !== toString;
+    const reBuildC = !cTex?.vtkObj?.getHandle() || cTex?.hash !== toString || model.colorTextureString !== toString;
     if (reBuildC) {
       const cWidth = 1024;
       const cSize = cWidth * textureHeight * 3;
@@ -262,7 +262,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
     toString = computeFnToString(ppty, pwFunc, numIComps);
     const pwfTex = model._openGLRenderWindow.getGraphicsResourceForObject(pwFunc);
     // rebuild opacity tfun?
-    const reBuildPwf = !pwfTex?.vtkObj || pwfTex?.hash !== toString || model.pwfTextureString !== toString;
+    const reBuildPwf = !pwfTex?.vtkObj?.getHandle() || pwfTex?.hash !== toString || model.pwfTextureString !== toString;
     if (reBuildPwf) {
       const pwfWidth = 1024;
       const pwfSize = pwfWidth * textureHeight;

package/Rendering/OpenGL/ImageSlice.js

@@ -20,7 +20,7 @@ function vtkOpenGLImageSlice(publicAPI, model) {
       if (!model.renderable) {
         return;
       }
-      model._openGLRenderWindow = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderWindow');
+      model._openGLRenderWindow = publicAPI.getLastAncestorOfType('vtkOpenGLRenderWindow');
       model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       model.context = model._openGLRenderWindow.getContext();
       publicAPI.prepareNodes();

package/Rendering/OpenGL/RenderWindow.js

@@ -657,7 +657,9 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
     if (model.context) {
       deleteGLContext();
     }
-  }, clearEvents, publicAPI.delete, publicAPI.setViewStream);
+    publicAPI.setContainer();
+    publicAPI.setViewStream();
+  }, clearEvents, publicAPI.delete);
 
   // Do not trigger modified for performance reasons
   publicAPI.setActiveFramebuffer = newActiveFramebuffer => {

package/Rendering/OpenGL/Volume.js

@@ -17,7 +17,7 @@ function vtkOpenGLVolume(publicAPI, model) {
       return;
     }
     if (prepass) {
-      model._openGLRenderWindow = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderWindow');
+      model._openGLRenderWindow = publicAPI.getLastAncestorOfType('vtkOpenGLRenderWindow');
       model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       model.context = model._openGLRenderWindow.getContext();
       publicAPI.prepareNodes();

package/Rendering/OpenGL/VolumeMapper.js

@@ -133,7 +133,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
   // Renders myself
   publicAPI.volumePass = (prepass, renderPass) => {
     if (prepass) {
-      model._openGLRenderWindow = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderWindow');
+      model._openGLRenderWindow = publicAPI.getLastAncestorOfType('vtkOpenGLRenderWindow');
       model.context = model._openGLRenderWindow.getContext();
       model.tris.setOpenGLRenderWindow(model._openGLRenderWindow);
       model.jitterTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
@@ -1004,7 +1004,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
   };
   publicAPI.getNeedToRebuildBufferObjects = (ren, actor) => {
     // first do a coarse check
-    if (model.VBOBuildTime.getMTime() < publicAPI.getMTime() || model.VBOBuildTime.getMTime() < actor.getMTime() || model.VBOBuildTime.getMTime() < model.renderable.getMTime() || model.VBOBuildTime.getMTime() < actor.getProperty().getMTime() || model.VBOBuildTime.getMTime() < model.currentInput.getMTime()) {
+    if (model.VBOBuildTime.getMTime() < publicAPI.getMTime() || model.VBOBuildTime.getMTime() < actor.getMTime() || model.VBOBuildTime.getMTime() < model.renderable.getMTime() || model.VBOBuildTime.getMTime() < actor.getProperty().getMTime() || model.VBOBuildTime.getMTime() < model.currentInput.getMTime() || !model.scalarTexture?.getHandle() || !model.colorTexture?.getHandle() || !model.labelOutlineThicknessTexture?.getHandle()) {
       return true;
     }
     return false;
@@ -1087,7 +1087,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     const colorTransferFunc = vprop.getRGBTransferFunction();
     toString = computeFnToString(colorTransferFunc, useIndependentComps, numIComps);
     const cTex = model._openGLRenderWindow.getGraphicsResourceForObject(colorTransferFunc);
-    const reBuildC = !cTex?.vtkObj || cTex?.hash !== toString || model.colorTextureString !== toString;
+    const reBuildC = !cTex?.vtkObj?.getHandle() || cTex?.hash !== toString || model.colorTextureString !== toString;
     if (reBuildC) {
       const cWidth = 1024;
       const cSize = cWidth * 2 * numIComps * 3;
@@ -1119,7 +1119,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     const tex = model._openGLRenderWindow.getGraphicsResourceForObject(scalars);
     // rebuild the scalarTexture if the data has changed
     toString = `${image.getMTime()}A${scalars.getMTime()}`;
-    const reBuildTex = !tex?.vtkObj || tex?.hash !== toString;
+    const reBuildTex = !tex?.vtkObj?.getHandle() || tex?.hash !== toString;
     if (reBuildTex) {
       // Build the textures
       const dims = image.getDimensions();
@@ -1202,7 +1202,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     // we can use it to decide whether to rebuild the labelOutlineThicknessTexture
     // or not
     const toString = `${labelOutlineThicknessArray.join('-')}`;
-    const reBuildL = !lTex?.vtkObj || lTex?.hash !== toString || model.labelOutlineThicknessTextureString !== toString;
+    const reBuildL = !lTex?.vtkObj?.getHandle() || lTex?.hash !== toString || model.labelOutlineThicknessTextureString !== toString;
     if (reBuildL) {
       const lWidth = 1024;
       const lHeight = 1;

package/Rendering/SceneGraph/ViewNode.d.ts

@@ -26,6 +26,14 @@ export interface vtkViewNode extends vtkObject {
    */
   addMissingNode(dobj: any): vtkViewNode | undefined;
 
+  /**
+   * Removes a child view node
+   * If the node is not found, returns false
+   * Otherwise, removes the node from the children list and returns true
+   * @param dobj
+   */
+  removeNode(dobj: any): boolean;
+
   /**
    *
    * @param dataObjs

package/Rendering/SceneGraph/ViewNode.js

@@ -137,6 +137,19 @@ function vtkViewNode(publicAPI, model) {
       child.setVisited(true);
     }
   };
+  publicAPI.removeNode = child => {
+    const childIdx = model.children.findIndex(x => x === child);
+    if (childIdx < 0) {
+      return false;
+    }
+    const renderable = child.getRenderable();
+    if (renderable) {
+      model._renderableChildMap.delete(renderable);
+    }
+    child.delete();
+    model.children.splice(childIdx, 1);
+    return true;
+  };
   publicAPI.prepareNodes = () => {
     for (let index = 0; index < model.children.length; ++index) {
       model.children[index].setVisited(false);

package/package.json

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