@kitware/vtk.js 24.0.0-beta.2 → 24.0.2

package/Rendering/Core/Actor.js

@@ -19,7 +19,7 @@ function vtkActor(publicAPI, model) {
   var superClass = _objectSpread({}, publicAPI);
 
   publicAPI.getActors = function () {
-    return publicAPI;
+    return [publicAPI];
   };
 
   publicAPI.getIsOpaque = function () {

package/Rendering/Core/Prop.d.ts

@@ -14,7 +14,7 @@ export interface IPropInitialValues {
     estimatedRenderTime?: number;
     savedEstimatedRenderTime?: number;
     renderTimeMultiplier?: number;
-    textures?: Array<any>;
+    textures?: vtkTexture[];
 }
 
 export interface vtkProp extends vtkObject {
@@ -141,20 +141,20 @@ export interface vtkProp extends vtkObject {
 
     /**
      * 
-     * @param texture 
+     * @param {vtkTexture} texture The vtkTexture instance.
      *
      */
     hasTexture(texture: vtkTexture): boolean;
 
     /**
      * 
-     * @param texture 
+     * @param {vtkTexture} texture The vtkTexture instance.
      */
     addTexture(texture: vtkTexture): void;
 
     /**
      * 
-     * @param texture 
+     * @param {vtkTexture} texture The vtkTexture instance.
      */
     removeTexture(texture: vtkTexture): void;
 
@@ -230,9 +230,9 @@ export interface vtkProp extends vtkObject {
 
     /**
      * This is used for culling and is a number between 0 and 1. It is used to create the allocated render time value.
-     * @param renderTimeMultiplier 
+     * @param {Number} renderTimeMultiplier 
      */
-    setRendertimemultiplier(renderTimeMultiplier): boolean;
+    setRenderTimeMultiplier(renderTimeMultiplier: number): boolean;
 
     /**
      * Not Implemented yet

package/Rendering/OpenGL/HardwareSelector.js

@@ -239,7 +239,7 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
 
 
   publicAPI.beginSelection = function () {
-    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model.renderer);
+    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model._renderer);
     model.maxAttributeId = 0;
 
     var size = model._openGLRenderWindow.getSize();
@@ -307,7 +307,7 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
           switch (_context.prev = _context.next) {
             case 0:
               // assign the renderer
-              model.renderer = renderer; // set area to all if no arguments provided
+              model._renderer = renderer; // set area to all if no arguments provided
 
               if (fx1 === undefined) {
                 size = model._openGLRenderWindow.getSize();
@@ -361,12 +361,12 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
 
 
   publicAPI.captureBuffers = function () {
-    if (!model.renderer || !model._openGLRenderWindow) {
+    if (!model._renderer || !model._openGLRenderWindow) {
       vtkErrorMacro('Renderer and view must be set before calling Select.');
       return false;
     }
 
-    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model.renderer); // todo revisit making selection part of core
+    model._openGLRenderer = model._openGLRenderWindow.getViewNodeFor(model._renderer); // todo revisit making selection part of core
     // then we can do this in core
 
     model._openGLRenderWindow.getRenderable().preRender(); // int rgba[4];
@@ -383,8 +383,9 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
     }); // Initialize renderer for selection.
     // change the renderer's background to black, which will indicate a miss
 
-    model.originalBackground = model.renderer.getBackgroundByReference();
-    model.renderer.setBackground(0.0, 0.0, 0.0);
+    model.originalBackground = model._renderer.getBackgroundByReference();
+
+    model._renderer.setBackground(0.0, 0.0, 0.0);
 
     var rpasses = model._openGLRenderWindow.getRenderPasses();
 
@@ -409,7 +410,8 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
 
     publicAPI.endSelection(); // restore original background
 
-    model.renderer.setBackground(model.originalBackground);
+    model._renderer.setBackground(model.originalBackground);
+
     publicAPI.invokeEvent({
       type: 'EndEvent'
     }); // restore image, not needed?
@@ -656,13 +658,13 @@ function vtkOpenGLHardwareSelector(publicAPI, model) {
       }
     }
 
-    return convertSelection(model.fieldAssociation, dataMap, model.captureZValues, model.renderer, model._openGLRenderWindow);
+    return convertSelection(model.fieldAssociation, dataMap, model.captureZValues, model._renderer, model._openGLRenderWindow);
   }; //----------------------------------------------------------------------------
 
 
   publicAPI.attach = function (w, r) {
     model._openGLRenderWindow = w;
-    model.renderer = r;
+    model._renderer = r;
   }; // override
 
 

package/Rendering/OpenGL/RenderWindow.d.ts

@@ -21,6 +21,13 @@ export interface IOptions {
 	scale: number
 }
 
+export interface I3DContextOptions {
+    preserveDrawingBuffer?: boolean;
+    depth?: boolean;
+    alpha?: boolean;
+    powerPreference?: string;
+}
+
 type vtkOpenGLRenderWindowBase = vtkObject & Omit<vtkAlgorithm,
 	| 'getInputData'
 	| 'setInputData'
@@ -197,9 +204,9 @@ export interface vtkOpenGLRenderWindow extends vtkOpenGLRenderWindowBase {
 
 	/**
 	 *
-	 * @param options
+	 * @param {I3DContextOptions} options
 	 */
-	get3DContext(options: object): Nullable<WebGLRenderingContext>;
+	get3DContext(options: I3DContextOptions): Nullable<WebGLRenderingContext>;
 
 	/**
 	 *

package/Rendering/OpenGL/RenderWindow.js

@@ -223,7 +223,8 @@ function vtkOpenGLRenderWindow(publicAPI, model) {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
       preserveDrawingBuffer: false,
       depth: true,
-      alpha: true
+      alpha: true,
+      powerPreference: 'high-performance'
     };
     var result = null; // Do we have webxr support
 

package/Rendering/OpenGL/Renderer.js

@@ -1,4 +1,4 @@
-import { newInstance as newInstance$1, get, setGet, vtkDebugMacro as vtkDebugMacro$1 } from '../../macros.js';
+import { newInstance as newInstance$1, get, setGet, moveToProtected, vtkDebugMacro as vtkDebugMacro$1 } from '../../macros.js';
 import vtkViewNode from '../SceneGraph/ViewNode.js';
 import { registerOverride } from './ViewNodeFactory.js';
 
@@ -178,7 +178,7 @@ function vtkOpenGLRenderer(publicAPI, model) {
 
 var DEFAULT_VALUES = {
   context: null,
-  _openGLRenderWindow: null,
+  // _openGLRenderWindow: null,
   selector: null
 }; // ----------------------------------------------------------------------------
 
@@ -189,7 +189,8 @@ function extend(publicAPI, model) {
   vtkViewNode.extend(publicAPI, model, initialValues); // Build VTK API
 
   get(publicAPI, model, ['shaderCache']);
-  setGet(publicAPI, model, ['selector']); // Object methods
+  setGet(publicAPI, model, ['selector']);
+  moveToProtected(publicAPI, model, ['openGLRenderWindow']); // Object methods
 
   vtkOpenGLRenderer(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Rendering/WebGPU/RenderWindow.js

@@ -199,7 +199,9 @@ function vtkWebGPURenderWindow(publicAPI, model) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return navigator.gpu.requestAdapter();
+            return navigator.gpu.requestAdapter({
+              powerPreference: 'high-performance'
+            });
 
           case 2:
             model.adapter = _context.sent;

package/Widgets/Widgets3D/AngleWidget/behavior.js

@@ -42,7 +42,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setScale1(moveHandle.getScale1());
     } else {
       isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
     }
@@ -57,8 +58,8 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleMouseMove = function (callData) {
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       model.manipulator.setOrigin(model.activeState.getOrigin());
-      model.manipulator.setNormal(model.camera.getDirectionOfProjection());
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      model.manipulator.setNormal(model._camera.getDirectionOfProjection());
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -68,7 +69,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.hasFocus) {
-      model.widgetManager.disablePicking();
+      model._widgetManager.disablePicking();
     }
 
     return macro.VOID;
@@ -79,7 +80,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -91,7 +93,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     } // Don't make any more points
@@ -134,7 +137,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().setVisible(false);
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/DistanceWidget/behavior.js

@@ -36,7 +36,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setScale1(moveHandle.getScale1());
     } else {
       isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
     }
@@ -55,7 +56,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -72,7 +73,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -84,7 +86,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
@@ -122,7 +125,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().setVisible(false);
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/ImageCroppingWidget/behavior.js

@@ -55,8 +55,8 @@ function widgetBehavior(publicAPI, model) {
 
         if (type === 'corners') {
           // manipulator should be a plane manipulator
-          manipulator.setNormal(model.camera.getDirectionOfProjection());
-          worldCoords = manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+          manipulator.setNormal(model._camera.getDirectionOfProjection());
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
         if (type === 'faces') {
@@ -69,7 +69,7 @@ function widgetBehavior(publicAPI, model) {
 
           manipulator.setOrigin(transformVec3(center, indexToWorldT));
           manipulator.setNormal(rotateVec3(constraintAxis, indexToWorldT));
-          worldCoords = manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
         if (type === 'edges') {
@@ -78,7 +78,7 @@ function widgetBehavior(publicAPI, model) {
             return a === 1 ? a : 0;
           });
           manipulator.setNormal(rotateVec3(edgeAxis, indexToWorldT));
-          worldCoords = manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+          worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
         }
 
         if (worldCoords.length) {
@@ -111,7 +111,7 @@ function widgetBehavior(publicAPI, model) {
   // --------------------------------------------------------------------------
 
 
-  model.camera = model.renderer.getActiveCamera();
+  model._camera = model._renderer.getActiveCamera();
   model.classHierarchy.push('vtkImageCroppingWidgetProp');
 }
 

package/Widgets/Widgets3D/ImplicitPlaneWidget.js

@@ -21,19 +21,23 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.updateCursor = function () {
     switch (model.activeState.getUpdateMethodName()) {
       case 'updateFromOrigin':
-        model.apiSpecificRenderWindow.setCursor('crosshair');
+        model._apiSpecificRenderWindow.setCursor('crosshair');
+
         break;
 
       case 'updateFromPlane':
-        model.apiSpecificRenderWindow.setCursor('move');
+        model._apiSpecificRenderWindow.setCursor('move');
+
         break;
 
       case 'updateFromNormal':
-        model.apiSpecificRenderWindow.setCursor('alias');
+        model._apiSpecificRenderWindow.setCursor('alias');
+
         break;
 
       default:
-        model.apiSpecificRenderWindow.setCursor('grabbing');
+        model._apiSpecificRenderWindow.setCursor('grabbing');
+
         break;
     }
   };
@@ -88,7 +92,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.updateFromOrigin = function (callData) {
     model.planeManipulator.setNormal(model.widgetState.getNormal());
-    var worldCoords = model.planeManipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if (model.widgetState.containsPoint(worldCoords)) {
       model.activeState.setOrigin(worldCoords);
@@ -101,7 +105,7 @@ function widgetBehavior(publicAPI, model) {
 
     // Move origin along normal axis
     model.lineManipulator.setNormal(model.activeState.getNormal());
-    var worldCoords = model.lineManipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var worldCoords = model.lineManipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if ((_model$widgetState = model.widgetState).containsPoint.apply(_model$widgetState, _toConsumableArray(worldCoords))) {
       model.activeState.setOrigin(worldCoords);
@@ -111,7 +115,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.updateFromNormal = function (callData) {
     model.trackballManipulator.setNormal(model.activeState.getNormal());
-    var newNormal = model.trackballManipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var newNormal = model.trackballManipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     model.activeState.setNormal(newNormal);
   }; // --------------------------------------------------------------------------
   // initialization

package/Widgets/Widgets3D/LabelWidget/behavior.js

@@ -15,7 +15,8 @@ function widgetBehavior(publicAPI, model) {
     model.representations[1].setCircleProps(_objectSpread(_objectSpread({}, model.representations[1].getCircleProps()), {}, {
       visible: !text
     }));
-    model.interactor.render();
+
+    model._interactor.render();
   };
 
   publicAPI.getText = function () {
@@ -51,8 +52,10 @@ function widgetBehavior(publicAPI, model) {
       publicAPI.loseFocus();
     } else {
       model.isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
-      model.interactor.requestAnimation(publicAPI);
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._interactor.requestAnimation(publicAPI);
     }
 
     publicAPI.invokeStartInteractionEvent();
@@ -64,9 +67,12 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (model.isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
-      model.interactor.cancelAnimation(publicAPI);
+
+      model._interactor.cancelAnimation(publicAPI);
+
       publicAPI.invokeEndInteractionEvent();
     } else if (model.activeState !== model.widgetState.getMoveHandle()) {
       model.widgetState.deactivate();
@@ -74,8 +80,10 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
-      model.interactor.render();
+
+      model._widgetManager.enablePicking();
+
+      model._interactor.render();
     }
 
     model.isDragging = false;
@@ -86,7 +94,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleMouseMove = function (callData) {
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model.isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -113,7 +121,9 @@ function widgetBehavior(publicAPI, model) {
       publicAPI.reset();
       model.activeState = model.widgetState.getMoveHandle();
       model.widgetState.getMoveHandle().activate();
-      model.interactor.requestAnimation(publicAPI);
+
+      model._interactor.requestAnimation(publicAPI);
+
       publicAPI.invokeStartInteractionEvent();
     }
 
@@ -122,7 +132,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.loseFocus = function () {
     if (model.hasFocus) {
-      model.interactor.cancelAnimation(publicAPI);
+      model._interactor.cancelAnimation(publicAPI);
+
       publicAPI.invokeEndInteractionEvent();
     }
 
@@ -130,8 +141,10 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().deactivate();
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
-    model.interactor.render();
+
+    model._widgetManager.enablePicking();
+
+    model._interactor.render();
   };
 }
 

package/Widgets/Widgets3D/LineWidget/behavior.js

@@ -36,8 +36,9 @@ function widgetBehavior(publicAPI, model) {
 
   function updateCursor(callData) {
     model.isDragging = true;
-    model.previousPosition = _toConsumableArray(model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow));
-    model.apiSpecificRenderWindow.setCursor('grabbing');
+    model.previousPosition = _toConsumableArray(model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow));
+
+    model._apiSpecificRenderWindow.setCursor('grabbing');
 
     model._interactor.requestAnimation(publicAPI);
   } // --------------------------------------------------------------------------
@@ -101,8 +102,8 @@ function widgetBehavior(publicAPI, model) {
 
 
   function computeMousePosition(p1, callData) {
-    var displayMousePos = publicAPI.computeWorldToDisplay.apply(publicAPI, [model.renderer].concat(_toConsumableArray(p1)));
-    var worldMousePos = publicAPI.computeDisplayToWorld(model.renderer, callData.position.x, callData.position.y, displayMousePos[2]);
+    var displayMousePos = publicAPI.computeWorldToDisplay.apply(publicAPI, [model._renderer].concat(_toConsumableArray(p1)));
+    var worldMousePos = publicAPI.computeDisplayToWorld(model._renderer, callData.position.x, callData.position.y, displayMousePos[2]);
     return worldMousePos;
   }
   /**
@@ -137,8 +138,8 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.rotateHandlesToFaceCamera = function () {
-    model.representations[0].setViewMatrix(Array.from(model.camera.getViewMatrix()));
-    model.representations[1].setViewMatrix(Array.from(model.camera.getViewMatrix()));
+    model.representations[0].setViewMatrix(Array.from(model._camera.getViewMatrix()));
+    model.representations[1].setViewMatrix(Array.from(model._camera.getViewMatrix()));
   }; // Handles visibility ---------------------------------------------------------
 
 
@@ -227,7 +228,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
       var translation = model.previousPosition ? subtract(worldCoords, model.previousPosition, []) : [0, 0, 0];
       model.previousPosition = worldCoords;
 
@@ -269,10 +270,12 @@ function widgetBehavior(publicAPI, model) {
         model._interactor.cancelAnimation(publicAPI);
       }
 
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.hasFocus = false;
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
@@ -314,7 +317,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().deactivate();
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/PaintWidget/behavior.js

@@ -35,8 +35,10 @@ function widgetBehavior(publicAPI, model) {
     if (model.manipulator && model.activeState && model.activeState.getActive()) {
       var _model$activeState, _model$activeState2, _model$activeState3;
 
-      var normal = model.camera.getDirectionOfProjection();
-      var up = model.camera.getViewUp();
+      var normal = model._camera.getDirectionOfProjection();
+
+      var up = model._camera.getViewUp();
+
       var right = [];
       vec3.cross(right, up, normal);
 
@@ -47,7 +49,7 @@ function widgetBehavior(publicAPI, model) {
       (_model$activeState3 = model.activeState).setDirection.apply(_model$activeState3, _toConsumableArray(normal));
 
       model.manipulator.setNormal(normal);
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length) {
         var _model$widgetState, _model$activeState4;
@@ -76,7 +78,7 @@ function widgetBehavior(publicAPI, model) {
 
       model._interactor.requestAnimation(publicAPI);
 
-      var canvas = model.apiSpecificRenderWindow.getCanvas();
+      var canvas = model._apiSpecificRenderWindow.getCanvas();
 
       canvas.onmouseenter = function () {
         if (model.hasFocus && model.activeState === model.widgetState.getHandle()) {

package/Widgets/Widgets3D/PolyLineWidget/behavior.js

@@ -59,7 +59,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setScale1(moveHandle.getScale1());
     } else {
       isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
     }
@@ -74,8 +75,8 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleMouseMove = function (callData) {
     if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       model.manipulator.setOrigin(model.activeState.getOrigin());
-      model.manipulator.setNormal(model.camera.getDirectionOfProjection());
-      var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+      model.manipulator.setNormal(model._camera.getDirectionOfProjection());
+      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
         model.activeState.setOrigin(worldCoords);
@@ -85,7 +86,7 @@ function widgetBehavior(publicAPI, model) {
     }
 
     if (model.hasFocus) {
-      model.widgetManager.disablePicking();
+      model._widgetManager.disablePicking();
     }
 
     return macro.VOID;
@@ -96,7 +97,8 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI.handleLeftButtonRelease = function () {
     if (isDragging && model.pickable) {
-      model.apiSpecificRenderWindow.setCursor('pointer');
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -108,7 +110,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.hasFocus && !model.activeState || model.activeState && !model.activeState.getActive()) {
       publicAPI.invokeEndInteractionEvent();
-      model.widgetManager.enablePicking();
+
+      model._widgetManager.enablePicking();
 
       model._interactor.render();
     }
@@ -157,7 +160,8 @@ function widgetBehavior(publicAPI, model) {
     model.widgetState.getMoveHandle().setVisible(false);
     model.activeState = null;
     model.hasFocus = false;
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
 
     model._interactor.render();
   };

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.js

@@ -37,19 +37,23 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.updateCursor = function () {
     switch (model.activeState.getUpdateMethodName()) {
       case InteractionMethodsName.TranslateCenter:
-        model.apiSpecificRenderWindow.setCursor('move');
+        model._apiSpecificRenderWindow.setCursor('move');
+
         break;
 
       case InteractionMethodsName.RotateLine:
-        model.apiSpecificRenderWindow.setCursor('alias');
+        model._apiSpecificRenderWindow.setCursor('alias');
+
         break;
 
       case InteractionMethodsName.TranslateAxis:
-        model.apiSpecificRenderWindow.setCursor('pointer');
+        model._apiSpecificRenderWindow.setCursor('pointer');
+
         break;
 
       default:
-        model.apiSpecificRenderWindow.setCursor('default');
+        model._apiSpecificRenderWindow.setCursor('default');
+
         break;
     }
   };
@@ -197,7 +201,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI[InteractionMethodsName.TranslateAxis] = function (calldata) {
     var stateLine = model.widgetState.getActiveLineState();
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     var point1 = stateLine.getPoint1();
     var point2 = stateLine.getPoint2(); // Translate the current line along the other line
 
@@ -237,7 +241,7 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI[InteractionMethodsName.TranslateCenter] = function (calldata) {
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     worldCoords = publicAPI.getBoundedCenter(worldCoords);
     model.activeState.setCenter(worldCoords);
     updateState(model.widgetState);
@@ -246,7 +250,7 @@ function widgetBehavior(publicAPI, model) {
   publicAPI[InteractionMethodsName.RotateLine] = function (calldata) {
     var activeLine = model.widgetState.getActiveLineState();
     var planeNormal = model.planeManipulator.getNormal();
-    var worldCoords = model.planeManipulator.handleEvent(calldata, model.apiSpecificRenderWindow);
+    var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     var center = model.widgetState.getCenter();
     var previousLineDirection = subtract(activeLine.getPoint1(), activeLine.getPoint2(), []);
     normalize(previousLineDirection);

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -238,17 +238,19 @@ function widgetBehavior(publicAPI, model) {
   };
 
   var computeTextPosition = function computeTextPosition(worldBounds, textPosition) {
-    var _model$apiSpecificRen, _model$apiSpecificRen2, _model$apiSpecificRen5;
+    var _model$_apiSpecificRe, _model$_apiSpecificRe2, _model$_apiSpecificRe5;
 
     var worldMargin = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     var viewPlaneOrigin = model.manipulator.getOrigin();
     var viewPlaneNormal = model.manipulator.getNormal();
-    var viewUp = model.renderer.getActiveCamera().getViewUp();
+
+    var viewUp = model._renderer.getActiveCamera().getViewUp();
+
     var positionMargin = Array.isArray(worldMargin) ? _toConsumableArray(worldMargin) : [worldMargin, worldMargin, viewPlaneOrigin ? worldMargin : 0]; // Map bounds from world positions to display positions
 
-    var minPoint = (_model$apiSpecificRen = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen, _toConsumableArray(vtkBoundingBox.getMinPoint(worldBounds)).concat([model.renderer]));
+    var minPoint = (_model$_apiSpecificRe = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe, _toConsumableArray(vtkBoundingBox.getMinPoint(worldBounds)).concat([model._renderer]));
 
-    var maxPoint = (_model$apiSpecificRen2 = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen2, _toConsumableArray(vtkBoundingBox.getMaxPoint(worldBounds)).concat([model.renderer]));
+    var maxPoint = (_model$_apiSpecificRe2 = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe2, _toConsumableArray(vtkBoundingBox.getMaxPoint(worldBounds)).concat([model._renderer]));
 
     var displayBounds = vtkMath.computeBoundsFromPoints(minPoint, maxPoint, []);
     var planeOrigin = [];
@@ -257,15 +259,15 @@ function widgetBehavior(publicAPI, model) {
     var p3 = []; // If we are in a 2D projection
 
     if (viewPlaneOrigin && viewPlaneNormal && viewUp && vtkBoundingBox.intersectPlane(displayBounds, viewPlaneOrigin, viewPlaneNormal)) {
-      var _model$apiSpecificRen3, _model$apiSpecificRen4;
+      var _model$_apiSpecificRe3, _model$_apiSpecificRe4;
 
       // Map plane origin from world positions to display positions
-      var displayPlaneOrigin = (_model$apiSpecificRen3 = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen3, _toConsumableArray(viewPlaneOrigin).concat([model.renderer])); // Map plane normal from world positions to display positions
+      var displayPlaneOrigin = (_model$_apiSpecificRe3 = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe3, _toConsumableArray(viewPlaneOrigin).concat([model._renderer])); // Map plane normal from world positions to display positions
 
 
       var planeNormalPoint = vtkMath.add(viewPlaneOrigin, viewPlaneNormal, []);
 
-      var displayPlaneNormalPoint = (_model$apiSpecificRen4 = model.apiSpecificRenderWindow).worldToDisplay.apply(_model$apiSpecificRen4, _toConsumableArray(planeNormalPoint).concat([model.renderer]));
+      var displayPlaneNormalPoint = (_model$_apiSpecificRe4 = model._apiSpecificRenderWindow).worldToDisplay.apply(_model$_apiSpecificRe4, _toConsumableArray(planeNormalPoint).concat([model._renderer]));
 
       var displayPlaneNormal = vtkMath.subtract(displayPlaneNormalPoint, displayPlaneOrigin); // Project view plane into bounding box
 
@@ -300,7 +302,7 @@ function widgetBehavior(publicAPI, model) {
     vtkMath.add(finalPosition, v, finalPosition);
     vtkMath.add(finalPosition, w, finalPosition);
     vtkMath.add(finalPosition, positionMargin, finalPosition);
-    return (_model$apiSpecificRen5 = model.apiSpecificRenderWindow).displayToWorld.apply(_model$apiSpecificRen5, finalPosition.concat([model.renderer]));
+    return (_model$_apiSpecificRe5 = model._apiSpecificRenderWindow).displayToWorld.apply(_model$_apiSpecificRe5, finalPosition.concat([model._renderer]));
   };
 
   publicAPI.updateTextPosition = function (point1, point2) {
@@ -350,8 +352,10 @@ function widgetBehavior(publicAPI, model) {
     if (!model.point2) {
       // Update orientation to match the camera's plane
       // if the corners are not yet placed
-      var normal = model.camera.getDirectionOfProjection();
-      var up = model.camera.getViewUp();
+      var normal = model._camera.getDirectionOfProjection();
+
+      var up = model._camera.getViewUp();
+
       var right = [];
       vec3.cross(right, up, normal);
       model.shapeHandle.setUp(up);
@@ -360,7 +364,7 @@ function widgetBehavior(publicAPI, model) {
       model.manipulator.setNormal(normal);
     }
 
-    var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if (!worldCoords.length) {
       return macro.VOID;
@@ -420,7 +424,8 @@ function widgetBehavior(publicAPI, model) {
 
     if (model.point1 && (model.activeState === model.point1Handle || model.activeState === model.point2Handle)) {
       model.isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
 
@@ -437,7 +442,9 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleLeftButtonRelease = function (e) {
     if (model.isDragging) {
       model.isDragging = false;
-      model.apiSpecificRenderWindow.setCursor('pointer');
+
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.widgetState.deactivate();
 
       model._interactor.cancelAnimation(publicAPI);
@@ -450,7 +457,7 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
 
-    var viewSize = model.apiSpecificRenderWindow.getSize();
+    var viewSize = model._apiSpecificRenderWindow.getSize();
 
     if (e.position.x < 0 || e.position.x > viewSize[0] - 1 || e.position.y < 0 || e.position.y > viewSize[1] - 1) {
       return macro.VOID;
@@ -550,7 +557,8 @@ function widgetBehavior(publicAPI, model) {
 
     model._interactor.render();
 
-    model.widgetManager.enablePicking();
+    model._widgetManager.enablePicking();
+
     superClass.loseFocus();
   };
 }

package/Widgets/Widgets3D/SphereWidget/behavior.js

@@ -50,11 +50,12 @@ function widgetBehavior(publicAPI, model) {
     shapeHandle.setVisible(true);
     shapeHandle.setOrigin(center);
     shapeHandle.setScale1(radius * 2);
-    model.interactor.render();
+
+    model._interactor.render();
   }
 
   function currentWorldCoords(e) {
-    return model.manipulator.handleEvent(e, model.apiSpecificRenderWindow);
+    return model.manipulator.handleEvent(e, model._apiSpecificRenderWindow);
   } // Update the sphere's center and radius.  Example:
   // handle.setCenterAndRadius([1,2,3], 10);
 
@@ -78,7 +79,8 @@ function widgetBehavior(publicAPI, model) {
     centerHandle.setOrigin(newCenter);
     borderHandle.setOrigin(newBorder);
     updateSphere();
-    model.widgetManager.enablePicking();
+
+    model._widgetManager.enablePicking();
   };
 
   publicAPI.handleLeftButtonPress = function (e) {
@@ -101,7 +103,9 @@ function widgetBehavior(publicAPI, model) {
     }
 
     model.isDragging = true;
-    model.apiSpecificRenderWindow.setCursor('grabbing');
+
+    model._apiSpecificRenderWindow.setCursor('grabbing');
+
     model.previousPosition = _toConsumableArray(currentWorldCoords(e));
     publicAPI.invokeStartInteractionEvent();
     return macro.EVENT_ABORT;
@@ -115,8 +119,11 @@ function widgetBehavior(publicAPI, model) {
 
     if (isPlaced()) {
       model.previousPosition = null;
-      model.widgetManager.enablePicking();
-      model.apiSpecificRenderWindow.setCursor('pointer');
+
+      model._widgetManager.enablePicking();
+
+      model._apiSpecificRenderWindow.setCursor('pointer');
+
       model.isDragging = false;
       model.activeState = null;
       state.deactivate();
@@ -165,7 +172,8 @@ function widgetBehavior(publicAPI, model) {
     borderHandle.setOrigin(null);
     model.isDragging = true;
     model.activeState = moveHandle;
-    model.interactor.render();
+
+    model._interactor.render();
   };
 
   publicAPI.loseFocus = function () {

package/Widgets/Widgets3D/SplineWidget/behavior.js

@@ -37,14 +37,14 @@ function widgetBehavior(publicAPI, model) {
         model.firstHandle = model.lastHandle;
       }
 
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+      model._apiSpecificRenderWindow.setCursor('grabbing');
     }
   }; // --------------------------------------------------------------------------
 
 
   var getHoveredHandle = function getHoveredHandle() {
     var handles = model.widgetState.getHandleList();
-    var scale = model.moveHandle.getScale1() * vec3.distance(model.apiSpecificRenderWindow.displayToWorld(0, 0, 0, model.renderer), model.apiSpecificRenderWindow.displayToWorld(1, 0, 0, model.renderer));
+    var scale = model.moveHandle.getScale1() * vec3.distance(model._apiSpecificRenderWindow.displayToWorld(0, 0, 0, model._renderer), model._apiSpecificRenderWindow.displayToWorld(1, 0, 0, model._renderer));
     return handles.reduce(function (_ref, handle) {
       var closestHandle = _ref.closestHandle,
           closestDistance = _ref.closestDistance;
@@ -185,7 +185,8 @@ function widgetBehavior(publicAPI, model) {
       model.freeHand = publicAPI.getAllowFreehand() && !model.isDragging;
     } else {
       model.isDragging = true;
-      model.apiSpecificRenderWindow.setCursor('grabbing');
+
+      model._apiSpecificRenderWindow.setCursor('grabbing');
 
       model._interactor.requestAnimation(publicAPI);
 
@@ -201,7 +202,8 @@ function widgetBehavior(publicAPI, model) {
   publicAPI.handleLeftButtonRelease = function (e) {
     if (model.isDragging) {
       if (!model.hasFocus) {
-        model.apiSpecificRenderWindow.setCursor(model.defaultCursor);
+        model._apiSpecificRenderWindow.setCursor(model.defaultCursor);
+
         model.widgetState.deactivate();
 
         model._interactor.cancelAnimation(publicAPI);
@@ -249,19 +251,20 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
 
-    model.manipulator.setNormal(model.camera.getDirectionOfProjection());
-    var worldCoords = model.manipulator.handleEvent(callData, model.apiSpecificRenderWindow);
+    model.manipulator.setNormal(model._camera.getDirectionOfProjection());
+    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     var hoveredHandle = getHoveredHandle();
 
     if (hoveredHandle) {
       model.moveHandle.setVisible(false);
 
       if (hoveredHandle !== model.firstHandle) {
-        model.apiSpecificRenderWindow.setCursor('grabbing');
+        model._apiSpecificRenderWindow.setCursor('grabbing');
       }
     } else if (!model.isDragging && model.hasFocus) {
       model.moveHandle.setVisible(true);
-      model.apiSpecificRenderWindow.setCursor(model.defaultCursor);
+
+      model._apiSpecificRenderWindow.setCursor(model.defaultCursor);
     }
 
     if (model.lastHandle) {

package/index.d.ts

@@ -76,8 +76,8 @@
 /// <reference path="./IO/Geometry/DracoReader.d.ts" />
 /// <reference path="./IO/Geometry/PLYReader.d.ts" />
 /// <reference path="./IO/Geometry/PLYWriter.d.ts" />
-/// <reference path="./IO/Geometry/STLReader.d.ts" />
 /// <reference path="./IO/Geometry/STLWriter.d.ts" />
+/// <reference path="./IO/Geometry/STLReader.d.ts" />
 /// <reference path="./IO/Misc/ElevationReader.d.ts" />
 /// <reference path="./IO/Misc/ITKImageReader.d.ts" />
 /// <reference path="./IO/Misc/ITKPolyDataReader.d.ts" />

package/package.json

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