@kitware/vtk.js 24.5.0 → 24.5.3

package/Rendering/WebGPU/StickMapper.js

@@ -1,11 +1,10 @@
 import { newInstance as newInstance$1, vtkErrorMacro as vtkErrorMacro$1 } from '../../macros.js';
-import vtkWebGPUPolyDataMapper from './PolyDataMapper.js';
+import vtkWebGPUCellArrayMapper from './CellArrayMapper.js';
 import vtkWebGPUBufferManager from './BufferManager.js';
 import vtkWebGPUShaderCache from './ShaderCache.js';
 import { registerOverride } from './ViewNodeFactory.js';
 
-var BufferUsage = vtkWebGPUBufferManager.BufferUsage,
-    PrimitiveTypes = vtkWebGPUBufferManager.PrimitiveTypes;
+var BufferUsage = vtkWebGPUBufferManager.BufferUsage;
 var vtkErrorMacro = vtkErrorMacro$1; // Vertices
 // 013 - 032 - 324 - 453
 //
@@ -34,6 +33,21 @@ var vtkWebGPUStickMapperVS = "\n//VTK::Renderer::Dec\n\n//VTK::Mapper::Dec\n\n//
 function vtkWebGPUStickMapper(publicAPI, model) {
   // Set our className
   model.classHierarchy.push('vtkWebGPUStickMapper');
+  var cellMapperBuildPass = publicAPI.buildPass;
+
+  publicAPI.buildPass = function (prepass) {
+    if (prepass) {
+      if (!model.renderable.getStatic()) {
+        model.renderable.update();
+      }
+
+      var poly = model.renderable.getInputData();
+      publicAPI.setCellArray(poly.getVerts());
+      publicAPI.setCurrentInput(poly);
+    }
+
+    cellMapperBuildPass(prepass);
+  };
 
   publicAPI.replaceShaderNormal = function (hash, pipeline, vertexInput) {
     var vDesc = pipeline.getShaderDescription('vertex');
@@ -62,32 +76,27 @@ function vtkWebGPUStickMapper(publicAPI, model) {
   // or vertex input changes/ bind groups/ etc
 
 
-  publicAPI.computePipelineHash = function (vertexInput) {
-    var pipelineHash = 'stm';
+  publicAPI.computePipelineHash = function () {
+    model.pipelineHash = 'stm';
 
-    if (vertexInput.hasAttribute("colorVI")) {
-      pipelineHash += "c";
+    if (model.vertexInput.hasAttribute("colorVI")) {
+      model.pipelineHash += "c";
     }
 
-    pipelineHash += model.renderEncoder.getPipelineHash();
-    return pipelineHash;
-  }; // was originally buildIBOs() but not using IBOs right now
-
+    model.pipelineHash += model.renderEncoder.getPipelineHash();
+  };
 
-  publicAPI.buildPrimitives = function () {
+  publicAPI.updateBuffers = function () {
     var poly = model.currentInput;
-    var device = model.WebGPURenderWindow.getDevice();
-    model.renderable.mapScalars(poly, 1.0); // handle triangles
-
-    var i = PrimitiveTypes.Triangles;
+    model.renderable.mapScalars(poly, 1.0);
+    var device = model.device;
     var points = poly.getPoints();
     var pointData = poly.getPointData();
     var numPoints = points.getNumberOfPoints();
     var pointArray = points.getData();
-    var primHelper = model.primitives[i];
-    primHelper.setNumberOfInstances(numPoints);
-    primHelper.setNumberOfVertices(12);
-    var vertexInput = model.primitives[i].getVertexInput();
+    publicAPI.setNumberOfInstances(numPoints);
+    publicAPI.setNumberOfVertices(12);
+    var vertexInput = model.vertexInput;
     var buffRequest = {
       owner: points,
       hash: 'stm',
@@ -198,9 +207,8 @@ function vtkWebGPUStickMapper(publicAPI, model) {
       var _buff2 = device.getBufferManager().getBuffer(buffRequest);
 
       vertexInput.addBuffer(_buff2, ['orientMC'], 'instance');
-    }
+    } // deal with colors but only if modified
 
-    model.renderable.mapScalars(poly, 1.0); // deal with colors but only if modified
 
     var haveColors = false;
 
@@ -251,11 +259,8 @@ function vtkWebGPUStickMapper(publicAPI, model) {
       vertexInput.removeBufferIfPresent('colorVI');
     }
 
-    primHelper.setPipelineHash(publicAPI.computePipelineHash(vertexInput));
-    primHelper.setWebGPURenderer(model.WebGPURenderer);
-    primHelper.setTopology('triangle-list');
-    primHelper.build(model.renderEncoder, device);
-    primHelper.registerToDraw();
+    publicAPI.setTopology('triangle-list');
+    publicAPI.updateUBO();
   };
 } // ----------------------------------------------------------------------------
 // Object factory
@@ -268,11 +273,11 @@ function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   Object.assign(model, DEFAULT_VALUES, initialValues); // Inheritance
 
-  vtkWebGPUPolyDataMapper.extend(publicAPI, model, initialValues);
-  model.primitives[PrimitiveTypes.Triangles].setVertexShaderTemplate(vtkWebGPUStickMapperVS); // Object methods
+  vtkWebGPUCellArrayMapper.extend(publicAPI, model, initialValues);
+  publicAPI.setVertexShaderTemplate(vtkWebGPUStickMapperVS); // Object methods
 
   vtkWebGPUStickMapper(publicAPI, model);
-  var sr = model.primitives[PrimitiveTypes.Triangles].getShaderReplacements();
+  var sr = model.shaderReplacements;
   sr.set('replaceShaderPosition', publicAPI.replaceShaderPosition);
   sr.set('replaceShaderNormal', publicAPI.replaceShaderNormal);
 } // ----------------------------------------------------------------------------

package/Rendering/WebGPU/StorageBuffer.js

@@ -176,10 +176,10 @@ function vtkWebGPUStorageBuffer(publicAPI, model) {
 
     for (var i = 0; i < model.bufferEntries.length; i++) {
       var entry = model.bufferEntries[i];
-      lines.push("  ".concat(entry.name, ": ").concat(entry.type, ";"));
+      lines.push("  ".concat(entry.name, ": ").concat(entry.type, ","));
     }
 
-    lines.push("\n};\nstruct ".concat(model.label, "Struct\n{\n  values: array<").concat(model.label, "StructEntry>;\n};\n@binding(").concat(binding, ") @group(").concat(group, ") var<storage, read> ").concat(model.label, ": ").concat(model.label, "Struct;\n"));
+    lines.push("\n};\nstruct ".concat(model.label, "Struct\n{\n  values: array<").concat(model.label, "StructEntry>,\n};\n@binding(").concat(binding, ") @group(").concat(group, ") var<storage, read> ").concat(model.label, ": ").concat(model.label, "Struct;\n"));
     return lines.join('\n');
   };
 

package/Rendering/WebGPU/UniformBuffer.js

@@ -306,7 +306,7 @@ function vtkWebGPUUniformBuffer(publicAPI, model) {
 
     for (var i = 0; i < model.bufferEntries.length; i++) {
       var entry = model.bufferEntries[i];
-      lines.push("  ".concat(entry.name, ": ").concat(entry.type, ";"));
+      lines.push("  ".concat(entry.name, ": ").concat(entry.type, ","));
     }
 
     lines.push("};\n@binding(".concat(binding, ") @group(").concat(group, ") var<uniform> ").concat(model.label, ": ").concat(model.label, "Struct;"));

package/Rendering/WebGPU/Volume.js

@@ -23,10 +23,7 @@ function vtkWebGPUVolume(publicAPI, model) {
         model.propID = model.WebGPURenderWindow.getUniquePropID();
       }
 
-      publicAPI.prepareNodes();
-      model.renderable.getMapper().update(); // publicAPI.addMissingNode(model.renderable.getMapper());
-
-      publicAPI.removeUnusedNodes();
+      model.renderable.getMapper().update();
     }
   };
 
@@ -81,16 +78,6 @@ function vtkWebGPUVolume(publicAPI, model) {
     }
   };
 
-  publicAPI.traverseVolumePass = function (renderPass) {
-    if (!model.renderable || !model.renderable.getNestedVisibility() || model.WebGPURenderer.getSelector() && !model.renderable.getNestedPickable()) {
-      return;
-    }
-
-    publicAPI.apply(renderPass, true);
-    model.children[0].traverse(renderPass);
-    publicAPI.apply(renderPass, false);
-  };
-
   publicAPI.getKeyMatrices = function (wgpuRen) {
     // has the actor or stabilization center changed?
     if (Math.max(model.renderable.getMTime(), wgpuRen.getStabilizedTime()) > model.keyMatricesTime.getMTime()) {

package/Rendering/WebGPU/VolumePass.js

@@ -4,7 +4,7 @@ import vtkPolyData from '../../Common/DataModel/PolyData.js';
 import vtkProperty from '../Core/Property.js';
 import vtkRenderPass from '../SceneGraph/RenderPass.js';
 import vtkWebGPUBufferManager from './BufferManager.js';
-import vtkWebGPUMapperHelper from './MapperHelper.js';
+import vtkWebGPUSimpleMapper from './SimpleMapper.js';
 import vtkWebGPURenderEncoder from './RenderEncoder.js';
 import vtkWebGPUShaderCache from './ShaderCache.js';
 import vtkWebGPUTexture from './Texture.js';
@@ -150,16 +150,6 @@ function vtkWebGPUVolumePass(publicAPI, model) {
     // final composite
 
 
-    model._copyEncoder.setColorTextureView(0, model.colorTextureView);
-
-    model._copyEncoder.attachTextureViews();
-
-    renNode.setRenderEncoder(model._copyEncoder);
-
-    model._copyEncoder.begin(viewNode.getCommandEncoder());
-
-    renNode.scissorAndViewport(model._copyEncoder);
-
     model._volumeCopyQuad.setWebGPURenderer(renNode);
 
     if (model._useSmallViewport) {
@@ -174,7 +164,15 @@ function vtkWebGPUVolumePass(publicAPI, model) {
 
     model._copyUBO.sendIfNeeded(device);
 
-    model._volumeCopyQuad.render(model._copyEncoder, viewNode.getDevice());
+    model._copyEncoder.setColorTextureView(0, model.colorTextureView);
+
+    model._copyEncoder.attachTextureViews();
+
+    model._copyEncoder.begin(viewNode.getCommandEncoder());
+
+    renNode.scissorAndViewport(model._copyEncoder);
+
+    model._volumeCopyQuad.prepareAndDraw(model._copyEncoder);
 
     model._copyEncoder.end();
   }; // unsubscribe from our listeners
@@ -235,7 +233,6 @@ function vtkWebGPUVolumePass(publicAPI, model) {
   publicAPI.rayCastPass = function (viewNode, renNode, volumes) {
     var encoder = model._firstGroup ? model._clearEncoder : model._mergeEncoder;
     encoder.attachTextureViews();
-    renNode.setRenderEncoder(encoder);
     encoder.begin(viewNode.getCommandEncoder());
 
     var width = model._colorTextureView.getTexture().getWidth();
@@ -252,7 +249,7 @@ function vtkWebGPUVolumePass(publicAPI, model) {
     encoder.getHandle().setScissorRect(0, 0, width, height);
     model.fullScreenQuad.setWebGPURenderer(renNode);
     model.fullScreenQuad.setVolumes(volumes);
-    model.fullScreenQuad.render(encoder, viewNode.getDevice());
+    model.fullScreenQuad.prepareAndDraw(encoder);
     encoder.end();
   };
 
@@ -348,8 +345,7 @@ function vtkWebGPUVolumePass(publicAPI, model) {
   };
 
   publicAPI.drawDepthRange = function (renNode, viewNode) {
-    var device = viewNode.getDevice(); // copy current depth buffer to
-
+    // copy current depth buffer to
     model._depthRangeTexture.resizeToMatch(model.colorTextureView.getTexture());
 
     model._depthRangeTexture2.resizeToMatch(model.colorTextureView.getTexture());
@@ -362,9 +358,9 @@ function vtkWebGPUVolumePass(publicAPI, model) {
 
     model._mapper.setWebGPURenderer(renNode);
 
-    model._mapper.build(model._depthRangeEncoder, device);
+    model._mapper.prepareToDraw(model._depthRangeEncoder);
 
-    model._mapper.registerToDraw();
+    model._mapper.registerDrawCallback(model._depthRangeEncoder);
 
     renNode.volumeDepthRangePass(false);
   };
@@ -652,7 +648,7 @@ function extend(publicAPI, model) {
 
   vtkRenderPass.extend(publicAPI, model, initialValues);
   model._lastScale = 2.0;
-  model._mapper = vtkWebGPUMapperHelper.newInstance();
+  model._mapper = vtkWebGPUSimpleMapper.newInstance();
 
   model._mapper.setFragmentShaderTemplate(DepthBoundsFS);
 

package/Rendering/WebGPU/VolumePassFSQ.js

@@ -423,8 +423,11 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
     model.componentSSBO.send(device);
   };
 
-  publicAPI.updateBuffers = function (device) {
-    // compute the min step size
+  var superClassUpdateBuffers = publicAPI.updateBuffers;
+
+  publicAPI.updateBuffers = function () {
+    superClassUpdateBuffers(); // compute the min step size
+
     var sampleDist = model.volumes[0].getRenderable().getMapper().getSampleDistance();
 
     for (var i = 0; i < model.volumes.length; i++) {
@@ -440,7 +443,7 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
     if (model.sampleDist !== sampleDist) {
       model.sampleDist = sampleDist;
       model.UBO.setValue('SampleDistance', sampleDist);
-      model.UBO.sendIfNeeded(device);
+      model.UBO.sendIfNeeded(model.device);
     } // add in 3d volume textures
 
 
@@ -456,7 +459,7 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
         imageData: image,
         owner: image.getPointData().getScalars()
       };
-      var newTex = device.getTextureManager().getTexture(treq);
+      var newTex = model.device.getTextureManager().getTexture(treq);
 
       if (!model.textureViews[vidx + 4] || model.textureViews[vidx + 4].getTexture() !== newTex) {
         var tview = newTex.createView("volTexture".concat(vidx));
@@ -473,8 +476,18 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
     }
 
     model.lastVolumeLength = model.volumes.length;
-    publicAPI.updateLUTImage(device);
-    publicAPI.updateSSBO(device);
+    publicAPI.updateLUTImage(model.device);
+    publicAPI.updateSSBO(model.device);
+
+    if (!model.clampSampler) {
+      model.clampSampler = vtkWebGPUSampler.newInstance({
+        label: 'clampSampler'
+      });
+      model.clampSampler.create(model.device, {
+        minFilter: 'linear',
+        magFilter: 'linear'
+      });
+    }
   };
 
   publicAPI.computePipelineHash = function () {
@@ -503,25 +516,6 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
     }
   };
 
-  var superclassBuild = publicAPI.build;
-
-  publicAPI.build = function (renderEncoder, device) {
-    publicAPI.computePipelineHash();
-    publicAPI.updateBuffers(device);
-
-    if (!model.clampSampler) {
-      model.clampSampler = vtkWebGPUSampler.newInstance({
-        label: 'clampSampler'
-      });
-      model.clampSampler.create(device, {
-        minFilter: 'linear',
-        magFilter: 'linear'
-      });
-    }
-
-    superclassBuild(renderEncoder, device);
-  };
-
   var superclassGetBindables = publicAPI.getBindables;
 
   publicAPI.getBindables = function () {

package/Widgets/Manipulators/LineManipulator.d.ts

@@ -1,4 +1,4 @@
-import { vtkObject } from '../../interfaces';
+import { vtkObject } from './../../interfaces';
 
 /**
  *

package/Widgets/Manipulators/PlaneManipulator.d.ts

@@ -1,4 +1,4 @@
-import { vtkObject } from '../../interfaces';
+import { vtkObject } from './../../interfaces';
 
 /**
  *

package/Widgets/Manipulators/TrackballManipulator.d.ts

@@ -1,4 +1,4 @@
-import { vtkObject } from '../../interfaces';
+import { vtkObject } from './../../interfaces';
 
 /**
  *

package/Widgets/Representations/WidgetRepresentation.d.ts

@@ -1,4 +1,4 @@
-import vtkProp from '../../Rendering/Core/Prop';
+import vtkProp from './../../Rendering/Core/Prop';
 
 export interface IWidgetRepresentationInitialValues {
     labels?: Array<any>,

package/Widgets/Widgets3D/SphereWidget.d.ts

@@ -1,5 +1,5 @@
-import vtkAbstractWidget from '../Core/AbstractWidget';
-import { Vector3, Bounds } from '../../types';
+import vtkAbstractWidget from './../Core/AbstractWidget';
+import { Vector3, Bounds } from './../../types';
 
 export interface ISphereWidgetHandleState {
   getOrigin(): Vector3;

package/_virtual/rollup-plugin-web-worker-loader__helper__funcToSource.js

@@ -1,14 +1,14 @@
 function funcToSource(fn, sourcemapArg) {
     var sourcemap = sourcemapArg === undefined ? null : sourcemapArg;
-    var source = fn.toString();
-    var lines = source.split('\n');
-    lines.pop();
-    lines.shift();
-    var blankPrefixLength = lines[0].search(/\S/);
     var regex = /(['"])__worker_loader_strict__(['"])/g;
-    for (var i = 0, n = lines.length; i < n; ++i) {
-        lines[i] = lines[i].substring(blankPrefixLength).replace(regex, '$1use strict$2') + '\n';
-    }
+    var lines = [];
+
+    // instead of extracting the function source code, just return the function as if it's being evaluated
+    // by the caller.
+    var source = fn.toString();
+    source = source.replace(regex, '$1use strict$2');
+    lines.push('(' + source + ')()');
+
     if (sourcemap) {
         lines.push('\/\/# sourceMappingURL=' + sourcemap + '\n');
     }

package/interfaces.d.ts

@@ -1,5 +1,5 @@
-import vtkDataArray from '././Common/Core/DataArray';
-import { vtkPipelineConnection } from '././types';
+import vtkDataArray from './Common/Core/DataArray';
+import { vtkPipelineConnection } from './types';
 
 /**
  * Object returned on any subscription call

package/macros.d.ts

@@ -1,4 +1,4 @@
-import { vtkSubscription, vtkDebouncedFunction, vtkProperty, vtkPropertyDomain } from '././interfaces';
+import { vtkSubscription, vtkDebouncedFunction, vtkProperty, vtkPropertyDomain } from './interfaces';
 
 /**
  * Allow user to redefine vtkXXXMacro method call.

package/package.json

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

package/types.d.ts

@@ -1,4 +1,4 @@
-import { vtkOutputPort } from '././interfaces';
+import { vtkOutputPort } from './interfaces';
 
 /** Alias type for value that can be null */
 declare type Nullable<T> = T | null;

package/tsconfig.json

@@ -1,8 +0,0 @@
-{
-  "include": ["Sources/**/*"],
-  "compilerOptions": {
-    "allowJs": true,
-    "declaration": true,
-    "emitDeclarationOnly": true
-  }
-}