@kitware/vtk.js 34.15.0 → 34.15.2

package/Common/DataModel/PolyData.js

@@ -36,6 +36,10 @@ function vtkPolyData(publicAPI, model) {
   function camelize(str) {
     return str.replace(/(?:^\w|[A-Z]|\b\w)/g, letter => letter.toUpperCase()).replace(/\s+/g, '');
   }
+  function clearCells() {
+    model.cells = undefined;
+    model.links = undefined;
+  }
 
   // build empty cell arrays and set methods
   POLYDATA_FIELDS.forEach(type => {
@@ -45,6 +49,7 @@ function vtkPolyData(publicAPI, model) {
     } else {
       model[type] = vtk(model[type]);
     }
+    model[`_on${camelize(type)}Changed`] = clearCells;
   });
   publicAPI.getNumberOfCells = () => POLYDATA_FIELDS.reduce((num, cellType) => num + model[cellType].getNumberOfCells(), 0);
   const superShallowCopy = publicAPI.shallowCopy;
@@ -61,6 +66,7 @@ function vtkPolyData(publicAPI, model) {
   const superInitialize = publicAPI.initialize;
   publicAPI.initialize = () => {
     POLYDATA_FIELDS.forEach(type => model[type]?.initialize());
+    clearCells();
     return superInitialize();
   };
   publicAPI.buildCells = () => {
@@ -151,7 +157,7 @@ function vtkPolyData(publicAPI, model) {
    */
   publicAPI.buildLinks = function () {
     let initialSize = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    if (model.cells === undefined) {
+    if (model.cells == null) {
       publicAPI.buildCells();
     }
     model.links = vtkCellLinks.newInstance();

package/Rendering/Core/Viewport.js

@@ -47,19 +47,23 @@ function vtkViewport(publicAPI, model) {
   }
   publicAPI.getViewPropsWithNestedProps = () => {
     let allPropsArray = [];
-    // Handle actor2D instances separately so that they can be overlayed and layered
-    const actors2D = publicAPI.getActors2D();
-    // Sort the actor2D list using its layer number
-    actors2D.sort((a, b) => a.getLayerNumber() - b.getLayerNumber());
-    // Filter out all the actor2D instances
-    const newPropList = model.props.filter(item => !actors2D.includes(item));
-    for (let i = 0; i < newPropList.length; i++) {
-      gatherProps(newPropList[i], allPropsArray);
+    // Repopulate the actor2D list to minimize browsing operations.
+    model.actors2D = [];
+    for (let i = 0; i < model.props.length; i++) {
+      // Handle actor2D instances separately so that they can be overlayed and layered
+      const isActor2D = model.props[i].getActors2D();
+      if (isActor2D && (!Array.isArray(isActor2D) || isActor2D.length > 0)) {
+        model.actors2D = model.actors2D.concat(isActor2D);
+      } else {
+        gatherProps(model.props[i], allPropsArray);
+      }
     }
+    // Actor2D must be rendered by layer number order
+    model.actors2D.sort((a, b) => a.getLayerNumber() - b.getLayerNumber());
     // Finally, add the actor2D props at the end of the list
     // This works because, when traversing the render pass in vtkOpenGLRenderer, the children are
     // traversed in the order that they are added to the list
-    allPropsArray = allPropsArray.concat(actors2D);
+    allPropsArray = allPropsArray.concat(model.actors2D);
     return allPropsArray;
   };
   publicAPI.addActor2D = publicAPI.addViewProp;

package/Rendering/OpenGL/HardwareSelector.js

@@ -33,10 +33,14 @@ function convert(xx, yy, pb, area) {
   if (!pb) {
     return 0;
   }
+
+  // console.log(caller);
+  // console.log('convert', xx, yy, pb, area);
   const offset = (yy * (area[2] - area[0] + 1) + xx) * 4;
   const r = pb[offset];
   const g = pb[offset + 1];
   const b = pb[offset + 2];
+  // console.log(b, g, r, (b * 256 + g) * 256 + r);
   return (b * 256 + g) * 256 + r;
 }
 function getID(low24, high8) {
@@ -227,7 +231,7 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
 
   //----------------------------------------------------------------------------
   publicAPI.beginSelection = () => {
-    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model._renderer);
+    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model._renderer, model._openGLRenderer);
     model.maxAttributeId = 0;
     const size = model._openGLRenderWindow.getSize();
     if (!model.framebuffer) {
@@ -335,7 +339,7 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
       vtkErrorMacro('Renderer and view must be set before calling Select.');
       return false;
     }
-    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model._renderer);
+    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model._renderer, model._openGLRenderer);
 
     // todo revisit making selection part of core
     // then we can do this in core
@@ -507,16 +511,20 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
   publicAPI.getPixelInformation = (inDisplayPosition, maxDistance, outSelectedPosition) => {
     // Base case
     const maxDist = maxDistance < 0 ? 0 : maxDistance;
+    console.log('getPixelInformation called', maxDist);
     if (maxDist === 0) {
       outSelectedPosition[0] = inDisplayPosition[0];
       outSelectedPosition[1] = inDisplayPosition[1];
       if (inDisplayPosition[0] < model.area[0] || inDisplayPosition[0] > model.area[2] || inDisplayPosition[1] < model.area[1] || inDisplayPosition[1] > model.area[3]) {
         return null;
       }
-
+      console.log(inDisplayPosition);
+      console.log(model.area);
       // offset inDisplayPosition based on the lower-left-corner of the Area.
       const displayPosition = [inDisplayPosition[0] - model.area[0], inDisplayPosition[1] - model.area[1]];
+      console.log('adjusted displayPosition', displayPosition);
       const actorid = convert(displayPosition[0], displayPosition[1], model.pixBuffer[PassTypes.ACTOR_PASS], model.area);
+      console.log('actorid', actorid);
       if (actorid <= 0 || actorid - idOffset >= model.props.length) {
         // the pixel did not hit any actor.
         return null;

package/Rendering/OpenGL/ImageCPRMapper.js

@@ -43,7 +43,7 @@ function vtkOpenGLImageCPRMapper(publicAPI, model) {
         unregisterGraphicsResources(oldOglRenderWindow);
       }
       model.context = model._openGLRenderWindow.getContext();
-      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera());
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera(), model.openGLCamera);
       model.tris.setOpenGLRenderWindow(model._openGLRenderWindow);
     }
   };

package/Rendering/OpenGL/ImageMapper.js

@@ -70,7 +70,7 @@ function vtkOpenGLImageMapper(publicAPI, model) {
       model.context = model._openGLRenderWindow.getContext();
       model.tris.setOpenGLRenderWindow(model._openGLRenderWindow);
       const ren = model._openGLRenderer.getRenderable();
-      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera());
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera(), model.openGLCamera);
       // is slice set by the camera
       if (model.renderable.isA('vtkImageMapper') && model.renderable.getSliceAtFocalPoint()) {
         model.renderable.setSliceFromCamera(ren.getActiveCamera());

package/Rendering/OpenGL/ImageResliceMapper.js

@@ -93,7 +93,7 @@ function vtkOpenGLImageResliceMapper(publicAPI, model) {
       model._openGLImageSlice = publicAPI.getFirstAncestorOfType('vtkOpenGLImageSlice');
       model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       const ren = model._openGLRenderer.getRenderable();
-      model._openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera());
+      model._openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera(), model.openGLCamera);
       const oldOglRenderWindow = model._openGLRenderWindow;
       model._openGLRenderWindow = model._openGLRenderer.getLastAncestorOfType('vtkOpenGLRenderWindow');
       if (oldOglRenderWindow && !oldOglRenderWindow.isDeleted() && oldOglRenderWindow !== model._openGLRenderWindow) {

package/Rendering/OpenGL/PolyDataMapper.js

@@ -70,7 +70,7 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
       model.openGLActor = publicAPI.getFirstAncestorOfType('vtkOpenGLActor');
       model._openGLRenderer = model.openGLActor.getFirstAncestorOfType('vtkOpenGLRenderer');
       model._openGLRenderWindow = model._openGLRenderer.getLastAncestorOfType('vtkOpenGLRenderWindow');
-      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera());
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera(), model.openGLCamera);
     }
   };
 

