@kitware/vtk.js 24.5.4 → 24.6.0

package/Rendering/WebGPU/Texture.js

@@ -95,7 +95,6 @@ function vtkWebGPUTexture(publicAPI, model) {
 
       if (req.dataArray) {
         buffRequest.dataArray = req.dataArray;
-        buffRequest.time = req.dataArray.getMTime();
       }
 
       buffRequest.nativeArray = req.nativeArray; // bytesPerRow must be a multiple of 256 so we might need to rebuild
@@ -144,7 +143,6 @@ function vtkWebGPUTexture(publicAPI, model) {
 
       var _buffRequest = {
         nativeArray: imageData.data,
-        time: 0,
 
         /* eslint-disable no-undef */
         usage: BufferUsage.Texture,

package/Rendering/WebGPU/TextureManager.js

@@ -119,17 +119,47 @@ function vtkWebGPUTextureManager(publicAPI, model) {
 
   publicAPI.getTexture = function (req) {
     // if we have a source the get/create/cache the texture
-    if (req.owner) {
-      // fill out the req time and format based on imageData/image
-      _fillRequest(req); // if a matching texture already exists then return it
-
-
-      var hash = req.time + req.format;
-      return model.device.getCachedObject(req.owner, hash, _createTexture, req);
+    if (req.hash) {
+      // if a matching texture already exists then return it
+      return model.device.getCachedObject(req.hash, _createTexture, req);
     }
 
     return _createTexture(req);
   };
+
+  publicAPI.getTextureForImageData = function (imgData) {
+    var treq = {
+      time: imgData.getMTime()
+    };
+    treq.imageData = imgData; // fill out the req time and format based on imageData/image
+
+    _fillRequest(treq);
+
+    treq.hash = treq.time + treq.format;
+    return model.device.getTextureManager().getTexture(treq);
+  };
+
+  publicAPI.getTextureForVTKTexture = function (srcTexture) {
+    var treq = {
+      time: srcTexture.getMTime()
+    };
+
+    if (srcTexture.getInputData()) {
+      treq.imageData = srcTexture.getInputData();
+    } else if (srcTexture.getImage()) {
+      treq.image = srcTexture.getImage();
+    } else if (srcTexture.getJsImageData()) {
+      treq.jsImageData = srcTexture.getJsImageData();
+    } else if (srcTexture.getCanvas()) {
+      treq.canvas = srcTexture.getCanvas();
+    } // fill out the req time and format based on imageData/image
+
+
+    _fillRequest(treq);
+
+    treq.hash = treq.time + treq.format;
+    return model.device.getTextureManager().getTexture(treq);
+  };
 } // ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------

package/Rendering/WebGPU/UniformBuffer.js

@@ -206,7 +206,6 @@ function vtkWebGPUUniformBuffer(publicAPI, model) {
     if (!model.UBO) {
       var req = {
         nativeArray: model.Float32Array,
-        time: 0,
         usage: BufferUsage.UniformArray,
         label: model.label
       };

package/Rendering/WebGPU/VertexInput.js

@@ -158,6 +158,10 @@ function vtkWebGPUVertexInput(publicAPI, model) {
     for (var i = 0; i < model.inputs.length; i++) {
       renderEncoder.setVertexBuffer(i, model.inputs[i].buffer.getHandle());
     }
+
+    if (model.indexBuffer) {
+      renderEncoder.setIndexBuffer(model.indexBuffer.getHandle(), model.indexBuffer.getArrayInformation()[0].format);
+    }
   };
 
   publicAPI.getReady = function () {};
@@ -177,7 +181,8 @@ function vtkWebGPUVertexInput(publicAPI, model) {
 var DEFAULT_VALUES = {
   inputs: null,
   bindingDescriptions: false,
-  attributeDescriptions: null
+  attributeDescriptions: null,
+  indexBuffer: null
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
@@ -188,7 +193,7 @@ function extend(publicAPI, model) {
   model.bindingDescriptions = [];
   model.attributeDescriptions = [];
   model.inputs = [];
-  setGet(publicAPI, model, ['created', 'device', 'handle']); // For more macro methods, see "Sources/macros.js"
+  setGet(publicAPI, model, ['created', 'device', 'handle', 'indexBuffer']); // For more macro methods, see "Sources/macros.js"
   // Object specific methods
 
   vtkWebGPUVertexInput(publicAPI, model);

package/Rendering/WebGPU/VolumePass.js

@@ -256,19 +256,27 @@ function vtkWebGPUVolumePass(publicAPI, model) {
   publicAPI.renderDepthBounds = function (renNode, viewNode) {
     publicAPI.updateDepthPolyData(renNode);
     var pd = model._boundsPoly;
-    var cells = pd.getPolys(); // points
-
     var points = pd.getPoints();
+    var cells = pd.getPolys();
     var buffRequest = {
-      owner: points,
+      hash: "vp".concat(cells.getMTime()),
+      usage: BufferUsage.Index,
+      cells: cells,
+      numberOfPoints: points.getNumberOfPoints(),
+      primitiveType: PrimitiveTypes.Triangles,
+      representation: Representation.SURFACE
+    };
+    var indexBuffer = viewNode.getDevice().getBufferManager().getBuffer(buffRequest);
+
+    model._mapper.getVertexInput().setIndexBuffer(indexBuffer); // points
+
+
+    buffRequest = {
       usage: BufferUsage.PointArray,
       format: 'float32x4',
-      time: Math.max(points.getMTime(), cells.getMTime()),
-      hash: 'vp',
+      hash: "vp".concat(points.getMTime()).concat(cells.getMTime()),
       dataArray: points,
-      cells: cells,
-      primitiveType: PrimitiveTypes.Triangles,
-      representation: Representation.SURFACE,
+      indexBuffer: indexBuffer,
       packExtra: true
     };
     var buff = viewNode.getDevice().getBufferManager().getBuffer(buffRequest);

package/Rendering/WebGPU/VolumePassFSQ.js

@@ -455,11 +455,7 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
 
       var image = _volMapr4.getInputData();
 
-      var treq = {
-        imageData: image,
-        owner: image.getPointData().getScalars()
-      };
-      var newTex = model.device.getTextureManager().getTexture(treq);
+      var newTex = model.device.getTextureManager().getTextureForImageData(image);
 
       if (!model.textureViews[vidx + 4] || model.textureViews[vidx + 4].getTexture() !== newTex) {
         var tview = newTex.createView("volTexture".concat(vidx));

package/Widgets/Manipulators/LineManipulator.js

@@ -1,5 +1,5 @@
 import macro from '../../macros.js';
-import { g as subtract, j as cross, d as dot, t as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
+import { g as subtract, j as cross, d as dot, x as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
 
 function projectDisplayToLine(x, y, lineOrigin, lineDirection, renderer, glRenderWindow) {
   var near = glRenderWindow.displayToWorld(x, y, 0, renderer);

package/Widgets/Representations/PolyLineRepresentation.js

@@ -2,7 +2,7 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkActor from '../../Rendering/Core/Actor.js';
 import vtkMapper from '../../Rendering/Core/Mapper.js';
-import { z as areEquals, f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
+import { B as areEquals, f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
 import vtkBoundingBox from '../../Common/DataModel/BoundingBox.js';
 import vtkPolyData from '../../Common/DataModel/PolyData.js';
 import vtkTubeFilter from '../../Filters/General/TubeFilter.js';

package/Widgets/Representations/ResliceCursorContextRepresentation.js

@@ -1,7 +1,7 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
-import { g as subtract, P as multiplyAccumulate, l as normalize, j as cross } from '../../Common/Core/Math/index.js';
+import { g as subtract, m as multiplyAccumulate, l as normalize, j as cross } from '../../Common/Core/Math/index.js';
 import vtkActor from '../../Rendering/Core/Actor.js';
 import vtkCylinderSource from '../../Filters/Sources/CylinderSource.js';
 import vtkMapper from '../../Rendering/Core/Mapper.js';

package/Widgets/Widgets3D/AngleWidget.js

@@ -3,7 +3,7 @@ import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
 import vtkPolyLineRepresentation from '../Representations/PolyLineRepresentation.js';
 import vtkSphereHandleRepresentation from '../Representations/SphereHandleRepresentation.js';
-import { g as subtract, Q as angleBetweenVectors } from '../../Common/Core/Math/index.js';
+import { g as subtract, R as angleBetweenVectors } from '../../Common/Core/Math/index.js';
 import widgetBehavior from './AngleWidget/behavior.js';
 import generateState from './AngleWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';

package/Widgets/Widgets3D/LineWidget/helpers.js

@@ -1,4 +1,4 @@
-import { g as subtract, t as multiplyScalar, k as add, z as areEquals } from '../../../Common/Core/Math/index.js';
+import { g as subtract, x as multiplyScalar, k as add, B as areEquals } from '../../../Common/Core/Math/index.js';
 
 function calculateTextPosition(model) {
   var vector = [0, 0, 0];

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.js

@@ -3,7 +3,7 @@ import macro from '../../../macros.js';
 import vtkBoundingBox from '../../../Common/DataModel/BoundingBox.js';
 import vtkLine from '../../../Common/DataModel/Line.js';
 import vtkPlanePointManipulator from '../../Manipulators/PlaneManipulator.js';
-import { t as multiplyScalar, g as subtract, l as normalize, d as dot, j as cross, P as multiplyAccumulate, R as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
+import { x as multiplyScalar, g as subtract, l as normalize, d as dot, j as cross, m as multiplyAccumulate, S as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
 import { updateState, getAssociatedLinesName, boundPointOnPlane, rotateVector } from './helpers.js';
 import { InteractionMethodsName, ScrollingMethods } from './Constants.js';
 

package/Widgets/Widgets3D/ResliceCursorWidget/helpers.js

@@ -3,7 +3,7 @@ import vtkBoundingBox, { STATIC } from '../../../Common/DataModel/BoundingBox.js
 import vtkCubeSource from '../../../Filters/Sources/CubeSource.js';
 import vtkCutter from '../../../Filters/Core/Cutter.js';
 import vtkPlane from '../../../Common/DataModel/Plane.js';
-import { g as subtract, l as normalize, j as cross, t as multiplyScalar, P as multiplyAccumulate, R as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
+import { g as subtract, l as normalize, j as cross, x as multiplyScalar, m as multiplyAccumulate, S as signedAngleBetweenVectors } from '../../../Common/Core/Math/index.js';
 import vtkMatrixBuilder from '../../../Common/Core/MatrixBuilder.js';
 import { ViewTypes } from '../../Core/WidgetManager/Constants.js';
 

package/Widgets/Widgets3D/ResliceCursorWidget.js

@@ -4,7 +4,7 @@ import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlane from '../../Common/DataModel/Plane.js';
 import vtkPlaneSource from '../../Filters/Sources/PlaneSource.js';
 import vtkResliceCursorContextRepresentation from '../Representations/ResliceCursorContextRepresentation.js';
-import { f as distance2BetweenPoints, P as multiplyAccumulate, g as subtract, l as normalize, t as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
+import { f as distance2BetweenPoints, m as multiplyAccumulate, g as subtract, l as normalize, x as multiplyScalar, k as add } from '../../Common/Core/Math/index.js';
 import widgetBehavior from './ResliceCursorWidget/behavior.js';
 import generateState from './ResliceCursorWidget/state.js';
 import { updateState, transformPlane, boundPlane } from './ResliceCursorWidget/helpers.js';

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -1,7 +1,7 @@
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../../macros.js';
-import { o as vtkMath } from '../../../Common/Core/Math/index.js';
+import { t as vtkMath } from '../../../Common/Core/Math/index.js';
 import vtkBoundingBox from '../../../Common/DataModel/BoundingBox.js';
 import vtkPlane from '../../../Common/DataModel/Plane.js';
 import { ShapeBehavior, BehaviorCategory, TextPosition } from './Constants.js';

package/index.d.ts

@@ -37,6 +37,7 @@
 /// <reference path="./Common/DataModel/Sphere.d.ts" />
 /// <reference path="./Common/DataModel/Spline1D.d.ts" />
 /// <reference path="./Common/DataModel/Spline3D.d.ts" />
+/// <reference path="./Common/DataModel/Triangle.d.ts" />
 /// <reference path="./Common/Transform/LandmarkTransform.d.ts" />
 /// <reference path="./Filters/General/AppendPolyData.d.ts" />
 /// <reference path="./Filters/General/ImageCropFilter.d.ts" />
@@ -61,8 +62,8 @@
 /// <reference path="./Filters/Texture/TextureMapToPlane.d.ts" />
 /// <reference path="./Filters/Texture/TextureMapToSphere.d.ts" />
 /// <reference path="./Interaction/Widgets/OrientationMarkerWidget.d.ts" />
-/// <reference path="./IO/Core/DataAccessHelper/HttpDataAccessHelper.d.ts" />
 /// <reference path="./IO/Core/DataAccessHelper/HtmlDataAccessHelper.d.ts" />
+/// <reference path="./IO/Core/DataAccessHelper/HttpDataAccessHelper.d.ts" />
 /// <reference path="./IO/Core/DataAccessHelper.d.ts" />
 /// <reference path="./IO/Core/DataAccessHelper/JSZipDataAccessHelper.d.ts" />
 /// <reference path="./IO/Core/DataAccessHelper/LiteHttpDataAccessHelper.d.ts" />
@@ -143,5 +144,4 @@
 /// <reference path="./Widgets/Representations/ResliceCursorContextRepresentation.d.ts" />
 /// <reference path="./Widgets/Representations/WidgetRepresentation.d.ts" />
 /// <reference path="./Widgets/Widgets3D/SphereWidget.d.ts" />
-/// <reference path="./Common/DataModel/Triangle.d.ts" />
 /// <reference path="./Common/Core/Math.d.ts" />

package/package.json

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