@kitware/vtk.js 26.9.2 → 26.9.4

package/Interaction/Manipulators/MouseRangeManipulator.js

@@ -1,4 +1,4 @@
-import macro from '../../macros.js';
+import macro, { vtkWarningMacro } from '../../macros.js';
 import vtkCompositeMouseManipulator from './CompositeMouseManipulator.js';
 
 // vtkMouseRangeManipulator methods
@@ -23,13 +23,16 @@ function vtkMouseRangeManipulator(publicAPI, model) {
     // the user's cursor is from the start of the interaction, the more
     // their movements will effect the value.
 
-    var scalingFactor = listener.exponentialScroll ? Math.pow(listener.scale, Math.log2(Math.abs(model.interactionNetDelta) + 2)) : listener.scale;
-    var newDelta = delta * scalingFactor + incrementalDelta.get(listener);
-    var value = oldValue + newDelta; // Compute new value based on step
+    var scalingFactor = listener.exponentialScroll ? Math.pow(listener.scale, Math.log2(Math.abs(model.interactionNetDelta) + 2)) : listener.scale; // Preserve the sign of scale (which can be used to invert the scrolling direction)
+    // after the power operation above (in case of exponentialScroll).
 
-    var difference = value - listener.min;
-    var stepsToDifference = Math.round(difference / listener.step);
-    value = listener.min + listener.step * stepsToDifference;
+    scalingFactor = Math.abs(scalingFactor) * Math.sign(listener.scale);
+    var newDelta = delta * scalingFactor + incrementalDelta.get(listener); // Compute new value based on step
+    // In the following line, Math.abs is required so that the floor function
+    // consistently rounds to the lowest absolute integer.
+
+    var stepsToDifference = Math.floor(Math.abs(newDelta / listener.step));
+    var value = oldValue + listener.step * stepsToDifference * Math.sign(newDelta);
     value = Math.max(value, listener.min);
     value = Math.min(value, listener.max);
 
@@ -97,13 +100,19 @@ function vtkMouseRangeManipulator(publicAPI, model) {
   publicAPI.setScrollListener = function (min, max, step, getValue, setValue) {
     var scale = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
     var exponentialScroll = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+
+    if (step < 0) {
+      vtkWarningMacro('Value of step cannot be negative. If you want to invert the scrolling direction, use a negative scale value instead.');
+    }
+
+    var stepSize = Math.abs(step);
     var getFn = Number.isFinite(getValue) ? function () {
       return getValue;
     } : getValue;
     model.scrollListener = {
       min: min,
       max: max,
-      step: step,
+      step: stepSize,
       getValue: getFn,
       setValue: setValue,
       scale: scale,

package/Rendering/Core/RenderWindowInteractor.js

@@ -633,9 +633,10 @@ function vtkRenderWindowInteractor(publicAPI, model) {
 
 
     if (model.wheelTimeoutID === 0) {
-      // 0.4 is roughly half-way between a large trackpad first event and small
-      // mouse wheel first event.
-      if (Math.abs(callData.spinY) > 0.4) {
+      // we attempt to distinguish between trackpads and mice
+      // .3 will be larger than the first trackpad event,
+      // but small enough to detect some common edge case mice
+      if (Math.abs(callData.spinY) >= 0.3) {
         // Event is coming from mouse wheel
         wheelCoefficient = Math.abs(callData.spinY);
       } else {

package/package.json

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