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

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/macros.js

@@ -1,4 +1,4 @@
 import 'fast-deep-equal';
 import './vtk.js';
 import './Common/Core/ClassHierarchy.js';
-export { G as EVENT_ABORT, T as TYPED_ARRAYS, V as VOID, _ as _capitalize, d as algo, q as capitalize, h as chain, I as debounce, m as default, f as event, B as formatBytesToProperUnit, C as formatNumbersWithThousandSeparator, g as get, k as getArray, H as isVtkObject, K as keystore, E as measurePromiseExecution, i as moveToProtected, n as newInstance, a as newTypedArray, b as newTypedArrayFrom, M as normalizeWheel, o as obj, p as proxy, j as proxyPropertyMapping, L as proxyPropertyState, s as set, F as setArray, e as setGet, l as setGetArray, D as setImmediateVTK, u as setLoggerFunction, J as throttle, t as traverseInstanceTree, A as uncapitalize, y as vtkDebugMacro, r as vtkErrorMacro, x as vtkInfoMacro, w as vtkLogMacro, z as vtkOnceErrorMacro, v as vtkWarningMacro } from './macros2.js';
+export { H as EVENT_ABORT, T as TYPED_ARRAYS, V as VOID, _ as _capitalize, d as algo, q as capitalize, h as chain, J as debounce, m as default, f as event, C as formatBytesToProperUnit, D as formatNumbersWithThousandSeparator, g as get, k as getArray, I as isVtkObject, L as keystore, F as measurePromiseExecution, i as moveToProtected, n as newInstance, a as newTypedArray, b as newTypedArrayFrom, N as normalizeWheel, o as obj, p as proxy, j as proxyPropertyMapping, M as proxyPropertyState, u as requiredParam, s as set, G as setArray, e as setGet, l as setGetArray, E as setImmediateVTK, w as setLoggerFunction, K as throttle, t as traverseInstanceTree, B as uncapitalize, z as vtkDebugMacro, r as vtkErrorMacro, y as vtkInfoMacro, x as vtkLogMacro, A as vtkOnceErrorMacro, v as vtkWarningMacro } from './macros2.js';

package/macros2.js

@@ -7,6 +7,9 @@ import ClassHierarchy from './Common/Core/ClassHierarchy.js';
  * The name change is so we do not get eaten by babel-plugin-macros.
  */
 let globalMTime = 0;
+const requiredParam = name => {
+  throw new Error(`Named parameter '${name}' is missing`);
+};
 const VOID = Symbol('void');
 function getCurrentGlobalMTime() {
   return globalMTime;
@@ -1654,11 +1657,13 @@ var macro = {
   vtkOnceErrorMacro,
   vtkWarningMacro,
   // vtk.js internal use
-  objectSetterMap
+  objectSetterMap,
+  requiredParam
 };
 
 var macro$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  requiredParam: requiredParam,
   VOID: VOID,
   setLoggerFunction: setLoggerFunction,
   vtkLogMacro: vtkLogMacro,
@@ -1702,4 +1707,4 @@ var macro$1 = /*#__PURE__*/Object.freeze({
   'default': macro
 });
 
-export { uncapitalize as A, formatBytesToProperUnit as B, formatNumbersWithThousandSeparator as C, setImmediateVTK as D, measurePromiseExecution as E, setArray as F, EVENT_ABORT as G, isVtkObject as H, debounce as I, throttle as J, keystore as K, proxyPropertyState as L, normalizeWheel as M, TYPED_ARRAYS as T, VOID as V, _capitalize as _, newTypedArray as a, newTypedArrayFrom as b, macro$1 as c, algo as d, setGet as e, event as f, get as g, chain as h, moveToProtected as i, proxyPropertyMapping as j, getArray as k, setGetArray as l, macro as m, newInstance as n, obj as o, proxy as p, capitalize as q, vtkErrorMacro as r, set as s, traverseInstanceTree as t, setLoggerFunction as u, vtkWarningMacro as v, vtkLogMacro as w, vtkInfoMacro as x, vtkDebugMacro as y, vtkOnceErrorMacro as z };
+export { vtkOnceErrorMacro as A, uncapitalize as B, formatBytesToProperUnit as C, formatNumbersWithThousandSeparator as D, setImmediateVTK as E, measurePromiseExecution as F, setArray as G, EVENT_ABORT as H, isVtkObject as I, debounce as J, throttle as K, keystore as L, proxyPropertyState as M, normalizeWheel as N, TYPED_ARRAYS as T, VOID as V, _capitalize as _, newTypedArray as a, newTypedArrayFrom as b, macro$1 as c, algo as d, setGet as e, event as f, get as g, chain as h, moveToProtected as i, proxyPropertyMapping as j, getArray as k, setGetArray as l, macro as m, newInstance as n, obj as o, proxy as p, capitalize as q, vtkErrorMacro as r, set as s, traverseInstanceTree as t, requiredParam as u, vtkWarningMacro as v, setLoggerFunction as w, vtkLogMacro as x, vtkInfoMacro as y, vtkDebugMacro as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "33.0.0-beta.3",
+  "version": "33.0.0-beta.5",
   "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": {