Merge branch 'master' into volume_shadow

Author: martinken

Documentation/config.js

@@ -32,12 +32,12 @@ module.exports = {
     plugins: [],
     rules: [
       `
-      { test: /\\.glsl$/i, loader: 'shader-loader' },
       {
         test: /\\.js$/,
+        exclude: /dist\\/esm/,
         use: [
           {
-            loader: 'babel-loader',
+            loader: 'babel-loader?cacheDirectory',
           },
         ],
       },
@@ -69,22 +69,16 @@ module.exports = {
         test: /\\.svg$/,
         type: 'asset/source',
       },
-      {
-        test: /\\.worker\\.js$/,
-        use: [
-          {
-            loader: 'worker-loader',
-            options: { inline: 'no-fallback' },
-          },
-        ],
-      },
       { test: /\\.(png|jpg)$/, type: 'asset' },
       { test: /\\.html$/, loader: 'html-loader' },
       { test: /\\.cjson$/, loader: 'hson-loader' },
       { test: /\\.hson$/, loader: 'hson-loader' },
       `,
     ],
-    alias: ["'vtk.js': `${rootPath}`,"],
+    alias: [
+      "'vtk.js/Sources': `${rootPath}/dist/esm`,",
+      "'vtk.js': `${rootPath}`,",
+    ],
   },
   copy: [{ src: '../Data/*', dest: './build-tmp/public/data' }],
 };

Sources/Rendering/Core/RenderWindowInteractor/index.d.ts