package/Rendering/OpenGL/PolyDataMapper2D.js

@@ -42,7 +42,7 @@ function vtkOpenGLPolyDataMapper2D(publicAPI, model) {
       model.openGLActor2D = publicAPI.getFirstAncestorOfType('vtkOpenGLActor2D');
       model._openGLRenderer = model.openGLActor2D.getFirstAncestorOfType('vtkOpenGLRenderer');
       model._openGLRenderWindow = model._openGLRenderer.getLastAncestorOfType('vtkOpenGLRenderWindow');
-      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera());
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(model._openGLRenderer.getRenderable().getActiveCamera(), model.openGLCamera);
     }
   };
   publicAPI.overlayPass = prepass => {

package/Rendering/OpenGL/Skybox.js

@@ -28,7 +28,7 @@ function vtkOpenGLSkybox(publicAPI, model) {
       model.tris.setOpenGLRenderWindow(model._openGLRenderWindow);
       model.openGLTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
       const ren = model._openGLRenderer.getRenderable();
-      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera());
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera(), model.openGLCamera);
     }
   };
   publicAPI.queryPass = (prepass, renderPass) => {

package/Rendering/OpenGL/VolumeMapper.js

@@ -124,7 +124,7 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       const actor = model.openGLVolume.getRenderable();
       model._openGLRenderer = publicAPI.getFirstAncestorOfType('vtkOpenGLRenderer');
       const ren = model._openGLRenderer.getRenderable();
-      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera());
+      model.openGLCamera = model._openGLRenderer.getViewNodeFor(ren.getActiveCamera(), model.openGLCamera);
       publicAPI.renderPiece(ren, actor);
     }
   };

