@kitware/vtk.js 25.1.2 → 25.1.3

package/Rendering/WebGPU/Actor2D.js

@@ -98,6 +98,8 @@ function vtkWebGPUActor2D(publicAPI, model) {
 
       if (model.renderable.getCoordinateSystem() === CoordinateSystem.WORLD) {
         mat4.translate(model.keyMatrices.bcsc, model.keyMatrices.bcwc, [-center[0], -center[1], -center[2]]);
+      } else {
+        mat4.copy(model.keyMatrices.bcsc, model.keyMatrices.bcwc);
       }
 
       model.keyMatricesTime.modified();

package/Rendering/WebGPU/BufferManager.js

@@ -65,7 +65,7 @@ function _getFormatForDataArray(dataArray) {
 
     case 3:
       // only 32bit types support x3
-      if (!format.contains('32')) {
+      if (!format.includes('32')) {
         vtkErrorMacro("unsupported x3 type for ".concat(format));
       }
 

package/Rendering/WebGPU/CellArrayMapper.js

@@ -9,6 +9,7 @@ import vtkWebGPUBufferManager from './BufferManager.js';
 import vtkWebGPUShaderCache from './ShaderCache.js';
 import vtkWebGPUUniformBuffer from './UniformBuffer.js';
 import vtkWebGPUSimpleMapper from './SimpleMapper.js';
+import vtkWebGPUTypes from './Types.js';
 
 var BufferUsage = vtkWebGPUBufferManager.BufferUsage,
     PrimitiveTypes = vtkWebGPUBufferManager.PrimitiveTypes;
@@ -223,15 +224,23 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
   publicAPI.replaceShaderTCoord = function (hash, pipeline, vertexInput) {
     if (!vertexInput.hasAttribute('tcoord')) return;
     var vDesc = pipeline.getShaderDescription('vertex');
-    vDesc.addOutput('vec2<f32>', 'tcoordVS');
+    var tcoords = vertexInput.getBuffer('tcoord');
+    var numComp = vtkWebGPUTypes.getNumberOfComponentsFromBufferFormat(tcoords.getArrayInformation()[0].format);
     var code = vDesc.getCode();
+    vDesc.addOutput("vec".concat(numComp, "<f32>"), 'tcoordVS');
     code = vtkWebGPUShaderCache.substitute(code, '//VTK::TCoord::Impl', ['  output.tcoordVS = tcoord;']).result;
     vDesc.setCode(code);
     var fDesc = pipeline.getShaderDescription('fragment');
     code = fDesc.getCode(); // todo handle multiple textures? Blend multiply ?
 
     if (model.textures.length) {
-      code = vtkWebGPUShaderCache.substitute(code, '//VTK::TCoord::Impl', ['var tcolor: vec4<f32> = textureSample(Texture0, Texture0Sampler, input.tcoordVS);', 'computedColor = computedColor*tcolor;']).result;
+      var tdims = model.textures[0].getDimensions();
+
+      if (tdims === numComp) {
+        code = vtkWebGPUShaderCache.substitute(code, '//VTK::TCoord::Impl', ['var tcolor: vec4<f32> = textureSample(Texture0, Texture0Sampler, input.tcoordVS);', 'computedColor = computedColor*tcolor;']).result;
+      } else {
+        console.log("mismatched texture coord dimension ".concat(numComp, " with texture map dimension ").concat(tdims));
+      }
     }
 
     fDesc.setCode(code);
@@ -366,6 +375,7 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
 
 
     var usage = publicAPI.getUsage(representation, primType);
+    model._usesCellNormals = false;
 
     if (!model.is2D && ( // no lighting on Property2D
     usage === BufferUsage.Triangles || usage === BufferUsage.Strips)) {
@@ -387,6 +397,7 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
 
         vertexInput.addBuffer(_buff, ['normalMC']);
       } else if (primType === PrimitiveTypes.Triangles) {
+        model._usesCellNormals = true;
         _buffRequest2.hash = "PFN".concat(points.getMTime(), "I").concat(indexBuffer.getMTime(), "snorm8x4");
         _buffRequest2.dataArray = points;
         _buffRequest2.cells = cells;
@@ -548,7 +559,9 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       }
 
       if (model.vertexInput.hasAttribute("tcoord")) {
-        pipelineHash += "t";
+        var tcoords = model.vertexInput.getBuffer('tcoord');
+        var numComp = vtkWebGPUTypes.getNumberOfComponentsFromBufferFormat(tcoords.getArrayInformation()[0].format);
+        pipelineHash += "t".concat(numComp);
       }
 
       if (model.textures.length) {
@@ -556,6 +569,10 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       }
     }
 
+    if (model._usesCellNormals) {
+      pipelineHash += "cn";
+    }
+
     if (model.SSBO) {
       pipelineHash += "ssbo";
     }

package/Rendering/WebGPU/Texture.js

@@ -184,6 +184,10 @@ function vtkWebGPUTexture(publicAPI, model) {
     return tDetails.numComponents;
   };
 
+  publicAPI.getDimensions = function () {
+    return model.depth > 1 ? 3 : 2;
+  };
+
   publicAPI.resizeToMatch = function (tex) {
     if (tex.getWidth() !== model.width || tex.getHeight() !== model.height || tex.getDepth() !== model.depth) {
       model.width = tex.getWidth();

package/Rendering/WebGPU/Types.js

@@ -325,7 +325,7 @@ function getByteStrideFromBufferFormat(format) {
   var numComp = 1;
 
   if (format[format.length - 2] === 'x') {
-    numComp = format[format.length - 1];
+    numComp = Number(format[format.length - 1]);
   }
 
   var sizeStart = numComp === 1 ? format.length - 1 : format.length - 3; // options are 8, 16, 32 resulting in 8, 6, 2 as the last char
@@ -350,7 +350,7 @@ function getNumberOfComponentsFromBufferFormat(format) {
   var numComp = 1;
 
   if (format[format.length - 2] === 'x') {
-    numComp = format[format.length - 1];
+    numComp = Number(format[format.length - 1]);
   }
 
   return numComp;
@@ -421,7 +421,7 @@ function getByteStrideFromShaderFormat(format) {
   var numComp = 1;
 
   if (format.substring(0, 3) === 'vec') {
-    numComp = format[3];
+    numComp = Number(format[3]);
   } else if (format.substring(0, 3) === 'mat') {
     numComp = format[3] * format[5];
   }

package/package.json

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