@kitware/vtk.js 26.5.5 → 26.6.0

package/Rendering/Core/RenderWindowInteractor.d.ts

@@ -60,6 +60,7 @@ export interface IRenderWindowInteractorInitialValues {
 	moveTimeoutID?: number;
 	preventDefaultOnPointerDown?: boolean;
 	preventDefaultOnPointerUp?: boolean;
+	mouseScrollDebounceByPass?: boolean;
 }
 
 interface IPosition {
@@ -164,6 +165,11 @@ export interface vtkRenderWindowInteractor extends vtkObject {
 	 */
 	getPreventDefaultOnPointerUp(): boolean;
 
+	/**
+	 * @default false
+	 */
+	getMouseScrollDebounceByPass(): boolean;
+
 	/**
 	 * 
 	 * @param {IRenderWindowInteractorEvent} callData 
@@ -849,6 +855,13 @@ export interface vtkRenderWindowInteractor extends vtkObject {
 	 */
 	setPreventDefaultOnPointerUp(preventDefault: boolean): boolean;
 
+	/**
+	 * Allow system to bypass scrolling debounce. This function must be called to allow the debounce to be bypassed
+	 * @param mouseScrollDebounceByPass
+	 */
+
+	setMouseScrollDebounceByPass(mouseScrollDebounceByPass:boolean): boolean;
+
    /**
 	 *
 	 * @param recognizeGestures

package/Rendering/Core/RenderWindowInteractor.js

@@ -630,14 +630,20 @@ function vtkRenderWindowInteractor(publicAPI, model) {
     } else {
       publicAPI.mouseWheelEvent(callData);
       clearTimeout(model.wheelTimeoutID);
-    } // start a timer to keep us animating while we get wheel events
-
+    }
 
-    model.wheelTimeoutID = setTimeout(function () {
+    if (model.mouseScrollDebounceByPass) {
       publicAPI.extendAnimation(600);
       publicAPI.endMouseWheelEvent();
       model.wheelTimeoutID = 0;
-    }, 200);
+    } else {
+      // start a timer to keep us animating while we get wheel events
+      model.wheelTimeoutID = setTimeout(function () {
+        publicAPI.extendAnimation(600);
+        publicAPI.endMouseWheelEvent();
+        model.wheelTimeoutID = 0;
+      }, 200);
+    }
   };
 
   publicAPI.handleMouseUp = function (event) {
@@ -1086,7 +1092,8 @@ var DEFAULT_VALUES = {
   moveTimeoutID: 0,
   lastGamepadValues: {},
   preventDefaultOnPointerDown: false,
-  preventDefaultOnPointerUp: false
+  preventDefaultOnPointerUp: false,
+  mouseScrollDebounceByPass: false
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
@@ -1103,7 +1110,7 @@ function extend(publicAPI, model) {
 
   macro.get(publicAPI, model, ['initialized', 'container', 'interactorStyle', 'lastFrameTime', 'recentAnimationFrameRate', '_view']); // Create get-set macros
 
-  macro.setGet(publicAPI, model, ['lightFollowCamera', 'enabled', 'enableRender', 'recognizeGestures', 'desiredUpdateRate', 'stillUpdateRate', 'picker', 'preventDefaultOnPointerDown', 'preventDefaultOnPointerUp']);
+  macro.setGet(publicAPI, model, ['lightFollowCamera', 'enabled', 'enableRender', 'recognizeGestures', 'desiredUpdateRate', 'stillUpdateRate', 'picker', 'preventDefaultOnPointerDown', 'preventDefaultOnPointerUp', 'mouseScrollDebounceByPass']);
   macro.moveToProtected(publicAPI, model, ['view']); // For more macro methods, see "Sources/macros.js"
   // Object specific methods
 

package/Rendering/OpenGL/Texture.js

@@ -725,6 +725,33 @@ function vtkOpenGLTexture(publicAPI, model) {
   } //----------------------------------------------------------------------------
 
 
+  function useTexStorage(dataType) {
+    if (model._openGLRenderWindow) {
+      if (model.resizable) {
+        // Cannot use texStorage if the texture is supposed to be resizable.
+        return false;
+      }
+
+      if (model._openGLRenderWindow.getWebgl2()) {
+        var webGLInfo = model._openGLRenderWindow.getGLInformations();
+
+        if (webGLInfo.RENDERER.value.match(/WebKit/gi) && navigator.platform.match(/Mac/gi) && model.oglNorm16Ext && (dataType === VtkDataTypes.UNSIGNED_SHORT || dataType === VtkDataTypes.SHORT)) {
+          // Cannot use texStorage with EXT_texture_norm16 textures on Mac M1 GPU.
+          // No errors reported but the texture is unusable.
+          return false;
+        } // Use texStorage for WebGL2
+
+
+        return true;
+      }
+
+      return false;
+    }
+
+    return false;
+  } //----------------------------------------------------------------------------
+
+
   publicAPI.create2DFromRaw = function (width, height, numComps, dataType, data) {
     var flip = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
     // Now determine the texture parameters using the arguments.
@@ -756,7 +783,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     model.context.pixelStorei(model.context.UNPACK_FLIP_Y_WEBGL, flip);
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
 
-    if (model._openGLRenderWindow.getWebgl2() && !model.resizable) {
+    if (useTexStorage(dataType)) {
       model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
 
       if (scaledData[0] != null) {
@@ -830,7 +857,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
 
-    if (model._openGLRenderWindow.getWebgl2() && !model.resizable) {
+    if (useTexStorage(dataType)) {
       model.context.texStorage2D(model.target, 6, model.internalFormat, model.width, model.height);
     } // We get the 6 images
 
@@ -907,7 +934,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
 
-    if (model._openGLRenderWindow.getWebgl2() && !model.resizable) {
+    if (useTexStorage(dataType)) {
       model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
 
       if (data != null) {
@@ -939,8 +966,6 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     model.target = model.context.TEXTURE_2D;
     model.components = 4;
-    model.width = image.width;
-    model.height = image.height;
     model.depth = 1;
     model.numberOfDimensions = 2;
 
@@ -952,17 +977,19 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1); // Scale up the texture to the next highest power of two dimensions (if needed) and flip y.
 
-    var needNearestPowerOfTwo = !isPowerOfTwo(image.width) || !isPowerOfTwo(image.height);
+    var needNearestPowerOfTwo = !model._openGLRenderWindow.getWebgl2() && (!isPowerOfTwo(image.width) || !isPowerOfTwo(image.height));
     var canvas = document.createElement('canvas');
     canvas.width = needNearestPowerOfTwo ? nearestPowerOfTwo(image.width) : image.width;
     canvas.height = needNearestPowerOfTwo ? nearestPowerOfTwo(image.height) : image.height;
+    model.width = canvas.width;
+    model.height = canvas.height;
     var ctx = canvas.getContext('2d');
     ctx.translate(0, canvas.height);
     ctx.scale(1, -1);
     ctx.drawImage(image, 0, 0, image.width, image.height, 0, 0, canvas.width, canvas.height);
     var safeImage = canvas;
 
-    if (model._openGLRenderWindow.getWebgl2() && !model.resizable) {
+    if (useTexStorage(VtkDataTypes.UNSIGNED_CHAR)) {
       model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
 
       if (safeImage != null) {
@@ -1097,7 +1124,7 @@ function vtkOpenGLTexture(publicAPI, model) {
     // model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
     // openGLDataType
 
-    if (model._openGLRenderWindow.getWebgl2()) {
+    if (useTexStorage(dataType)) {
       model.context.texStorage3D(model.target, 1, model.internalFormat, model.width, model.height, model.depth);
 
       if (scaledData[0] != null) {
@@ -1342,7 +1369,7 @@ function vtkOpenGLTexture(publicAPI, model) {
 
     model.context.pixelStorei(model.context.UNPACK_ALIGNMENT, 1);
 
-    if (model._openGLRenderWindow.getWebgl2() && !model.resizable) {
+    if (useTexStorage(dataTypeToUse)) {
       model.context.texStorage2D(model.target, 1, model.internalFormat, model.width, model.height);
 
       if (newArray != null) {

package/package.json

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