package/Rendering/SceneGraph/ViewNode.d.ts

@@ -100,8 +100,9 @@ export interface vtkViewNode extends vtkObject {
    * Returns the view node that corresponding to the provided object
    * Will return NULL if a match is not found in self or descendents
    * @param dataObject
+   * @param [hint] the previously found node (for optimization)
    */
-  getViewNodeFor(dataObject: any): any;
+  getViewNodeFor(dataObject: any, hint?: any): any;
 
   /**
    *

package/Rendering/SceneGraph/ViewNode.js

@@ -13,6 +13,25 @@ function vtkViewNode(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkViewNode');
 
+  /**
+   * Convenient method to move a child to a specific index.
+   * @param {*} child the child to move
+   * @param {*} toIndex the index to move the child to
+   * @returns true if the child was moved, false otherwise
+   */
+  function moveChild(child, toIndex) {
+    for (let i = 0; i < model.children.length; ++i) {
+      // Start browsing from toIndex + 1
+      const childIndex = (toIndex + 1 + i) % model.children.length;
+      if (model.children[childIndex] === child) {
+        model.children[childIndex] = model.children[toIndex];
+        model.children[toIndex] = child;
+        return true;
+      }
+    }
+    return false;
+  }
+
   // Builds myself.
   publicAPI.build = prepass => {};
 
@@ -41,7 +60,11 @@ function vtkViewNode(publicAPI, model) {
       customRenderPass(prepass, renderPass);
     }
   };
-  publicAPI.getViewNodeFor = dataObject => {
+  publicAPI.getViewNodeFor = function (dataObject) {
+    let hint = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    if (hint && hint.renderable === dataObject) {
+      return hint;
+    }
     if (model.renderable === dataObject) {
       return publicAPI;
     }
@@ -110,17 +133,19 @@ function vtkViewNode(publicAPI, model) {
     if (!dataObjs || !dataObjs.length) {
       return;
     }
+    let nextIndex;
     for (let index = 0; index < dataObjs.length; ++index) {
       const dobj = dataObjs[index];
       const node = publicAPI.addMissingNode(dobj);
-      if (enforceOrder && node !== undefined && model.children[index] !== node) {
-        for (let i = index + 1; i < model.children.length; ++i) {
-          if (model.children[i] === node) {
-            model.children.splice(i, 1);
-            model.children.splice(index, 0, node);
-            break;
-          }
+      if (enforceOrder && node !== undefined) {
+        if (nextIndex === undefined) {
+          // First node can be anywhere
+          nextIndex = model.children.lastIndexOf(node); // node is likely the list child
+        } else if (model.children[nextIndex] !== node) {
+          moveChild(model.children, node);
         }
+        // Next node must follow current node
+        nextIndex++;
       }
     }
   };

package/Rendering/WebGPU/Renderer.js

@@ -122,7 +122,7 @@ function vtkWebGPURenderer(publicAPI, model) {
       publicAPI.addMissingNode(model.camera);
       publicAPI.addMissingNodes(model.renderable.getViewPropsWithNestedProps());
       publicAPI.removeUnusedNodes();
-      model.webgpuCamera = publicAPI.getViewNodeFor(model.camera);
+      model.webgpuCamera = publicAPI.getViewNodeFor(model.camera, model.webgpuCamera);
       publicAPI.updateStabilizedMatrix();
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "34.15.0",
+  "version": "34.15.2",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -97,6 +97,7 @@
     "karma-junit-reporter": "2.0.1",
     "karma-webpack": "5.0.0",
     "kw-doc": "3.1.2",
+    "lil-gui": "0.19.2",
     "lodash": "4.17.21",
     "magic-string": "0.26.2",
     "moment": "2.29.4",