@kitware/vtk.js 24.6.0 → 24.8.0

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -241,8 +241,9 @@ function widgetBehavior(publicAPI, model) {
     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 viewPlaneOrigin = vtkBoundingBox.getCenter(worldBounds);
+
+    var viewPlaneNormal = model._renderer.getActiveCamera().getDirectionOfProjection();
 
     var viewUp = model._renderer.getActiveCamera().getViewUp();
 
@@ -345,7 +346,11 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleMouseMove = function (callData) {
-    if (!model.activeState || !model.activeState.getActive() || !model.pickable || !model.dragable || !model.manipulator) {
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (!manipulator || !model.activeState || !model.activeState.getActive() || !model.pickable || !model.dragable) {
       return macro.VOID;
     }
 
@@ -361,10 +366,9 @@ function widgetBehavior(publicAPI, model) {
       model.shapeHandle.setUp(up);
       model.shapeHandle.setRight(right);
       model.shapeHandle.setDirection(normal);
-      model.manipulator.setNormal(normal);
     }
 
-    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if (!worldCoords.length) {
       return macro.VOID;

package/Widgets/Widgets3D/ShapeWidget.js

@@ -9,14 +9,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function vtkShapeWidget(publicAPI, model) {
   model.classHierarchy.push('vtkShapeWidget');
+
+  var superClass = _objectSpread({}, publicAPI);
+
   model.methodsToLink = ['scaleInPixels', 'textProps', 'fontProperties'];
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getStatesWithLabel('moveHandle').forEach(function (handle) {
+      return handle.setManipulator(manipulator);
+    });
+  };
 }
 
 function defaultValues(initialValues) {
   var _None;
 
   return _objectSpread({
-    manipulator: null,
+    // manipulator: null,
     modifierBehavior: {
       None: (_None = {}, _defineProperty(_None, BehaviorCategory.PLACEMENT, ShapeBehavior[BehaviorCategory.PLACEMENT].CLICK_AND_DRAG), _defineProperty(_None, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CORNER_TO_CORNER), _defineProperty(_None, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FREE), _None)
     },
@@ -29,7 +39,7 @@ function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   Object.assign(model, defaultValues(initialValues));
   vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
-  macro.setGet(publicAPI, model, ['modifierBehavior', 'resetAfterPointPlacement']);
+  macro.setGet(publicAPI, model, ['manipulator', 'modifierBehavior', 'resetAfterPointPlacement']);
   vtkShapeWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Widgets3D/SphereWidget/behavior.js

@@ -12,8 +12,6 @@ function widgetBehavior(publicAPI, model) {
   model.isDragging = false; // The last world coordinate of the mouse cursor during dragging.
 
   model.previousPosition = null;
-  centerHandle.setManipulator(model.manipulator);
-  borderHandle.setManipulator(model.manipulator);
   model.classHierarchy.push('vtkSphereWidgetProp');
   moveHandle.setVisible(true);
   centerHandle.setVisible(false);
@@ -55,7 +53,10 @@ function widgetBehavior(publicAPI, model) {
   }
 
   function currentWorldCoords(e) {
-    return model.manipulator.handleEvent(e, model._apiSpecificRenderWindow);
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+    return manipulator.handleEvent(e, model._apiSpecificRenderWindow);
   } // Update the sphere's center and radius.  Example:
   // handle.setCenterAndRadius([1,2,3], 10);
 

package/Widgets/Widgets3D/SphereWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
@@ -7,8 +8,15 @@ import macro from '../../macros.js';
 import widgetBehavior from './SphereWidget/behavior.js';
 import stateGenerator from './SphereWidget/state.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function vtkSphereWidget(publicAPI, model) {
   model.classHierarchy.push('vtkSphereWidget');
+
+  var superClass = _objectSpread({}, publicAPI);
+
   model.behavior = widgetBehavior;
 
   publicAPI.getRepresentationsForViewType = function (viewType) {
@@ -34,7 +42,8 @@ function vtkSphereWidget(publicAPI, model) {
       builder: vtkSphereContextRepresentation,
       labels: ['sphereHandle']
     }];
-  };
+  }; // --- Public methods -------------------------------------------------------
+
 
   publicAPI.getRadius = function () {
     var h1 = model.widgetState.getCenterHandle();
@@ -42,8 +51,20 @@ function vtkSphereWidget(publicAPI, model) {
     return Math.sqrt(distance2BetweenPoints(h1.getOrigin(), h2.getOrigin()));
   };
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getCenterHandle().setManipulator(manipulator);
+    model.widgetState.getBorderHandle().setManipulator(manipulator);
+  }; // --------------------------------------------------------------------------
+  // initialization
+  // --------------------------------------------------------------------------
+
+
   model.widgetState = stateGenerator();
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 }
 
 function extend(publicAPI, model) {

package/Widgets/Widgets3D/SplineWidget/behavior.js

@@ -32,6 +32,7 @@ function widgetBehavior(publicAPI, model) {
 
       model.lastHandle.setColor(model.moveHandle.getColor());
       model.lastHandle.setScale1(model.moveHandle.getScale1());
+      model.lastHandle.setManipulator(model.manipulator);
 
       if (!model.firstHandle) {
         model.firstHandle = model.lastHandle;
@@ -247,12 +248,15 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleMouseMove = function (callData) {
-    if (!model.activeState || !model.activeState.getActive() || !model.pickable || !model.manipulator) {
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (!manipulator || !model.activeState || !model.activeState.getActive() || !model.pickable) {
       return macro.VOID;
     }
 
-    model.manipulator.setNormal(model._camera.getDirectionOfProjection());
-    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     var hoveredHandle = getHoveredHandle();
 
     if (hoveredHandle) {

package/Widgets/Widgets3D/SplineWidget/state.js

@@ -16,7 +16,7 @@ function generateState() {
     initialValue: 0
   }).addStateFromMixin({
     labels: ['moveHandle'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'moveHandle',
     initialValues: {
       scale1: 0.05,
@@ -24,7 +24,7 @@ function generateState() {
     }
   }).addDynamicMixinState({
     labels: ['handles'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'handle',
     initialValues: {
       scale1: 0.05

package/Widgets/Widgets3D/SplineWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
@@ -7,11 +8,17 @@ import widgetBehavior from './SplineWidget/behavior.js';
 import generateState from './SplineWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Factory
 // ----------------------------------------------------------------------------
 
 function vtkSplineWidget(publicAPI, model) {
-  model.classHierarchy.push('vtkSplineWidget'); // --- Widget Requirement ---------------------------------------------------
+  model.classHierarchy.push('vtkSplineWidget');
+
+  var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
+
 
   model.methodsToLink = ['outputBorder', 'fill', 'borderColor', 'errorBorderColor'];
   model.behavior = widgetBehavior;
@@ -35,17 +42,29 @@ function vtkSplineWidget(publicAPI, model) {
           labels: ['handles', 'moveHandle']
         }];
     }
+  }; // --- Public methods -------------------------------------------------------
+
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getHandleList().forEach(function (handle) {
+      handle.setManipulator(manipulator);
+    });
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
   // Default manipulator
 
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator(model.manipulator || model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 
 var DEFAULT_VALUES = {
+  // manipulator: null,
   freehandMinDistance: 0.1,
   allowFreehand: true,
   resolution: 32,

package/index.d.ts

@@ -138,6 +138,7 @@
 /// <reference path="./Rendering/SceneGraph/RenderPass.d.ts" />
 /// <reference path="./Rendering/SceneGraph/ViewNode.d.ts" />
 /// <reference path="./Rendering/SceneGraph/ViewNodeFactory.d.ts" />
+/// <reference path="./Widgets/Manipulators/AbstractManipulator.d.ts" />
 /// <reference path="./Widgets/Manipulators/LineManipulator.d.ts" />
 /// <reference path="./Widgets/Manipulators/PlaneManipulator.d.ts" />
 /// <reference path="./Widgets/Manipulators/TrackballManipulator.d.ts" />

package/package.json

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