@@ -57,6 +57,8 @@ export interface IRenderWindowInteractorInitialValues {
 	lastFrameTime?: number;
 	wheelTimeoutID?: number;
 	moveTimeoutID?: number;
+	preventDefaultOnPointerDown?: boolean;
+	preventDefaultOnPointerUp?: boolean;
 }
 
 interface IPosition {
@@ -151,6 +153,16 @@ export interface vtkRenderWindowInteractor extends vtkObject {
 	 */
 	getStillUpdateRate(): number;
 
+	/**
+	 * @default false
+	 */
+	getPreventDefaultOnPointerDown(): boolean;
+
+	/**
+	 * @default false
+	 */
+	getPreventDefaultOnPointerUp(): boolean;
+
 	/**
 	 * 
 	 * @param {IRenderWindowInteractorEvent} callData 
@@ -821,6 +833,22 @@ export interface vtkRenderWindowInteractor extends vtkObject {
 	setPicker(picker: any): boolean;
 
 	/**
+	 * Set whether preventDefault is called on pointer down.
+	 * @param {Boolean} preventDefault
+	 */
+	setPreventDefaultOnPointerDown(preventDefault: boolean): boolean;
+
+	/**
+	 * Set whether preventDefault is called on pointer up.
+	 *
+	 * If pointerup occurs without a preceeding pointerdown, then
+	 * this does nothing.
+	 *
+	 * @param {Boolean} preventDefault
+	 */
+	setPreventDefaultOnPointerUp(preventDefault: boolean): boolean;
+
+   /**
 	 *
 	 * @param recognizeGestures
 	 */

Sources/Rendering/Core/RenderWindowInteractor/index.js

@@ -68,11 +68,8 @@ const handledEvents = [
 
 function preventDefault(event) {
   if (event.cancelable) {
-    event.stopPropagation();
     event.preventDefault();
   }
-
-  return false;
 }
 
 function pointerCacheToPositions(cache) {
@@ -211,7 +208,6 @@ function vtkRenderWindowInteractor(publicAPI, model) {
   publicAPI.bindEvents = (container) => {
     model.container = container;
     container.addEventListener('contextmenu', preventDefault);
-    // container.addEventListener('click', preventDefault); // Avoid stopping event propagation
     container.addEventListener('wheel', publicAPI.handleWheel);
     container.addEventListener('DOMMouseScroll', publicAPI.handleWheel);
     container.addEventListener('pointerenter', publicAPI.handlePointerEnter);
@@ -244,7 +240,6 @@ function vtkRenderWindowInteractor(publicAPI, model) {
   publicAPI.unbindEvents = () => {
     const { container } = model;
     container.removeEventListener('contextmenu', preventDefault);
-    // model.container.removeEventListener('click', preventDefault); // Avoid stopping event propagation
     container.removeEventListener('wheel', publicAPI.handleWheel);
     container.removeEventListener('DOMMouseScroll', publicAPI.handleWheel);
     container.removeEventListener('pointerenter', publicAPI.handlePointerEnter);
@@ -315,7 +310,9 @@ function vtkRenderWindowInteractor(publicAPI, model) {
       // ignore events from extra mouse buttons such as `back` and `forward`
       return;
     }
-    preventDefault(event);
+    if (model.preventDefaultOnPointerDown) {
+      preventDefault(event);
+    }
 
     if (event.target.hasPointerCapture(event.pointerId)) {
       event.target.releasePointerCapture(event.pointerId);
@@ -345,7 +342,9 @@ function vtkRenderWindowInteractor(publicAPI, model) {
 
   publicAPI.handlePointerUp = (event) => {
     if (pointerCache.has(event.pointerId)) {
-      preventDefault(event);
+      if (model.preventDefaultOnPointerUp) {
+        preventDefault(event);
+      }
 
       pointerCache.delete(event.pointerId);
       model.container.releasePointerCapture(event.pointerId);
@@ -422,15 +421,17 @@ function vtkRenderWindowInteractor(publicAPI, model) {
 
   //----------------------------------------------------------------------
   publicAPI.requestPointerLock = () => {
-    const canvas = publicAPI.getView().getCanvas();
-    canvas.requestPointerLock();
+    if (model.container) {
+      model.container.requestPointerLock();
+    }
   };
 
   //----------------------------------------------------------------------
   publicAPI.exitPointerLock = () => document.exitPointerLock();
 
   //----------------------------------------------------------------------
-  publicAPI.isPointerLocked = () => !!document.pointerLockElement;
+  publicAPI.isPointerLocked = () =>
+    !!model.container && document.pointerLockElement === model.container;
 
   //----------------------------------------------------------------------
   publicAPI.handlePointerLockChange = () => {
@@ -1140,6 +1141,8 @@ const DEFAULT_VALUES = {
   wheelTimeoutID: 0,
   moveTimeoutID: 0,
   lastGamepadValues: {},
+  preventDefaultOnPointerDown: false,
+  preventDefaultOnPointerUp: false,
 };
 
 // ----------------------------------------------------------------------------
@@ -1177,6 +1180,8 @@ export function extend(publicAPI, model, initialValues = {}) {
     'desiredUpdateRate',
     'stillUpdateRate',
     'picker',
+    'preventDefaultOnPointerDown',
+    'preventDefaultOnPointerUp',
   ]);
   macro.moveToProtected(publicAPI, model, ['view']);
 

Sources/Rendering/OpenGL/Texture/index.js

@@ -610,11 +610,11 @@ function vtkOpenGLTexture(publicAPI, model) {
     ) {
       for (let idx = 0; idx < data.length; idx++) {
         if (data[idx]) {
-          const newArray = new Float32Array(pixCount);
-          for (let i = 0; i < pixCount; i++) {
-            newArray[i] = data[idx][i];
-          }
-          pixData.push(newArray);
+          const dataArrayToCopy =
+            data[idx].length > pixCount
+              ? data[idx].subarray(0, pixCount)
+              : data[idx];
+          pixData.push(new Float32Array(dataArrayToCopy));
         } else {
           pixData.push(null);
         }
@@ -629,11 +629,11 @@ function vtkOpenGLTexture(publicAPI, model) {
     ) {
       for (let idx = 0; idx < data.length; idx++) {
         if (data[idx]) {
-          const newArray = new Uint8Array(pixCount);
-          for (let i = 0; i < pixCount; i++) {
-            newArray[i] = data[idx][i];
-          }
-          pixData.push(newArray);
+          const dataArrayToCopy =
+            data[idx].length > pixCount
+              ? data[idx].subarray(0, pixCount)
+              : data[idx];
+          pixData.push(new Uint8Array(dataArrayToCopy));
         } else {
           pixData.push(null);
         }