@kitware/vtk.js 19.2.13 → 19.3.0

package/Rendering/WebGPU/Texture.js

@@ -82,7 +82,7 @@ function vtkWebGPUTexture(publicAPI, model) {
       var currWidthInBytes = model.width * tDetails.stride;
 
       if (currWidthInBytes % 256) {
-        var oArray = req.dataArray.getData();
+        var oArray = req.nativeArray;
         var bufferWidthInBytes = 256 * Math.floor((currWidthInBytes + 255) / 256);
         var bufferWidth = bufferWidthInBytes / oArray.BYTES_PER_ELEMENT;
         var oWidth = currWidthInBytes / oArray.BYTES_PER_ELEMENT;
@@ -209,5 +209,4 @@ var vtkWebGPUTexture$1 = {
   extend: extend
 };
 
-export default vtkWebGPUTexture$1;
-export { extend, newInstance };
+export { vtkWebGPUTexture$1 as default, extend, newInstance };

package/Rendering/WebGPU/TextureManager.js

@@ -1,6 +1,8 @@
 import macro from '../../macros.js';
+import vtkDataArray from '../../Common/Core/DataArray.js';
 import vtkWebGPUTexture from './Texture.js';
 
+var VtkDataTypes = vtkDataArray.VtkDataTypes; // ----------------------------------------------------------------------------
 // Global methods
 // ----------------------------------------------------------------------------
 
@@ -32,24 +34,40 @@ function vtkWebGPUTextureManager(publicAPI, model) {
       req.width = dims[0];
       req.height = dims[1];
       req.depth = dims[2];
-      var numComp = req.dataArray.getNumberOfComponents(); // todo pick format based on native type
-      // todo fix handling of 3 component
+      var numComp = req.dataArray.getNumberOfComponents(); // todo fix handling of 3 component
 
       switch (numComp) {
         case 1:
-          req.format = 'r8unorm';
+          req.format = 'r';
           break;
 
         case 2:
-          req.format = 'rg8unorm';
+          req.format = 'rg';
           break;
 
         default:
         case 3:
         case 4:
-          req.format = 'rgba8unorm';
+          req.format = 'rgba';
           break;
       }
+
+      var dataType = req.dataArray.getDataType();
+
+      switch (dataType) {
+        case VtkDataTypes.UNSIGNED_CHAR:
+          req.format += '8unorm';
+          break;
+
+        case VtkDataTypes.FLOAT:
+        case VtkDataTypes.UNSIGNED_INT:
+        case VtkDataTypes.INT:
+        case VtkDataTypes.DOUBLE:
+        case VtkDataTypes.UNSIGNED_SHORT:
+        case VtkDataTypes.SHORT:
+        default:
+          console.log('unsupported data type in texture');
+      }
     } // fill in values based on image if the request has it
 
 
@@ -137,5 +155,4 @@ var vtkWebGPUTextureManager$1 = {
   extend: extend
 };
 
-export default vtkWebGPUTextureManager$1;
-export { extend, newInstance };
+export { vtkWebGPUTextureManager$1 as default, extend, newInstance };

package/Rendering/WebGPU/TextureView.js

@@ -1,5 +1,6 @@
 import macro from '../../macros.js';
 import vtkWebGPUSampler from './Sampler.js';
+import vtkWebGPUTypes from './Types.js';
 
 // vtkWebGPUTextureView methods
 // ----------------------------------------------------------------------------
@@ -17,6 +18,8 @@ function vtkWebGPUTextureView(publicAPI, model) {
     model.textureHandle = texture.getHandle();
     model.handle = model.textureHandle.createView(model.options);
     model.bindGroupLayoutEntry.texture.viewDimension = model.options.dimension;
+    var tDetails = vtkWebGPUTypes.getDetailsFromTextureFormat(model.texture.getFormat());
+    model.bindGroupLayoutEntry.texture.sampleType = tDetails.sampleType;
   };
 
   publicAPI.getBindGroupEntry = function () {
@@ -27,7 +30,20 @@ function vtkWebGPUTextureView(publicAPI, model) {
   };
 
   publicAPI.getShaderCode = function (binding, group) {
-    var result = "[[binding(".concat(binding, "), group(").concat(group, ")]] var ").concat(model.name, ": texture_").concat(model.options.dimension, "<f32>;");
+    var ttype = 'f32';
+
+    if (model.bindGroupLayoutEntry.texture.sampleType === 'sint') {
+      ttype = 'i32';
+    } else if (model.bindGroupLayoutEntry.texture.sampleType === 'uint') {
+      ttype = 'u32';
+    }
+
+    var result = "[[binding(".concat(binding, "), group(").concat(group, ")]] var ").concat(model.name, ": texture_").concat(model.options.dimension, "<").concat(ttype, ">;");
+
+    if (model.bindGroupLayoutEntry.texture.sampleType === 'depth') {
+      result = "[[binding(".concat(binding, "), group(").concat(group, ")]] var ").concat(model.name, ": texture_depth_").concat(model.options.dimension, ";");
+    }
+
     return result;
   };
 
@@ -95,7 +111,7 @@ function extend(publicAPI, model) {
 
     /* eslint-enable no-undef */
     texture: {
-      // sampleType: 'float',
+      sampleType: 'float',
       viewDimension: '2d' // multisampled: false,
 
     }
@@ -116,5 +132,4 @@ var vtkWebGPUTextureView$1 = {
   extend: extend
 };
 
-export default vtkWebGPUTextureView$1;
-export { extend, newInstance };
+export { vtkWebGPUTextureView$1 as default, extend, newInstance };

package/Rendering/WebGPU/Types.js

@@ -19,249 +19,290 @@ var textureDetails = {
     numComponents: 1,
     nativeType: Uint8Array,
     stride: 1,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   r8snorm: {
     numComponents: 1,
     nativeType: Int8Array,
     stride: 1,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   r8uint: {
     numComponents: 1,
     nativeType: Uint8Array,
     stride: 1,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'uint'
   },
   r8sint: {
     numComponents: 1,
     nativeType: Int8Array,
     stride: 1,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'sint'
   },
   // 16-bit formats
   r16uint: {
     numComponents: 1,
     nativeType: Uint16Array,
     stride: 2,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'uint'
   },
   r16sint: {
     numComponents: 1,
     nativeType: Int16Array,
     stride: 2,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'sint'
   },
   r16float: {
     numComponents: 1,
     nativeType: Float32Array,
     stride: 2,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'float'
   },
   rg8unorm: {
     numComponents: 2,
     nativeType: Uint8Array,
     stride: 2,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   rg8snorm: {
     numComponents: 2,
     nativeType: Int8Array,
     stride: 2,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   rg8uint: {
     numComponents: 2,
     nativeType: Uint8Array,
     stride: 2,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'uint'
   },
   rg8sint: {
     numComponents: 2,
     nativeType: Int8Array,
     stride: 2,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'sint'
   },
   // 32-bit formats
   r32uint: {
     numComponents: 1,
     nativeType: Uint32Array,
     stride: 4,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'uint'
   },
   r32sint: {
     numComponents: 1,
     nativeType: Int32Array,
     stride: 4,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'sint'
   },
   r32float: {
     numComponents: 1,
     nativeType: Float32Array,
     stride: 4,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'unfilterable-float'
   },
   rg16uint: {
     numComponents: 2,
     nativeType: Uint16Array,
     stride: 4,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'uint'
   },
   rg16sint: {
     numComponents: 2,
     nativeType: Int16Array,
     stride: 4,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'sint'
   },
   rg16float: {
     numComponents: 2,
     nativeType: Float32Array,
     stride: 4,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'float'
   },
   rgba8unorm: {
     numComponents: 4,
     nativeType: Uint8Array,
     stride: 4,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   'rgba8unorm-srgb': {
     numComponents: 4,
     nativeType: Uint8Array,
     stride: 4,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   rgba8snorm: {
     numComponents: 4,
     nativeType: Int8Array,
     stride: 4,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   rgba8uint: {
     numComponents: 4,
     nativeType: Uint8Array,
     stride: 4,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'uint'
   },
   rgba8sint: {
     numComponents: 4,
     nativeType: Int8Array,
     stride: 4,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'sint'
   },
   bgra8unorm: {
     numComponents: 4,
     nativeType: Uint8Array,
     stride: 4,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   'bgra8unorm-srgb': {
     numComponents: 4,
     nativeType: Uint8Array,
     stride: 4,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'float'
   },
   // Packed 32-bit formats
   rgb9e5ufloat: {
     numComponents: 4,
     nativeType: Uint32Array,
-    stride: 4
+    stride: 4,
+    sampleType: 'float'
   },
   rgb10a2unorm: {
     numComponents: 4,
     nativeType: Uint32Array,
-    stride: 4
+    stride: 4,
+    sampleType: 'float'
   },
   rg11b10ufloat: {
     numComponents: 4,
     nativeType: Float32Array,
-    stride: 4
+    stride: 4,
+    sampleType: 'float'
   },
   // 64-bit formats
   rg32uint: {
     numComponents: 2,
     nativeType: Uint32Array,
     stride: 8,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'uint'
   },
   rg32sint: {
     numComponents: 2,
     nativeType: Int32Array,
     stride: 8,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'sint'
   },
   rg32float: {
     numComponents: 2,
     nativeType: Float32Array,
     stride: 8,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'unfilterable-float'
   },
   rgba16uint: {
     numComponents: 4,
     nativeType: Uint16Array,
     stride: 8,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'uint'
   },
   rgba16sint: {
     numComponents: 4,
     nativeType: Int16Array,
     stride: 8,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'sint'
   },
   rgba16float: {
     numComponents: 4,
     nativeType: Float32Array,
     stride: 8,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'float'
   },
   // 128-bit formats
   rgba32uint: {
     numComponents: 4,
     nativeType: Uint32Array,
     stride: 16,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'uint'
   },
   rgba32sint: {
     numComponents: 4,
     nativeType: Int32Array,
     stride: 16,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'sint'
   },
   rgba32float: {
     numComponents: 4,
     nativeType: Float32Array,
     stride: 16,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'unfilterable-float'
   },
   // Depth and stencil formats
   stencil8: {
     numComponents: 1,
     nativeType: Uint8Array,
     stride: 1,
-    elementSize: 1
+    elementSize: 1,
+    sampleType: 'uint'
   },
   depth16unorm: {
     numComponents: 1,
     nativeType: Uint16Array,
     stride: 2,
-    elementSize: 2
+    elementSize: 2,
+    sampleType: 'depth'
   },
   depth24plus: {
     numComponents: 1,
     nativeType: Uint32Array,
     stride: 4,
-    elementSize: 3
+    elementSize: 3,
+    sampleType: 'depth'
   },
   'depth24plus-stencil8': {
     numComponents: 2,
     nativeType: Uint32Array,
-    stride: 4
+    stride: 4,
+    sampleType: 'mixed'
   },
   depth32float: {
     numComponents: 1,
     nativeType: Float32Array,
     stride: 4,
-    elementSize: 4
+    elementSize: 4,
+    sampleType: 'depth'
   }
 };
 
@@ -408,4 +449,4 @@ var vtkWebGPUTypes = {
   getNativeTypeFromShaderFormat: getNativeTypeFromShaderFormat
 };
 
-export default vtkWebGPUTypes;
+export { vtkWebGPUTypes as default };

package/Rendering/WebGPU/UniformBuffer.js

@@ -345,5 +345,4 @@ var vtkWebGPUUniformBuffer$1 = {
   extend: extend
 };
 
-export default vtkWebGPUUniformBuffer$1;
-export { extend, newInstance };
+export { vtkWebGPUUniformBuffer$1 as default, extend, newInstance };

package/Rendering/WebGPU/VertexInput.js

@@ -1,4 +1,4 @@
-import { obj, setGet, newInstance as newInstance$1 } from '../../macros.js';
+import { newInstance as newInstance$1, obj, setGet } from '../../macros.js';
 import vtkWebGPUTypes from './Types.js';
 
 function arraysEqual(a, b) {
@@ -201,5 +201,4 @@ var vtkWebGPUVertexInput$1 = {
   extend: extend
 };
 
-export default vtkWebGPUVertexInput$1;
-export { extend, newInstance };
+export { vtkWebGPUVertexInput$1 as default, extend, newInstance };

package/Rendering/WebGPU/ViewNodeFactory.js

@@ -36,5 +36,4 @@ var vtkWebGPUViewNodeFactory$1 = {
   extend: extend
 };
 
-export default vtkWebGPUViewNodeFactory$1;
-export { extend, newInstance, registerOverride };
+export { vtkWebGPUViewNodeFactory$1 as default, extend, newInstance, registerOverride };

package/Rendering/WebGPU/Volume.js

@@ -132,5 +132,4 @@ var index = {
 
 registerOverride('vtkVolume', newInstance);
 
-export default index;
-export { extend, newInstance };
+export { index as default, extend, newInstance };

package/Rendering/WebGPU/VolumePass.js

@@ -30,7 +30,7 @@ var BufferUsage = vtkWebGPUBufferManager.BufferUsage,
 //
 
 var cubeFaceTriangles = [[0, 4, 6], [0, 6, 2], [1, 3, 7], [1, 7, 5], [0, 5, 4], [0, 1, 5], [2, 6, 7], [2, 7, 3], [0, 3, 1], [0, 2, 3], [4, 5, 7], [4, 7, 6]];
-var DepthBoundsFS = "\n//VTK::Renderer::Dec\n\n//VTK::Select::Dec\n\n//VTK::VolumePass::Dec\n\n//VTK::TCoord::Dec\n\n//VTK::RenderEncoder::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::IOStructs::Dec\n\n[[stage(fragment)]]\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output : fragmentOutput;\n\n  //VTK::Select::Impl\n\n  //VTK::TCoord::Impl\n\n  //VTK::VolumePass::Impl\n\n  // use the minimum (closest) of the current value and the zbuffer\n  // the blend func will then take the max to find the farthest stop value\n  var stopval: f32 = min(input.fragPos.z, textureLoad(opaquePassDepthTexture, vec2<i32>(i32(input.fragPos.x), i32(input.fragPos.y)), 0).r);\n\n  //VTK::RenderEncoder::Impl\n  return output;\n}\n";
+var DepthBoundsFS = "\n//VTK::Renderer::Dec\n\n//VTK::Select::Dec\n\n//VTK::VolumePass::Dec\n\n//VTK::TCoord::Dec\n\n//VTK::RenderEncoder::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::IOStructs::Dec\n\n[[stage(fragment)]]\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output : fragmentOutput;\n\n  //VTK::Select::Impl\n\n  //VTK::TCoord::Impl\n\n  //VTK::VolumePass::Impl\n\n  // use the minimum (closest) of the current value and the zbuffer\n  // the blend func will then take the max to find the farthest stop value\n  var stopval: f32 = min(input.fragPos.z, textureLoad(opaquePassDepthTexture, vec2<i32>(i32(input.fragPos.x), i32(input.fragPos.y)), 0));\n\n  //VTK::RenderEncoder::Impl\n  return output;\n}\n";
 /* eslint-disable no-undef */
 
 /* eslint-disable no-bitwise */
@@ -367,5 +367,4 @@ var vtkWebGPUVolumePass$1 = {
   extend: extend
 };
 
-export default vtkWebGPUVolumePass$1;
-export { extend, newInstance };
+export { vtkWebGPUVolumePass$1 as default, extend, newInstance };

package/Rendering/WebGPU/VolumePassFSQ.js

@@ -8,7 +8,7 @@ import vtkWebGPUSampler from './Sampler.js';
 import { BlendMode } from '../Core/VolumeMapper/Constants.js';
 import { i as identity, t as translate, j as transpose, g as invert, m as multiply, s as scale } from '../../vendor/gl-matrix/esm/mat4.js';
 
-var volFragTemplate = "\n//VTK::Renderer::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::TCoord::Dec\n\n//VTK::RenderEncoder::Dec\n\n//VTK::IOStructs::Dec\n\n// dummy for now till they support 3d textures\nfn getTextureValue(vTex: texture_3d<f32>, tpos: vec4<f32>, vNum: i32) -> f32\n{\n  return textureSampleLevel(vTex, clampSampler, tpos.xyz, 0.0).a;\n  // 512.0 * f32(vNum) + 20.0 * trunc(10.0 * tpos.z);\n}\n\nfn getGradient(vTex: texture_3d<f32>, tpos: vec4<f32>, vNum: i32, scalar: f32) -> vec4<f32>\n{\n  var result: vec4<f32>;\n\n  var tstep: vec4<f32> = volumeSSBO.values[vNum].tstep;\n  result.x = getTextureValue(vTex, tpos + vec4<f32>(tstep.x, 0.0, 0.0, 1.0), vNum) - scalar;\n  result.y = getTextureValue(vTex, tpos + vec4<f32>(0.0, tstep.y, 0.0, 1.0), vNum) - scalar;\n  result.z = getTextureValue(vTex, tpos + vec4<f32>(0.0, 0.0, tstep.z, 1.0), vNum) - scalar;\n\n  // divide by spacing\n  result = result / volumeSSBO.values[vNum].spacing;\n\n  var grad: f32 = length(result.xyz);\n\n  // // rotate to View Coords\n  // result.xyz =\n  //   result.x * vPlaneNormal0 +\n  //   result.y * vPlaneNormal2 +\n  //   result.z * vPlaneNormal4;\n\n  if (grad > 0.0)\n  {\n    result = result * (1.0 / grad);\n  }\n\n  result.w = grad;\n\n  return result;\n}\n\nfn processVolume(vTex: texture_3d<f32>, vNum: i32, cNum: i32, posSC: vec4<f32>, tfunRows: f32) -> vec4<f32>\n{\n  var outColor: vec4<f32> = vec4<f32>(0.0, 0.0, 0.0, 0.0);\n\n  // convert to tcoords and reject if outside the volume\n  var tpos: vec4<f32> = volumeSSBO.values[vNum].SCTCMatrix*posSC;\n  // var tpos: vec4<f32> = posSC*0.003;\n  if (tpos.x < 0.0 || tpos.y < 0.0 || tpos.z < 0.0 ||\n      tpos.x > 1.0 || tpos.y > 1.0 || tpos.z > 1.0) { return outColor; }\n\n  var scalar: f32 = getTextureValue(vTex, tpos, vNum);\n\n  var coord: vec2<f32> =\n    vec2<f32>(scalar * componentSSBO.values[cNum].cScale + componentSSBO.values[cNum].cShift,\n      (0.5 + 2.0 * f32(vNum)) / tfunRows);\n  var color: vec4<f32> = textureSampleLevel(tfunTexture, clampSampler, coord, 0.0);\n  coord.x = scalar * componentSSBO.values[cNum].oScale + componentSSBO.values[cNum].oShift;\n\n  var gofactor: f32 = 1.0;\n  if (componentSSBO.values[cNum].gomin <  1.0)\n  {\n    var normal: vec4<f32> = getGradient(vTex, tpos, vNum, scalar);\n    gofactor = clamp(normal.a*componentSSBO.values[cNum].goScale + componentSSBO.values[cNum].goShift,\n      componentSSBO.values[cNum].gomin, componentSSBO.values[cNum].gomax);\n  }\n  var opacity: f32 = gofactor*textureSampleLevel(ofunTexture, clampSampler, coord, 0.0).r;\n  outColor = vec4<f32>(color.rgb, opacity);\n\n  //VTK::Volume::Process\n\n  return outColor;\n}\n\nfn composite(rayLengthSC: f32, minPosSC: vec4<f32>, rayStepSC: vec4<f32>) -> vec4<f32>\n{\n  // initial ray position is at the beginning\n  var rayPosSC: vec4<f32> = minPosSC;\n\n  // how many rows (tfuns) do we have in our tfunTexture\n  var tfunRows: f32 = f32(textureDimensions(tfunTexture).y);\n\n  var curDist: f32 = 0.0;\n  var computedColor: vec4<f32> = vec4<f32>(0.0, 0.0, 0.0, 0.0);\n  var sampleColor: vec4<f32>;\n  loop\n  {\n    // for each volume, sample and accumulate color\n\n//VTK::Volume::Calls\n\n    // increment position\n    curDist = curDist + mapperUBO.SampleDistance;\n    rayPosSC = rayPosSC + rayStepSC;\n\n    // check if we have reached a terminating condition\n    if (curDist > rayLengthSC) { break; }\n    if (computedColor.a > 0.98) { break; }\n  }\n  return computedColor;\n}\n\n[[stage(fragment)]]\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output: fragmentOutput;\n\n  var rayMax: f32 = textureSampleLevel(maxTexture, clampSampler, input.tcoordVS, 0.0).r;\n  var rayMin: f32 = textureSampleLevel(minTexture, clampSampler, input.tcoordVS, 0.0).r;\n\n  // discard empty rays\n  if (rayMax <= rayMin) { discard; }\n  else\n  {\n    var winDimsI32: vec2<i32> = textureDimensions(minTexture);\n    var winDims: vec2<f32> = vec2<f32>(f32(winDimsI32.x), f32(winDimsI32.y));\n\n    // compute start and end ray positions in view coordinates\n    var minPosSC: vec4<f32> = rendererUBO.PCSCMatrix*vec4<f32>(2.0*input.fragPos.x/winDims.x - 1.0, 1.0 - 2.0 * input.fragPos.y/winDims.y, rayMin, 1.0);\n    minPosSC = minPosSC * (1.0 / minPosSC.w);\n    var maxPosSC: vec4<f32> = rendererUBO.PCSCMatrix*vec4<f32>(2.0*input.fragPos.x/winDims.x - 1.0, 1.0 - 2.0 * input.fragPos.y/winDims.y, rayMax, 1.0);\n    maxPosSC = maxPosSC * (1.0 / maxPosSC.w);\n\n    var rayLengthSC: f32 = distance(minPosSC.xyz, maxPosSC.xyz);\n    var rayStepSC: vec4<f32> = (maxPosSC - minPosSC)*(mapperUBO.SampleDistance/rayLengthSC);\n    rayStepSC.w = 0.0;\n\n    //VTK::Volume::Loop\n\n    // var computedColor: vec4<f32> = vec4<f32>(rayMin, rayMax, 0.0, min(100.0*(rayMax - rayMin), 1.0));\n    // computedColor = vec4<f32>(rayLengthSC / 500.0, 1.0, 0.0, 1.0);\n    // computedColor = vec4<f32>(maxPosSC.xyz*0.01, 1.0);\n\n    //VTK::RenderEncoder::Impl\n  }\n\n  return output;\n}\n";
+var volFragTemplate = "\n//VTK::Renderer::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::TCoord::Dec\n\n//VTK::Volume::Dec\n\n//VTK::RenderEncoder::Dec\n\n//VTK::IOStructs::Dec\n\nfn getTextureValue(vTex: texture_3d<f32>, tpos: vec4<f32>, vNum: i32) -> f32\n{\n  // todo multicomponent support\n  return textureSampleLevel(vTex, clampSampler, tpos.xyz, 0.0).r;\n}\n\nfn getGradient(vTex: texture_3d<f32>, tpos: vec4<f32>, vNum: i32, scalar: f32) -> vec4<f32>\n{\n  var result: vec4<f32>;\n\n  var tstep: vec4<f32> = volumeSSBO.values[vNum].tstep;\n  result.x = getTextureValue(vTex, tpos + vec4<f32>(tstep.x, 0.0, 0.0, 1.0), vNum) - scalar;\n  result.y = getTextureValue(vTex, tpos + vec4<f32>(0.0, tstep.y, 0.0, 1.0), vNum) - scalar;\n  result.z = getTextureValue(vTex, tpos + vec4<f32>(0.0, 0.0, tstep.z, 1.0), vNum) - scalar;\n\n  // divide by spacing\n  result = result / volumeSSBO.values[vNum].spacing;\n\n  var grad: f32 = length(result.xyz);\n\n  // // rotate to View Coords, needed for lighting and shading\n  // result.xyz =\n  //   result.x * vPlaneNormal0 +\n  //   result.y * vPlaneNormal2 +\n  //   result.z * vPlaneNormal4;\n\n  if (grad > 0.0)\n  {\n    result = result * (1.0 / grad);\n  }\n\n  result.w = grad;\n\n  return result;\n}\n\nfn processVolume(vTex: texture_3d<f32>, vNum: i32, cNum: i32, posSC: vec4<f32>, tfunRows: f32) -> vec4<f32>\n{\n  var outColor: vec4<f32> = vec4<f32>(0.0, 0.0, 0.0, 0.0);\n\n  // convert to tcoords and reject if outside the volume\n  var tpos: vec4<f32> = volumeSSBO.values[vNum].SCTCMatrix*posSC;\n  if (tpos.x < 0.0 || tpos.y < 0.0 || tpos.z < 0.0 ||\n      tpos.x > 1.0 || tpos.y > 1.0 || tpos.z > 1.0) { return outColor; }\n\n  var scalar: f32 = getTextureValue(vTex, tpos, vNum);\n\n  var coord: vec2<f32> =\n    vec2<f32>(scalar * componentSSBO.values[cNum].cScale + componentSSBO.values[cNum].cShift,\n      (0.5 + 2.0 * f32(vNum)) / tfunRows);\n  var color: vec4<f32> = textureSampleLevel(tfunTexture, clampSampler, coord, 0.0);\n\n  var gofactor: f32 = 1.0;\n  if (componentSSBO.values[cNum].gomin <  1.0)\n  {\n    var normal: vec4<f32> = getGradient(vTex, tpos, vNum, scalar);\n    gofactor = clamp(normal.a*componentSSBO.values[cNum].goScale + componentSSBO.values[cNum].goShift,\n      componentSSBO.values[cNum].gomin, componentSSBO.values[cNum].gomax);\n  }\n\n  // since float32 is unfilterable we have to manually interpolate\n  var oPos : f32 = rowLength * (scalar * componentSSBO.values[cNum].oScale + componentSSBO.values[cNum].oShift);\n  var opacity: f32 = textureLoad(ofunTexture, vec2<i32>(i32(oPos), 2*vNum), 0).r;\n  var opacityHigh: f32 = textureLoad(ofunTexture, vec2<i32>(i32(oPos) + 1, 2*vNum), 0).r;\n  oPos = oPos - floor(oPos);\n  opacity = opacityHigh*oPos + opacity*(1.0 - oPos);\n\n  outColor = vec4<f32>(color.rgb, gofactor * opacity);\n\n  //VTK::Volume::Process\n\n  return outColor;\n}\n\nfn composite(rayLengthSC: f32, minPosSC: vec4<f32>, rayStepSC: vec4<f32>) -> vec4<f32>\n{\n  // initial ray position is at the beginning\n  var rayPosSC: vec4<f32> = minPosSC;\n\n  // how many rows (tfuns) do we have in our tfunTexture\n  var tfunRows: f32 = f32(textureDimensions(tfunTexture).y);\n\n  var curDist: f32 = 0.0;\n  var computedColor: vec4<f32> = vec4<f32>(0.0, 0.0, 0.0, 0.0);\n  var sampleColor: vec4<f32>;\n  loop\n  {\n    // for each volume, sample and accumulate color\n\n//VTK::Volume::Calls\n\n    // increment position\n    curDist = curDist + mapperUBO.SampleDistance;\n    rayPosSC = rayPosSC + rayStepSC;\n\n    // check if we have reached a terminating condition\n    if (curDist > rayLengthSC) { break; }\n    if (computedColor.a > 0.98) { break; }\n  }\n  return computedColor;\n}\n\n[[stage(fragment)]]\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output: fragmentOutput;\n\n  var rayMax: f32 = textureSampleLevel(maxTexture, clampSampler, input.tcoordVS, 0.0).r;\n  var rayMin: f32 = textureSampleLevel(minTexture, clampSampler, input.tcoordVS, 0.0).r;\n\n  // discard empty rays\n  if (rayMax <= rayMin) { discard; }\n  else\n  {\n    var winDimsI32: vec2<i32> = textureDimensions(minTexture);\n    var winDims: vec2<f32> = vec2<f32>(f32(winDimsI32.x), f32(winDimsI32.y));\n\n    // compute start and end ray positions in view coordinates\n    var minPosSC: vec4<f32> = rendererUBO.PCSCMatrix*vec4<f32>(2.0*input.fragPos.x/winDims.x - 1.0, 1.0 - 2.0 * input.fragPos.y/winDims.y, rayMin, 1.0);\n    minPosSC = minPosSC * (1.0 / minPosSC.w);\n    var maxPosSC: vec4<f32> = rendererUBO.PCSCMatrix*vec4<f32>(2.0*input.fragPos.x/winDims.x - 1.0, 1.0 - 2.0 * input.fragPos.y/winDims.y, rayMax, 1.0);\n    maxPosSC = maxPosSC * (1.0 / maxPosSC.w);\n\n    var rayLengthSC: f32 = distance(minPosSC.xyz, maxPosSC.xyz);\n    var rayStepSC: vec4<f32> = (maxPosSC - minPosSC)*(mapperUBO.SampleDistance/rayLengthSC);\n    rayStepSC.w = 0.0;\n\n    //VTK::Volume::Loop\n\n    // var computedColor: vec4<f32> = vec4<f32>(rayMin, rayMax, 0.0, min(100.0*(rayMax - rayMin), 1.0));\n    // computedColor = vec4<f32>(rayLengthSC / 500.0, 1.0, 0.0, 1.0);\n    // computedColor = vec4<f32>(maxPosSC.xyz*0.01, 1.0);\n\n    //VTK::RenderEncoder::Impl\n  }\n\n  return output;\n}\n";
 var tmpMat4 = new Float64Array(16);
 var tmp2Mat4 = new Float64Array(16); // ----------------------------------------------------------------------------
 // vtkWebGPUVolumePassFSQ methods
@@ -47,6 +47,7 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
       code = vtkWebGPUShaderCache.substitute(code, '//VTK::Volume::Loop', ['var computedColor: vec4<f32> = composite(rayLengthSC, minPosSC, rayStepSC);']).result;
     }
 
+    code = vtkWebGPUShaderCache.substitute(code, '//VTK::Volume::Dec', ["let rowLength: f32 = ".concat(model.rowLength, ".0;")]).result;
     fDesc.setCode(code);
   };
 
@@ -441,7 +442,7 @@ function vtkWebGPUVolumePassFSQ(publicAPI, model) {
       model.clampSampler.setName('clampSampler');
       model.clampSampler.create(device, {
         minFilter: 'linear',
-        maxFilter: 'linear'
+        magFilter: 'linear'
       });
     }
 
@@ -494,5 +495,4 @@ var vtkWebGPUVolumePassFSQ$1 = {
   extend: extend
 };
 
-export default vtkWebGPUVolumePassFSQ$1;
-export { extend, newInstance };
+export { vtkWebGPUVolumePassFSQ$1 as default, extend, newInstance };

package/Rendering/WebGPU.js

@@ -4,4 +4,4 @@ var WebGPU = {
   vtkRenderWindow: vtkRenderWindow
 };
 
-export default WebGPU;
+export { WebGPU as default };

package/Rendering/index.js

@@ -12,4 +12,4 @@ var Rendering = {
   WebGPU: WebGPU
 };
 
-export default Rendering;
+export { Rendering as default };

package/ThirdParty/index.js

@@ -1,8 +1,8 @@
-import { l as lib } from '../vendor/jszip/lib/index.js';
+import { J as JSZip } from '../vendor/jszip/dist/jszip.min.js';
 import { p as pako } from '../vendor/pako/dist/pako.esm.mjs';
 
 var ThirdParty = {
-  JSZip: lib,
+  JSZip: JSZip,
   pako: pako
 };
 

package/Utilities/DataGenerator/convert-cli.js

@@ -15,6 +15,8 @@ program.version('1.0.0')
   .option('--sample-data [path]', 'Convert sample data from ParaViewData\n')
   .parse(process.argv);
 
+const options = program.opts();
+
 // ----------------------------------------------------------------------------
 // Need argument otherwise print help/usage
 // ----------------------------------------------------------------------------
@@ -31,7 +33,7 @@ const pvPossibleBasePath = [];
 
 if(!paraview) {
     paraview = [];
-    [program.paraview].concat(pvPossibleBasePath).forEach(function(directory){
+    [options.paraview].concat(pvPossibleBasePath).forEach(function(directory){
         try {
             if(fs.statSync(directory).isDirectory()) {
                 paraview.push(directory);
@@ -42,7 +44,7 @@ if(!paraview) {
     });
 }
 
-if (!process.argv.slice(2).length || !program.help || paraview.length === 0) {
+if (!process.argv.slice(2).length || !options.help || paraview.length === 0) {
   program.outputHelp();
   process.exit(0);
 }
@@ -51,12 +53,12 @@ var pvPythonExecs = shell.find(paraview).filter(function(file) { return file.mat
 if(pvPythonExecs.length < 1) {
     console.log('Could not find pvpython in your ParaView HOME directory ($PARAVIEW_HOME)');
     program.outputHelp();
-} else if (program.sampleData) {
+} else if (options.sampleData) {
   console.log('Extract sample datasets');
   const cmdLineSample = [
     pvPythonExecs[0], '-dr',
     path.normalize(path.join(__dirname, 'vtk-data-converter.py')),
-    '--sample-data', program.sampleData,
+    '--sample-data', options.sampleData,
     '--output', path.normalize(path.join(__dirname, '../../Data')),,
   ];
   console.log('\n===============================================================================');
@@ -68,15 +70,15 @@ if(pvPythonExecs.length < 1) {
     const cmdLine = [
         pvPythonExecs[0], '-dr',
         path.normalize(path.join(__dirname, 'vtk-data-converter.py')),
-        '--input', program.input,
-        '--output', program.output,
+        '--input', options.input,
+        '--output', options.output,
     ];
 
-    if (program.extractSurface) {
+    if (options.extractSurface) {
       cmdLine.push('--extract-surface');
     }
 
-    if (program.merge) {
+    if (options.merge) {
       cmdLine.push('--merge');
     }
 

package/Utilities/ExampleRunner/example-runner-cli.js

@@ -17,7 +17,8 @@ program
   .option('--no-browser', 'Do not open the browser')
   .parse(process.argv);
 
-var configFilePath = path.join(process.cwd(), program.config.replace(/\//g, path.sep));
+const options = program.opts();
+var configFilePath = path.join(process.cwd(), options.config.replace(/\//g, path.sep));
 var configuration = require(configFilePath);
 
 function getSplitedPath(filePath) {