@kitware/vtk.js 19.2.10 → 19.3.0

package/Rendering/WebGPU/RenderWindow.js

@@ -6,7 +6,6 @@ import vtkForwardPass from './ForwardPass.js';
 import vtkWebGPUBuffer from './Buffer.js';
 import vtkWebGPUDevice from './Device.js';
 import vtkWebGPUHardwareSelector from './HardwareSelector.js';
-import vtkWebGPUSwapChain from './SwapChain.js';
 import vtkWebGPUViewNodeFactory from './ViewNodeFactory.js';
 import vtkRenderPass from '../SceneGraph/RenderPass.js';
 import vtkRenderWindowViewNode from '../SceneGraph/RenderWindowViewNode.js';
@@ -66,12 +65,23 @@ function vtkWebGPURenderWindow(publicAPI, model) {
   publicAPI.onModified(updateWindow);
 
   publicAPI.recreateSwapChain = function () {
-    model.swapChain.releaseGraphicsResources();
+    if (model.context) {
+      var presentationFormat = model.context.getPreferredFormat(model.adapter);
+      /* eslint-disable no-undef */
 
-    if (!model.swapChain.getCreated()) {
-      model.swapChain.create(model.device, publicAPI); // model.commandBufferIndexes.clear();
-      // model.commandBufferIndexes.resize(this->Swapchain->GetMaximumFramesInFlight(), -1);
+      /* eslint-disable no-bitwise */
+
+      model.context.configure({
+        device: model.device.getHandle(),
+        format: presentationFormat,
+        usage: GPUTextureUsage.RENDER_ATTACHMENT | GPUTextureUsage.COPY_DST,
+        size: model.size
+      });
     }
+  };
+
+  publicAPI.getCurrentTexture = function () {
+    return model.context.getCurrentTexture();
   }; // Builds myself.
 
 
@@ -86,8 +96,8 @@ function vtkWebGPURenderWindow(publicAPI, model) {
       publicAPI.removeUnusedNodes();
       publicAPI.initialize();
     } else if (model.initialized) {
-      if (!model.swapChain.getCreated()) {
-        model.swapChain.create(model.device, publicAPI);
+      if (!model.context.validConfiguration) {
+        publicAPI.recreateSwapChain();
       }
 
       model.commandEncoder = model.device.createCommandEncoder();
@@ -197,7 +207,11 @@ function vtkWebGPURenderWindow(publicAPI, model) {
 
             _context.t0.initialize.call(_context.t0, _context.t1);
 
-            model.context = model.canvas.getContext('gpupresent');
+            // model.device.getHandle().lost.then((info) => {
+            //   console.log(`${info.message}`);
+            //   publicAPI.releaseGraphicsResources();
+            // });
+            model.context = model.canvas.getContext('webgpu');
 
           case 10:
           case "end":
@@ -207,10 +221,15 @@ function vtkWebGPURenderWindow(publicAPI, model) {
     }, _callee);
   }));
 
-  publicAPI.restoreContext = function () {
+  publicAPI.releaseGraphicsResources = function () {
     var rp = vtkRenderPass.newInstance();
     rp.setCurrentOperation('Release');
     rp.traverse(publicAPI, null);
+    model.adapter = null;
+    model.device = null;
+    model.context = null;
+    model.initialized = false;
+    model.initializing = false;
   };
 
   publicAPI.setBackgroundImage = function (img) {
@@ -556,7 +575,6 @@ var DEFAULT_VALUES = {
   adapter: null,
   device: null,
   canvas: null,
-  swapChain: null,
   cursorVisibility: true,
   cursor: 'pointer',
   containerSize: null,
@@ -581,8 +599,7 @@ function extend(publicAPI, model) {
   model.bgImage.style.top = '0';
   model.bgImage.style.width = '100%';
   model.bgImage.style.height = '100%';
-  model.bgImage.style.zIndex = '-1';
-  model.swapChain = vtkWebGPUSwapChain.newInstance(); // Inheritance
+  model.bgImage.style.zIndex = '-1'; // Inheritance
 
   vtkRenderWindowViewNode.extend(publicAPI, model, initialValues);
   model.myFactory = vtkWebGPUViewNodeFactory.newInstance();
@@ -602,7 +619,7 @@ function extend(publicAPI, model) {
   macro.event(publicAPI, model, 'imageReady');
   macro.event(publicAPI, model, 'initialized'); // Build VTK API
 
-  macro.get(publicAPI, model, ['swapChain', 'commandEncoder', 'device', 'useBackgroundImage']);
+  macro.get(publicAPI, model, ['commandEncoder', 'device', 'useBackgroundImage']);
   macro.setGet(publicAPI, model, ['initialized', 'context', 'canvas', 'device', 'renderPasses', 'notifyStartCaptureImage', 'cursor', 'useOffScreen']);
   macro.setGetArray(publicAPI, model, ['size'], 2); // Object methods
 
@@ -620,5 +637,4 @@ var vtkRenderWindow = {
   extend: extend
 };
 
-export default vtkRenderWindow;
-export { extend, newInstance };
+export { vtkRenderWindow as default, extend, newInstance };

package/Rendering/WebGPU/Renderer.js

@@ -1,11 +1,11 @@
-import { obj, get, getArray, setGet, newInstance as newInstance$1, vtkDebugMacro as vtkDebugMacro$1 } from '../../macros.js';
+import { newInstance as newInstance$1, obj, get, getArray, setGet, vtkDebugMacro as vtkDebugMacro$1 } from '../../macros.js';
 import vtkViewNode from '../SceneGraph/ViewNode.js';
 import vtkWebGPUBindGroup from './BindGroup.js';
 import vtkWebGPUFullScreenQuad from './FullScreenQuad.js';
 import vtkWebGPUUniformBuffer from './UniformBuffer.js';
 import { registerOverride } from './ViewNodeFactory.js';
 import { i as identity } from '../../vendor/gl-matrix/esm/mat4.js';
-import { b as scale, i as add, q as sub, r as len } from '../../vendor/gl-matrix/esm/vec3.js';
+import { b as scale, j as add, q as sub, r as len } from '../../vendor/gl-matrix/esm/vec3.js';
 
 var vtkDebugMacro = vtkDebugMacro$1;
 var clearFragTemplate = "\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[[stage(fragment)]]\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output: fragmentOutput;\n\n  var computedColor: vec4<f32> = mapperUBO.BackgroundColor;\n\n  //VTK::RenderEncoder::Impl\n  return output;\n}\n"; // ----------------------------------------------------------------------------
@@ -369,5 +369,4 @@ var index = {
 
 registerOverride('vtkRenderer', newInstance);
 
-export default index;
-export { extend, newInstance };
+export { index as default, extend, newInstance };

package/Rendering/WebGPU/Sampler.js

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

package/Rendering/WebGPU/ShaderCache.js

@@ -88,5 +88,4 @@ var vtkWebGPUShaderCache$1 = {
   substitute: substitute
 };
 
-export default vtkWebGPUShaderCache$1;
-export { extend, newInstance };
+export { vtkWebGPUShaderCache$1 as default, extend, newInstance };

package/Rendering/WebGPU/ShaderDescription.js

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

package/Rendering/WebGPU/ShaderModule.js

@@ -46,4 +46,4 @@ var vtkWebGPUShaderModule$1 = {
   extend: extend
 };
 
-export default vtkWebGPUShaderModule$1;
+export { vtkWebGPUShaderModule$1 as default };

package/Rendering/WebGPU/SphereMapper.js

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

package/Rendering/WebGPU/StickMapper.js

@@ -27,7 +27,7 @@ var vtkErrorMacro = vtkErrorMacro$1; // Vertices
 // 4: 011
 // 5: 111
 
-var vtkWebGPUStickMapperVS = "\n//VTK::Renderer::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::Color::Dec\n\n//VTK::IOStructs::Dec\n\n[[stage(vertex)]]\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  let offsetsArray: array<vec3<f32>, 12> = array<vec3<f32>, 12>(\n    vec3<f32>(-1.0, -1.0, -1.0),\n    vec3<f32>(1.0, -1.0, -1.0),\n    vec3<f32>(1.0, -1.0, 1.0),\n\n    vec3<f32>(-1.0, -1.0, -1.0),\n    vec3<f32>(1.0, -1.0, 1.0),\n    vec3<f32>(-1.0, -1.0, 1.0),\n\n    vec3<f32>(-1.0, -1.0, 1.0),\n    vec3<f32>(1.0, -1.0, 1.0),\n    vec3<f32>(1.0, 1.0, 1.0),\n\n    vec3<f32>(-1.0, -1.0, 1.0),\n    vec3<f32>(1.0, 1.0, 1.0),\n    vec3<f32>(-1.0, 1.0, 1.0)\n  );\n\n  var output : vertexOutput;\n\n  var vertexVC: vec4<f32> = rendererUBO.SCVCMatrix * mapperUBO.BCSCMatrix * vec4<f32>(vertexBC.x, vertexBC.y, vertexBC.z, 1.0);\n\n  //VTK::Color::Impl\n\n  // compute the projected vertex position\n  output.centerVC = vertexVC.xyz;\n  output.radiusVC = radiusMC;\n  output.lengthVC = length(orientMC);\n  output.orientVC = (rendererUBO.WCVCNormals * vec4<f32>(normalize(orientMC), 0.0)).xyz;\n\n  // make sure it is pointing out of the screen\n  if (output.orientVC.z < 0.0)\n    {\n    output.orientVC = -output.orientVC;\n    }\n\n  // make the basis\n  var xbase: vec3<f32>;\n  var ybase: vec3<f32>;\n  var dir: vec3<f32> = vec3<f32>(0.0,0.0,1.0);\n  if (rendererUBO.cameraParallel == 0u)\n    {\n    dir = normalize(-vertexVC.xyz);\n    }\n  if (abs(dot(dir,output.orientVC)) == 1.0)\n    {\n    xbase = normalize(cross(vec3<f32>(0.0,1.0,0.0),output.orientVC));\n    ybase = cross(xbase,output.orientVC);\n    }\n  else\n    {\n    xbase = normalize(cross(output.orientVC,dir));\n    ybase = cross(output.orientVC,xbase);\n    }\n\n\n  var vertIdx: u32 = input.vertexIndex % 12u;\n  var offsets: vec3<f32> = offsetsArray[vertIdx];\n\n  vertexVC = vec4<f32>(vertexVC.xyz +\n    output.radiusVC * offsets.x * xbase +\n    output.radiusVC * offsets.y * ybase +\n    0.5 * output.lengthVC * offsets.z * output.orientVC, 1.0);\n\n  output.vertexVC = vertexVC;\n\n  //VTK::Position::Impl\n\n  return output;\n}\n"; // ----------------------------------------------------------------------------
+var vtkWebGPUStickMapperVS = "\n//VTK::Renderer::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::Color::Dec\n\n//VTK::IOStructs::Dec\n\n[[stage(vertex)]]\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var offsetsArray: array<vec3<f32>, 12> = array<vec3<f32>, 12>(\n    vec3<f32>(-1.0, -1.0, -1.0),\n    vec3<f32>(1.0, -1.0, -1.0),\n    vec3<f32>(1.0, -1.0, 1.0),\n\n    vec3<f32>(-1.0, -1.0, -1.0),\n    vec3<f32>(1.0, -1.0, 1.0),\n    vec3<f32>(-1.0, -1.0, 1.0),\n\n    vec3<f32>(-1.0, -1.0, 1.0),\n    vec3<f32>(1.0, -1.0, 1.0),\n    vec3<f32>(1.0, 1.0, 1.0),\n\n    vec3<f32>(-1.0, -1.0, 1.0),\n    vec3<f32>(1.0, 1.0, 1.0),\n    vec3<f32>(-1.0, 1.0, 1.0)\n  );\n\n  var output : vertexOutput;\n\n  var vertexVC: vec4<f32> = rendererUBO.SCVCMatrix * mapperUBO.BCSCMatrix * vec4<f32>(vertexBC.x, vertexBC.y, vertexBC.z, 1.0);\n\n  //VTK::Color::Impl\n\n  // compute the projected vertex position\n  output.centerVC = vertexVC.xyz;\n  output.radiusVC = radiusMC;\n  output.lengthVC = length(orientMC);\n  output.orientVC = (rendererUBO.WCVCNormals * vec4<f32>(normalize(orientMC), 0.0)).xyz;\n\n  // make sure it is pointing out of the screen\n  if (output.orientVC.z < 0.0)\n    {\n    output.orientVC = -output.orientVC;\n    }\n\n  // make the basis\n  var xbase: vec3<f32>;\n  var ybase: vec3<f32>;\n  var dir: vec3<f32> = vec3<f32>(0.0,0.0,1.0);\n  if (rendererUBO.cameraParallel == 0u)\n    {\n    dir = normalize(-vertexVC.xyz);\n    }\n  if (abs(dot(dir,output.orientVC)) == 1.0)\n    {\n    xbase = normalize(cross(vec3<f32>(0.0,1.0,0.0),output.orientVC));\n    ybase = cross(xbase,output.orientVC);\n    }\n  else\n    {\n    xbase = normalize(cross(output.orientVC,dir));\n    ybase = cross(output.orientVC,xbase);\n    }\n\n\n  var vertIdx: u32 = input.vertexIndex % 12u;\n  var offsets: vec3<f32> = offsetsArray[vertIdx];\n\n  vertexVC = vec4<f32>(vertexVC.xyz +\n    output.radiusVC * offsets.x * xbase +\n    output.radiusVC * offsets.y * ybase +\n    0.5 * output.lengthVC * offsets.z * output.orientVC, 1.0);\n\n  output.vertexVC = vertexVC;\n\n  //VTK::Position::Impl\n\n  return output;\n}\n"; // ----------------------------------------------------------------------------
 // vtkWebGPUStickMapper methods
 // ----------------------------------------------------------------------------
 
@@ -286,5 +286,4 @@ var index = {
 
 registerOverride('vtkStickMapper', newInstance);
 
-export default index;
-export { extend, newInstance };
+export { index as default, extend, newInstance };

package/Rendering/WebGPU/StorageBuffer.js

@@ -178,7 +178,7 @@ function vtkWebGPUStorageBuffer(publicAPI, model) {
       lines.push("  ".concat(entry.name, ": ").concat(entry.type, ";"));
     }
 
-    lines.push("\n};\n[[block]] struct ".concat(model.name, "Struct\n{\n  values: array<").concat(model.name, "StructEntry>;\n};\n[[binding(").concat(binding, "), group(").concat(group, ")]] var<storage> ").concat(model.name, ": [[access(read)]] ").concat(model.name, "Struct;\n"));
+    lines.push("\n};\n[[block]] struct ".concat(model.name, "Struct\n{\n  values: array<").concat(model.name, "StructEntry>;\n};\n[[binding(").concat(binding, "), group(").concat(group, ")]] var<storage, read> ").concat(model.name, ": ").concat(model.name, "Struct;\n"));
     return lines.join('\n');
   };
 
@@ -248,5 +248,4 @@ var vtkWebGPUStorageBuffer$1 = {
   extend: extend
 };
 
-export default vtkWebGPUStorageBuffer$1;
-export { extend, newInstance };
+export { vtkWebGPUStorageBuffer$1 as default, extend, newInstance };

package/Rendering/WebGPU/Texture.js

@@ -25,7 +25,7 @@ function vtkWebGPUTexture(publicAPI, model) {
 
     /* eslint-disable no-bitwise */
 
-    model.usage = options.usage ? options.usage : GPUTextureUsage.SAMPLED | GPUTextureUsage.COPY_DST;
+    model.usage = options.usage ? options.usage : GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST;
     /* eslint-enable no-undef */
 
     /* eslint-enable no-bitwise */
@@ -50,7 +50,7 @@ function vtkWebGPUTexture(publicAPI, model) {
 
     /* eslint-disable no-bitwise */
 
-    model.usage = options.usage ? options.usage : GPUTextureUsage.SAMPLED | GPUTextureUsage.COPY_DST;
+    model.usage = options.usage ? options.usage : GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST;
     /* eslint-enable no-undef */
 
     /* eslint-enable no-bitwise */
@@ -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 };