@kitware/vtk.js 33.0.0-beta.3 → 33.0.0-beta.4

package/Rendering/OpenGL/VolumeMapper.js

@@ -1034,7 +1034,10 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     if (reBuildOp) {
       const newOpacityTexture = vtkOpenGLTexture.newInstance();
       newOpacityTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
-      const oWidth = 1024;
+      let oWidth = model.renderable.getOpacityTextureWidth();
+      if (oWidth <= 0) {
+        oWidth = model.context.getParameter(model.context.MAX_TEXTURE_SIZE);
+      }
       const oSize = oWidth * 2 * numIComps;
       const ofTable = new Float32Array(oSize);
       const tmpTable = new Float32Array(oWidth);
@@ -1088,7 +1091,10 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     if (reBuildC) {
       const newColorTexture = vtkOpenGLTexture.newInstance();
       newColorTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
-      const cWidth = 1024;
+      let cWidth = model.renderable.getColorTextureWidth();
+      if (cWidth <= 0) {
+        cWidth = model.context.getParameter(model.context.MAX_TEXTURE_SIZE);
+      }
       const cSize = cWidth * 2 * numIComps * 3;
       const cTable = new Uint8ClampedArray(cSize);
       const tmpTable = new Float32Array(cWidth * 3);
@@ -1125,7 +1131,9 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       const tex = model._openGLRenderWindow.getGraphicsResourceForObject(scalars);
       const scalarsHash = getImageDataHash(imageData, scalars);
       const reBuildTex = !tex?.oglObject?.getHandle() || tex?.hash !== scalarsHash;
-      if (reBuildTex) {
+      const updatedExtents = volumeProperty.getUpdatedExtents();
+      const hasUpdatedExtents = !!updatedExtents.length;
+      if (reBuildTex && !hasUpdatedExtents) {
         const newScalarTexture = vtkOpenGLTexture.newInstance();
         newScalarTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
         // Build the textures
@@ -1139,6 +1147,13 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
       } else {
         model.scalarTextures[component] = tex.oglObject;
       }
+      if (hasUpdatedExtents) {
+        // If hasUpdatedExtents, then the texture is partially updated.
+        // clear the array to acknowledge the update.
+        volumeProperty.setUpdatedExtents([]);
+        const dims = imageData.getDimensions();
+        model.scalarTextures[component].create3DFilterableFromDataArray(dims[0], dims[1], dims[2], scalars, false, updatedExtents);
+      }
       replaceGraphicsResource(model._openGLRenderWindow, model._scalarTexturesCore[component], scalars);
       model._scalarTexturesCore[component] = scalars;
     });
@@ -1151,7 +1166,10 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     if (reBuildL) {
       const newLabelOutlineThicknessTexture = vtkOpenGLTexture.newInstance();
       newLabelOutlineThicknessTexture.setOpenGLRenderWindow(model._openGLRenderWindow);
-      const lWidth = 1024;
+      let lWidth = model.renderable.getLabelOutlineTextureWidth();
+      if (lWidth <= 0) {
+        lWidth = model.context.getParameter(model.context.MAX_TEXTURE_SIZE);
+      }
       const lHeight = 1;
       const lSize = lWidth * lHeight;
       const lTable = new Uint8Array(lSize);

package/Rendering/SceneGraph/ViewNode.js

@@ -105,13 +105,23 @@ function vtkViewNode(publicAPI, model) {
 
   // add missing nodes/children for the passed in renderables. This should
   // be called only in between prepareNodes and removeUnusedNodes
-  publicAPI.addMissingNodes = dataObjs => {
+  publicAPI.addMissingNodes = function (dataObjs) {
+    let enforceOrder = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (!dataObjs || !dataObjs.length) {
       return;
     }
     for (let index = 0; index < dataObjs.length; ++index) {
       const dobj = dataObjs[index];
-      publicAPI.addMissingNode(dobj);
+      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;
+          }
+        }
+      }
     }
   };
 

package/Rendering/WebXR/RenderWindowHelper.js

@@ -140,6 +140,15 @@ function vtkWebXRRenderWindowHelper(publicAPI, model) {
       model.renderWindow.getRenderable().getInteractor().returnFromXRAnimation();
       const gl = model.renderWindow.get3DContext();
       gl.bindFramebuffer(gl.FRAMEBUFFER, null);
+
+      // Remove controllers ray
+      const ren = model.renderWindow.getRenderable().getRenderers()[0];
+      model.xrSession.inputSources.forEach(inputSource => {
+        if (model.inputSourceToRay[inputSource.handedness]) {
+          ren.removeActor(model.inputSourceToRay[inputSource.handedness].actor);
+          model.inputSourceToRay[inputSource.handedness].visible = false;
+        }
+      });
       await model.xrSession.end().catch(error => {
         if (!(error instanceof DOMException)) {
           throw error;

package/Widgets/Core/WidgetManager.d.ts

@@ -12,6 +12,14 @@ import { vtkObject } from './../../interfaces';
 import { CaptureOn, ViewTypes } from './WidgetManager/Constants';
 import { Nullable } from './../../types';
 
+export interface IDisplayScaleParams {
+  dispHeightFactor: number;
+  cameraPosition: number[];
+  cameraDir: number[];
+  isParallel: boolean;
+  rendererPixelDims: number[];
+}
+
 export interface ISelectedData {
   requestCount: number;
   propID: number;
@@ -45,7 +53,10 @@ export function extractRenderingComponents(
  * (vertical) distance that matches a display distance of 30px for a coordinate
  * `coord`, you would compute `30 * getPixelWorldHeightAtCoord(coord)`.
  */
-export function getPixelWorldHeightAtCoord(coord: []): Number;
+export function getPixelWorldHeightAtCoord(
+  coord: [],
+  displayScaleParams: IDisplayScaleParams
+): Number;
 
 export interface vtkWidgetManager extends vtkObject {
   /**

package/Widgets/Representations/WidgetRepresentation.d.ts

@@ -2,13 +2,7 @@ import vtkDataArray from './../../Common/Core/DataArray';
 import vtkPolyData from './../../Common/DataModel/PolyData';
 import { vtkObject } from './../../interfaces';
 import vtkProp from './../../Rendering/Core/Prop';
-export interface IDisplayScaleParams {
-  dispHeightFactor: number;
-  cameraPosition: number[];
-  cameraDir: number[];
-  isParallel: boolean;
-  rendererPixelDims: number[];
-}
+import { IDisplayScaleParams } from './../Core/WidgetManager';
 
 export interface IWidgetRepresentationInitialValues {
   labels?: Array<any>;

package/Widgets/Widgets3D/ResliceCursorWidget.d.ts

@@ -12,14 +12,7 @@ import vtkRenderer from './../../Rendering/Core/Renderer';
 import vtkPlaneManipulator from './../Manipulators/PlaneManipulator';
 import { ViewTypes } from './../Core/WidgetManager/Constants';
 import { Vector2, Vector3 } from './../../types';
-
-export interface IDisplayScaleParams {
-  dispHeightFactor: number;
-  cameraPosition: Vector3;
-  cameraDir: Vector3;
-  isParallel: false;
-  rendererPixelDims: Vector2;
-}
+import { IDisplayScaleParams } from './../Core/WidgetManager';
 
 export interface vtkResliceCursorWidget<
   WidgetInstance extends vtkAbstractWidget = vtkResliceCursorWidgetDefaultInstance

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "33.0.0-beta.3",
+  "version": "33.0.0-beta.4",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",
@@ -141,19 +141,20 @@
     "reformat-only": "prettier --single-quote --trailing-comma es5 --print-width 80 --arrow-parens always --write",
     "lint-fix": "eslint --fix Sources Examples",
     "lint": "eslint Sources Examples",
-    "doc": "kw-doc -c ./Documentation/config.js",
-    "doc:www": "npm t -- --single-run && kw-doc -c ./Documentation/config.js -s",
-    "doc:minified": "kw-doc -c ./Documentation/config.js -m",
-    "doc:generate-api": "node ./Documentation/generate-api-docs.js",
+    "doc": "npm run build:pre && kw-doc -c ./Documentation/config.js",
+    "doc:www": "npm t -- --single-run && npm run build:pre && kw-doc -c ./Documentation/config.js -s",
+    "doc:minified": "npm run build:pre && kw-doc -c ./Documentation/config.js -m",
+    "doc:generate-api": "npm run build:pre && node ./Documentation/generate-api-docs.js",
     "example": "node ./Utilities/ExampleRunner/example-runner-cli.js -c ./Documentation/config.js",
     "example:https": "node ./Utilities/ExampleRunner/example-runner-cli.js --server-type https -c ./Documentation/config.js",
     "example:webgpu": "cross-env WEBGPU=1 NO_WEBGL=1 node ./Utilities/ExampleRunner/example-runner-cli.js --server-type https -c ./Documentation/config.js",
+    "build:pre": "patch-package",
     "dev:esm": "npm run build:esm -- -w",
-    "dev:umd": "webpack --watch --config webpack.dev.js --progress",
+    "dev:umd": "npm run build:pre && webpack --watch --config webpack.dev.js --progress",
     "build": "npm run build:release",
-    "build:esm": "rollup -c rollup.config.js",
-    "build:umd": "webpack --config webpack.prod.js --progress",
-    "build:release": "npm run lint && concurrently \"cross-env NOLINT=1 npm run build:esm\" \"cross-env NOLINT=1 npm run build:umd\"",
+    "build:esm": "npm run build:pre && rollup -c rollup.config.js",
+    "build:umd": "npm run build:pre && webpack --config webpack.prod.js --progress",
+    "build:release": "npm run lint && npm run build:pre && concurrently \"cross-env NOLINT=1 npm run build:esm\" \"cross-env NOLINT=1 npm run build:umd\"",
     "release:create-packages": "node ./Utilities/ci/build-npm-package.js",
     "test": "karma start ./karma.conf.js",
     "test:headless": "karma start ./karma.conf.js --browsers ChromeHeadlessNoSandbox --single-run",
@@ -163,8 +164,7 @@
     "test:firefox-debug": "karma start ./karma.conf.js --browsers Firefox --no-single-run",
     "commit": "git cz",
     "semantic-release": "semantic-release",
-    "prepare": "node ./Utilities/prepare.js",
-    "postinstall": "patch-package"
+    "prepare": "node ./Utilities/prepare.js"
   },
   "config": {
     "commitizen": {