@kitware/vtk.js 25.2.2 → 25.2.3

package/Rendering/WebGPU/CellArrayMapper.js

@@ -239,7 +239,7 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       '  var fresnel: f32 = schlickFresnelIOR(V, normal, ior, k); // Fresnel', '  fresnel = min(1, fresnel);', '  // This could be controlled with its own variable (that isnt base color) for better artistic control', '  var fresnelMetallic: vec3<f32> = schlickFresnelRGB(V, normal, baseColor); // Fresnel for metal, takes color into account', '  var kS: vec3<f32> = mix(vec3<f32>(fresnel), fresnelMetallic, metallic);', '  kS = min(vec3<f32>(1), kS);', '  var kD: vec3<f32> = (1.0 - kS) * (1.0 - metallic);', '  var PBR: vec3<f32> = mapperUBO.DiffuseIntensity*kD*diffuse + kS*specular;', '  PBR += emission;', '  computedColor = vec4<f32>(PBR, mapperUBO.Opacity);']).result;
       fDesc.setCode(code); // If theres no normals, just set the specular color to be flat
     } else {
-      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Light::Impl', ['  var diffuse: vec3<f32> = diffuseColor.rgb;', '  var specular: vec3<f32> = mapperUBO.SpecularColor.rgb * mapperUBO.SpecularColor.a;', '  computedColor = vec4<f32>(diffuse, mapperUBO.Opacity);']).result;
+      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Light::Impl', ['  var diffuse: vec3<f32> = diffuseColor.rgb;', '  var specular: vec3<f32> = mapperUBO.SpecularColor.rgb * mapperUBO.SpecularColor.a;', '  computedColor = vec4<f32>(diffuse * _diffuseMap.rgb, mapperUBO.Opacity);']).result;
       fDesc.setCode(code);
     }
   };
@@ -290,7 +290,6 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
     code = vtkWebGPUShaderCache.substitute(code, '//VTK::TCoord::Impl', ['  output.tcoordVS = tcoord;' // Ensure that UV coordinates are always between 0-1
     ]).result;
     vDesc.setCode(code);
-    if (model.is2D) return;
     var fDesc = pipeline.getShaderDescription('fragment');
     code = fDesc.getCode();
     var actor = model.WebGPUActor.getRenderable();
@@ -605,36 +604,41 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       textures.push(_pair);
     }
 
-    if ((_actor$getProperty$ge15 = (_actor$getProperty9 = actor.getProperty()).getRoughnessTexture) !== null && _actor$getProperty$ge15 !== void 0 && _actor$getProperty$ge15.call(_actor$getProperty9)) {
-      var _pair2 = ['Roughness', actor.getProperty().getRoughnessTexture()];
+    if (model.colorTexture) {
+      var _pair2 = ['Diffuse', model.colorTexture];
       textures.push(_pair2);
     }
 
-    if ((_actor$getProperty$ge16 = (_actor$getProperty10 = actor.getProperty()).getMetallicTexture) !== null && _actor$getProperty$ge16 !== void 0 && _actor$getProperty$ge16.call(_actor$getProperty10)) {
-      var _pair3 = ['Metallic', actor.getProperty().getMetallicTexture()];
+    if ((_actor$getProperty$ge15 = (_actor$getProperty9 = actor.getProperty()).getRoughnessTexture) !== null && _actor$getProperty$ge15 !== void 0 && _actor$getProperty$ge15.call(_actor$getProperty9)) {
+      var _pair3 = ['Roughness', actor.getProperty().getRoughnessTexture()];
       textures.push(_pair3);
     }
 
-    if ((_actor$getProperty$ge17 = (_actor$getProperty11 = actor.getProperty()).getNormalTexture) !== null && _actor$getProperty$ge17 !== void 0 && _actor$getProperty$ge17.call(_actor$getProperty11)) {
-      var _pair4 = ['Normal', actor.getProperty().getNormalTexture()];
+    if ((_actor$getProperty$ge16 = (_actor$getProperty10 = actor.getProperty()).getMetallicTexture) !== null && _actor$getProperty$ge16 !== void 0 && _actor$getProperty$ge16.call(_actor$getProperty10)) {
+      var _pair4 = ['Metallic', actor.getProperty().getMetallicTexture()];
       textures.push(_pair4);
     }
 
-    if ((_actor$getProperty$ge18 = (_actor$getProperty12 = actor.getProperty()).getAmbientOcclusionTexture) !== null && _actor$getProperty$ge18 !== void 0 && _actor$getProperty$ge18.call(_actor$getProperty12)) {
-      var _pair5 = ['AmbientOcclusion', actor.getProperty().getAmbientOcclusionTexture()];
+    if ((_actor$getProperty$ge17 = (_actor$getProperty11 = actor.getProperty()).getNormalTexture) !== null && _actor$getProperty$ge17 !== void 0 && _actor$getProperty$ge17.call(_actor$getProperty11)) {
+      var _pair5 = ['Normal', actor.getProperty().getNormalTexture()];
       textures.push(_pair5);
     }
 
-    if ((_actor$getProperty$ge19 = (_actor$getProperty13 = actor.getProperty()).getEmissionTexture) !== null && _actor$getProperty$ge19 !== void 0 && _actor$getProperty$ge19.call(_actor$getProperty13)) {
-      var _pair6 = ['Emission', actor.getProperty().getEmissionTexture()];
+    if ((_actor$getProperty$ge18 = (_actor$getProperty12 = actor.getProperty()).getAmbientOcclusionTexture) !== null && _actor$getProperty$ge18 !== void 0 && _actor$getProperty$ge18.call(_actor$getProperty12)) {
+      var _pair6 = ['AmbientOcclusion', actor.getProperty().getAmbientOcclusionTexture()];
       textures.push(_pair6);
     }
 
-    if ((_renderer$getBackgrou = renderer.getBackgroundTexture) !== null && _renderer$getBackgrou !== void 0 && _renderer$getBackgrou.call(renderer)) {
-      var _pair7 = ['Background', renderer.getBackgroundTexture()];
+    if ((_actor$getProperty$ge19 = (_actor$getProperty13 = actor.getProperty()).getEmissionTexture) !== null && _actor$getProperty$ge19 !== void 0 && _actor$getProperty$ge19.call(_actor$getProperty13)) {
+      var _pair7 = ['Emission', actor.getProperty().getEmissionTexture()];
       textures.push(_pair7);
     }
 
+    if ((_renderer$getBackgrou = renderer.getBackgroundTexture) !== null && _renderer$getBackgrou !== void 0 && _renderer$getBackgrou.call(renderer)) {
+      var _pair8 = ['Background', renderer.getBackgroundTexture()];
+      textures.push(_pair8);
+    }
+
     for (var i = 0; i < textures.length; i++) {
       if (textures[i][1].getInputData() || textures[i][1].getJsImageData() || textures[i][1].getCanvas()) {
         newTextures.push(textures[i]);

package/package.json

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