@kitware/vtk.js 24.5.2 → 24.5.5

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');
@@ -45,7 +59,7 @@ function vtkWebGPUStickMapper(publicAPI, model) {
     vDesc.addBuiltinInput('u32', '@builtin(vertex_index) vertexIndex');
     var fDesc = pipeline.getShaderDescription('fragment');
     fDesc.addBuiltinOutput('f32', '@builtin(frag_depth) fragDepth');
-    var stickFrag = "\n    // compute the eye position and unit direction\n    var vertexVC: vec4<f32>;\n    var EyePos: vec3<f32>;\n    var EyeDir: vec3<f32>;\n\n    if (rendererUBO.cameraParallel != 0u)\n    {\n      EyePos = vec3<f32>(input.vertexVC.x, input.vertexVC.y, input.vertexVC.z + 3.0*input.radiusVC);\n      EyeDir = vec3<f32>(0.0, 0.0, -1.0);\n    }\n    else\n    {\n      EyeDir = input.vertexVC.xyz;\n      EyePos = vec3<f32>(0.0,0.0,0.0);\n      var lengthED: f32 = length(EyeDir);\n      EyeDir = normalize(EyeDir);\n      // we adjust the EyePos to be closer if it is too far away\n      // to prevent floating point precision noise\n      if (lengthED > input.radiusVC*3.0)\n      {\n        EyePos = input.vertexVC.xyz - EyeDir*3.0*input.radiusVC;\n      }\n    }\n    // translate to Sphere center\n    EyePos = EyePos - input.centerVC;\n\n    // rotate to new basis\n    // base1, base2, orientVC\n    var base1: vec3<f32>;\n    if (abs(input.orientVC.z) < 0.99)\n    {\n      base1 = normalize(cross(input.orientVC,vec3<f32>(0.0,0.0,1.0)));\n    }\n    else\n    {\n      base1 = normalize(cross(input.orientVC,vec3<f32>(0.0,1.0,0.0)));\n    }\n    var base2: vec3<f32> = cross(input.orientVC,base1);\n    EyePos = vec3<f32>(dot(EyePos,base1),dot(EyePos,base2),dot(EyePos,input.orientVC));\n    EyeDir = vec3<f32>(dot(EyeDir,base1),dot(EyeDir,base2),dot(EyeDir,input.orientVC));\n\n    // scale to radius 1.0\n    EyePos = EyePos * (1.0 / input.radiusVC);\n\n    // find the intersection\n    var a: f32 = EyeDir.x*EyeDir.x + EyeDir.y*EyeDir.y;\n    var b: f32 = 2.0*(EyePos.x*EyeDir.x + EyePos.y*EyeDir.y);\n    var c: f32 = EyePos.x*EyePos.x + EyePos.y*EyePos.y - 1.0;\n    var d: f32 = b*b - 4.0*a*c;\n    var normal: vec3<f32> = vec3<f32>(0.0,0.0,1.0);\n    if (d < 0.0) { discard; }\n    else\n    {\n      var t: f32 = (-b - sqrt(d))*(0.5 / a);\n      var tz: f32 = EyePos.z + t*EyeDir.z;\n      var iPoint: vec3<f32> = EyePos + t*EyeDir;\n      if (abs(iPoint.z)*input.radiusVC > input.lengthVC*0.5)\n      {\n        // test for end cap\n        var t2: f32 = (-b + sqrt(d))*(0.5 / a);\n        var tz2: f32 = EyePos.z + t2*EyeDir.z;\n        if (tz2*input.radiusVC > input.lengthVC*0.5 || tz*input.radiusVC < -0.5*input.lengthVC) { discard; }\n        else\n        {\n          normal = input.orientVC;\n          var t3: f32 = (input.lengthVC*0.5/input.radiusVC - EyePos.z)/EyeDir.z;\n          iPoint = EyePos + t3*EyeDir;\n          vertexVC = vec4<f32>(input.radiusVC*(iPoint.x*base1 + iPoint.y*base2 + iPoint.z*input.orientVC) + input.centerVC, 1.0);\n        }\n      }\n      else\n      {\n        // The normal is the iPoint.xy rotated back into VC\n        normal = iPoint.x*base1 + iPoint.y*base2;\n        // rescale rerotate and translate\n        vertexVC = vec4<f32>(input.radiusVC*(normal + iPoint.z*input.orientVC) + input.centerVC, 1.0);\n      }\n      // compute the pixel's depth\n      var pos: vec4<f32> = rendererUBO.VCPCMatrix * vertexVC;\n      output.fragDepth = pos.z / pos.w;\n    }\n    ";
+    var stickFrag = "\n    // compute the eye position and unit direction\n    var vertexVC: vec4<f32>;\n    var EyePos: vec3<f32>;\n    var EyeDir: vec3<f32>;\n\n    if (rendererUBO.cameraParallel != 0u)\n    {\n      EyePos = vec3<f32>(input.vertexVC.x, input.vertexVC.y, input.vertexVC.z + 3.0*input.radiusVC);\n      EyeDir = vec3<f32>(0.0, 0.0, -1.0);\n    }\n    else\n    {\n      EyeDir = input.vertexVC.xyz;\n      EyePos = vec3<f32>(0.0,0.0,0.0);\n      var lengthED: f32 = length(EyeDir);\n      EyeDir = normalize(EyeDir);\n      // we adjust the EyePos to be closer if it is too far away\n      // to prevent floating point precision noise\n      if (lengthED > input.radiusVC*3.0)\n      {\n        EyePos = input.vertexVC.xyz - EyeDir*3.0*input.radiusVC;\n      }\n    }\n    // translate to Sphere center\n    EyePos = EyePos - input.centerVC;\n\n    // rotate to new basis\n    // base1, base2, orientVC\n    var base1: vec3<f32>;\n    if (abs(input.orientVC.z) < 0.99)\n    {\n      base1 = normalize(cross(input.orientVC,vec3<f32>(0.0,0.0,1.0)));\n    }\n    else\n    {\n      base1 = normalize(cross(input.orientVC,vec3<f32>(0.0,1.0,0.0)));\n    }\n    var base2: vec3<f32> = cross(input.orientVC,base1);\n    EyePos = vec3<f32>(dot(EyePos,base1),dot(EyePos,base2),dot(EyePos,input.orientVC));\n    EyeDir = vec3<f32>(dot(EyeDir,base1),dot(EyeDir,base2),dot(EyeDir,input.orientVC));\n\n    // scale to radius 1.0\n    EyePos = EyePos * (1.0 / input.radiusVC);\n\n    // find the intersection\n    var a: f32 = EyeDir.x*EyeDir.x + EyeDir.y*EyeDir.y;\n    var b: f32 = 2.0*(EyePos.x*EyeDir.x + EyePos.y*EyeDir.y);\n    var c: f32 = EyePos.x*EyePos.x + EyePos.y*EyePos.y - 1.0;\n    var d: f32 = b*b - 4.0*a*c;\n    var normal: vec3<f32> = vec3<f32>(0.0,0.0,1.0);\n    if (d < 0.0) { discard; }\n    else\n    {\n      var t: f32 = (-b - sqrt(d))*(0.5 / a);\n      var tz: f32 = EyePos.z + t*EyeDir.z;\n      var iPoint: vec3<f32> = EyePos + t*EyeDir;\n      if (abs(iPoint.z)*input.radiusVC > input.lengthVC*0.5)\n      {\n        // test for end cap\n        var t2: f32 = (-b + sqrt(d))*(0.5 / a);\n        var tz2: f32 = EyePos.z + t2*EyeDir.z;\n        if (tz2*input.radiusVC > input.lengthVC*0.5 || tz*input.radiusVC < -0.5*input.lengthVC) { discard; }\n        else\n        {\n          normal = input.orientVC;\n          var t3: f32 = (input.lengthVC*0.5/input.radiusVC - EyePos.z)/EyeDir.z;\n          iPoint = EyePos + t3*EyeDir;\n          vertexVC = vec4<f32>(input.radiusVC*(iPoint.x*base1 + iPoint.y*base2 + iPoint.z*input.orientVC) + input.centerVC, 1.0);\n        }\n      }\n      else\n      {\n        // The normal is the iPoint.xy rotated back into VC\n        normal = iPoint.x*base1 + iPoint.y*base2;\n        // rescale rerotate and translate\n        vertexVC = vec4<f32>(input.radiusVC*(normal + iPoint.z*input.orientVC) + input.centerVC, 1.0);\n      }\n    }\n    // compute the pixel's depth\n    var pos: vec4<f32> = rendererUBO.VCPCMatrix * vertexVC;\n    output.fragDepth = pos.z / pos.w;\n  ";
     var code = fDesc.getCode();
     code = vtkWebGPUShaderCache.substitute(code, '//VTK::Normal::Impl', [stickFrag]).result;
     fDesc.setCode(code);
@@ -62,42 +76,36 @@ 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();
-    var buffRequest = {
-      owner: points,
-      hash: 'stm',
-      time: points.getMTime(),
-      usage: BufferUsage.RawVertex,
-      format: 'float32x3'
-    };
-
-    if (!device.getBufferManager().hasBuffer(buffRequest)) {
-      // xyz v1 v2 v3
+    publicAPI.setNumberOfInstances(numPoints);
+    publicAPI.setNumberOfVertices(12);
+    var vertexInput = model.vertexInput;
+    var hash = "stm".concat(points.getMTime(), "float32x3");
+
+    if (!device.getBufferManager().hasBuffer(hash)) {
+      var buffRequest = {
+        hash: hash,
+        usage: BufferUsage.RawVertex,
+        format: 'float32x3'
+      }; // xyz v1 v2 v3
+
       var tmpVBO = new Float32Array(numPoints * 3);
       var pointIdx = 0;
       var vboIdx = 0;
@@ -124,15 +132,15 @@ function vtkWebGPUStickMapper(publicAPI, model) {
     var defaultRadius = model.renderable.getRadius();
 
     if (scales || defaultRadius !== model._lastRadius) {
-      buffRequest = {
-        owner: scales,
-        hash: 'stm',
-        time: scales ? pointData.getArray(model.renderable.getScaleArray()).getMTime() : 0,
-        usage: BufferUsage.RawVertex,
-        format: 'float32'
-      };
+      hash = "stm".concat(scales ? pointData.getArray(model.renderable.getScaleArray()).getMTime() : defaultRadius, "float32");
+
+      if (!device.getBufferManager().hasBuffer(hash)) {
+        var _buffRequest = {
+          hash: hash,
+          usage: BufferUsage.RawVertex,
+          format: 'float32'
+        };
 
-      if (!device.getBufferManager().hasBuffer(buffRequest)) {
         var _tmpVBO = new Float32Array(numPoints);
 
         var _vboIdx = 0;
@@ -147,9 +155,9 @@ function vtkWebGPUStickMapper(publicAPI, model) {
           _tmpVBO[_vboIdx++] = radius;
         }
 
-        buffRequest.nativeArray = _tmpVBO;
+        _buffRequest.nativeArray = _tmpVBO;
 
-        var _buff = device.getBufferManager().getBuffer(buffRequest);
+        var _buff = device.getBufferManager().getBuffer(_buffRequest);
 
         vertexInput.addBuffer(_buff, ['radiusMC'], 'instance');
       }
@@ -165,16 +173,15 @@ function vtkWebGPUStickMapper(publicAPI, model) {
       vtkErrorMacro(['Error setting orientationArray.\n', 'You have to specify the stick orientation']);
     }
 
-    buffRequest = {
-      owner: orientationArray,
-      hash: 'stm',
-      time: pointData.getArray(model.renderable.getOrientationArray()).getMTime(),
-      usage: BufferUsage.RawVertex,
-      format: 'float32x3'
-    };
+    hash = "stm".concat(pointData.getArray(model.renderable.getOrientationArray()).getMTime(), "float32x3");
+
+    if (!device.getBufferManager().hasBuffer(hash)) {
+      var _buffRequest2 = {
+        hash: hash,
+        usage: BufferUsage.RawVertex,
+        format: 'float32x3'
+      }; // xyz v1 v2 v3
 
-    if (!device.getBufferManager().hasBuffer(buffRequest)) {
-      // xyz v1 v2 v3
       var _tmpVBO2 = new Float32Array(numPoints * 3);
 
       var _pointIdx = 0;
@@ -193,14 +200,13 @@ function vtkWebGPUStickMapper(publicAPI, model) {
         _tmpVBO2[_vboIdx2++] = orientationArray[_pointIdx + 2] * length;
       }
 
-      buffRequest.nativeArray = _tmpVBO2;
+      _buffRequest2.nativeArray = _tmpVBO2;
 
-      var _buff2 = device.getBufferManager().getBuffer(buffRequest);
+      var _buff2 = device.getBufferManager().getBuffer(_buffRequest2);
 
       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;
 
@@ -208,15 +214,13 @@ function vtkWebGPUStickMapper(publicAPI, model) {
       var c = model.renderable.getColorMapColors();
 
       if (c) {
-        buffRequest = {
-          owner: c,
-          hash: 'stm',
-          time: c.getMTime(),
-          usage: BufferUsage.RawVertex,
-          format: 'unorm8x4'
-        };
+        hash = "stm".concat(c.getMTime(), "unorm8x4");
 
-        if (!device.getBufferManager().hasBuffer(buffRequest)) {
+        if (!device.getBufferManager().hasBuffer(hash)) {
+          var _buffRequest3 = {
+            usage: BufferUsage.RawVertex,
+            format: 'unorm8x4'
+          };
           var colorComponents = c.getNumberOfComponents();
 
           if (colorComponents !== 4) {
@@ -236,9 +240,9 @@ function vtkWebGPUStickMapper(publicAPI, model) {
             _tmpVBO3[_vboIdx3++] = colorData[colorIdx + 3];
           }
 
-          buffRequest.nativeArray = _tmpVBO3;
+          _buffRequest3.nativeArray = _tmpVBO3;
 
-          var _buff3 = device.getBufferManager().getBuffer(buffRequest);
+          var _buff3 = device.getBufferManager().getBuffer(_buffRequest3);
 
           vertexInput.addBuffer(_buff3, ['colorVI'], 'instance');
         }
@@ -251,11 +255,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 +269,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

@@ -40,7 +40,6 @@ function vtkWebGPUStorageBuffer(publicAPI, model) {
     if (!model._buffer) {
       var req = {
         nativeArray: model.Float32Array,
-        time: 0,
         usage: BufferUsage.Storage,
         label: model.label
       };
@@ -176,10 +175,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/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
       };
@@ -306,7 +305,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();
   };
 
@@ -263,11 +260,9 @@ function vtkWebGPUVolumePass(publicAPI, model) {
 
     var points = pd.getPoints();
     var buffRequest = {
-      owner: points,
       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,
@@ -348,8 +343,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 +356,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 +646,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
 
 
@@ -452,11 +455,7 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
 
       var image = _volMapr4.getInputData();
 
-      var treq = {
-        imageData: image,
-        owner: image.getPointData().getScalars()
-      };
-      var newTex = 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));
@@ -473,8 +472,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 +512,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/package.json

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