@kitware/vtk.js 25.1.3 → 25.2.2

package/Rendering/WebGPU/CellArrayMapper.js

@@ -18,7 +18,7 @@ var ScalarMode = vtkMapper.ScalarMode;
 var CoordinateSystem = vtkProp.CoordinateSystem;
 var DisplayLocation = vtkProperty2D.DisplayLocation;
 var vtkWebGPUPolyDataVS = "\n//VTK::Renderer::Dec\n\n//VTK::Color::Dec\n\n//VTK::Normal::Dec\n\n//VTK::TCoord::Dec\n\n//VTK::Select::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::IOStructs::Dec\n\n@vertex\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output : vertexOutput;\n\n  var vertex: vec4<f32> = vertexBC;\n\n  //VTK::Color::Impl\n\n  //VTK::Normal::Impl\n\n  //VTK::TCoord::Impl\n\n  //VTK::Select::Impl\n\n  //VTK::Position::Impl\n\n  return output;\n}\n";
-var vtkWebGPUPolyDataFS = "\n//VTK::Renderer::Dec\n\n//VTK::Color::Dec\n\n// optional surface normal declaration\n//VTK::Normal::Dec\n\n//VTK::TCoord::Dec\n\n//VTK::Select::Dec\n\n//VTK::RenderEncoder::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::IOStructs::Dec\n\n@fragment\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output : fragmentOutput;\n\n  var ambientColor: vec4<f32> = mapperUBO.AmbientColor;\n  var diffuseColor: vec4<f32> = mapperUBO.DiffuseColor;\n  var opacity: f32 = mapperUBO.Opacity;\n\n  //VTK::Color::Impl\n\n  //VTK::Normal::Impl\n\n  //VTK::Light::Impl\n\n  var computedColor: vec4<f32> = vec4<f32>(ambientColor.rgb * mapperUBO.AmbientIntensity\n     + diffuse * mapperUBO.DiffuseIntensity\n     + specular * mapperUBO.SpecularIntensity,\n     opacity);\n\n  //VTK::TCoord::Impl\n\n  //VTK::Select::Impl\n\n  if (computedColor.a == 0.0) { discard; };\n\n  //VTK::Position::Impl\n\n  //VTK::RenderEncoder::Impl\n  return output;\n}\n";
+var vtkWebGPUPolyDataFS = "\nstruct PBRData {\n  diffuse: vec3<f32>,\n  specular: vec3<f32>,\n}\n\n// Dot product with the max already in it\nfn mdot(a: vec3<f32>, b: vec3<f32>) -> f32 {\n  return max(0.0, dot(a, b));\n}\n\n// Lambertian diffuse model\nfn lambertDiffuse(base: vec3<f32>, N: vec3<f32>, L: vec3<f32>) -> vec3<f32> {\n  var pi: f32 = 3.14159265359; \n  var NdotL: f32 = mdot(N, L);\n  NdotL = pow(NdotL, 1.5);\n  return (base/pi)*NdotL;\n}\n\n// Yasuhiro Fujii improvement on the Oren-Nayar model\n// https://mimosa-pudica.net/improved-oren-nayar.html\n// p is surface color, o is roughness\nfn fujiiOrenNayar(p: vec3<f32>, o: f32, N: vec3<f32>, L: vec3<f32>, V: vec3<f32>) -> vec3<f32> {\n  var invpi: f32 = 0.31830988618; // 1/pi\n\n  var o2 = o*o;\n  var NdotL: f32 = mdot(N, L);\n  NdotL = pow(NdotL, 1.5); // Less physically accurate, but hides the \"seams\" between lights better\n\n  var NdotV: f32 = mdot(N, V);\n  var LdotV: f32 = mdot(L, V);\n\n  var s: f32 = LdotV - NdotL*NdotV;\n  var t: f32 = mix(1, max(NdotL, NdotV), step(0, s)); // Mix with step is the equivalent of an if statement\n  var A: vec3<f32> = 0.5*(o2 / (o2 + 0.33)) + 0.17*p*(o2 / (o2 + 0.13));\n  A = invpi*(1 - A);\n  var B: f32 = 0.45*(o2 / (o2 + 0.09));\n  B = invpi*B;\n\n  return p*NdotL*(A + B*(s/t));\n}\n\n// Fresnel portion of BRDF (IOR only, simplified)\nfn schlickFresnelIOR(V: vec3<f32>, N: vec3<f32>, ior: f32, k: f32) -> f32 {\n  var NdotV: f32 = mdot(V, N);\n  // var R0: f32 = pow((ior - 1.0) / (ior + 1.0), 2); // 1.0 is about the ior of air, and it is assumed that light will be traveling through air\n  var F0: f32 = (pow((ior - 1.0), 2) + k*k) / (pow((ior + 1.0), 2) + k*k); // This takes into account the roughness, whic the other one does not\n  return F0 + (1 - F0) * pow((1-NdotV), 5); \n}\n\n// Fresnel portion of BRDF (Color ior, better)\nfn schlickFresnelRGB(V: vec3<f32>, N: vec3<f32>, F0: vec3<f32>) -> vec3<f32> {\n  var NdotV: f32 = mdot(V, N);\n  return F0 + (1 - F0) * pow((1-NdotV), 5); \n}\n\n// Normal portion of BRDF\n// https://learnopengl.com/PBR/Theory\n// Trowbridge-Reitz GGX functions: normal, halfway, roughness^2\nfn trGGX(N: vec3<f32>, H: vec3<f32>, a: f32) -> f32 {\n  var pi: f32 = 3.14159265359; \n\n  var a2: f32 = a*a;\n  var NdotH = mdot(N, H);\n  var NdotH2 = NdotH*NdotH;\n  \n  var denom: f32 = NdotH2 * (a2 - 1.0) + 1.0;\n\n  return a2 / max((pi*denom*denom), 0.000001);\n}\n\n// A VERY bad approximation of anisotropy. Real anisotropic calculations require tangent and bitangent\nfn anisotrophicTrGGX(N: vec3<f32>, H: vec3<f32>, O: vec3<f32>, s: f32, a: f32) -> f32 {\n  var Op: vec3<f32> = (rendererUBO.WCVCNormals * vec4<f32>(normalize(O) * s, 0.)).xyz;\n\n  var ggx1: f32 = trGGX(N + Op*s, H, a);\n  var ggx2: f32 = trGGX(N - Op*s, H, a);\n  return (0.5 * ggx1 + 0.5 * ggx2);\n}\n\n// Geometry portion of BRDF\nfn schlickGGX(N: vec3<f32>, X: vec3<f32>, k: f32) -> f32 {\n  var NdotX = mdot(N, X);\n  return NdotX / max(0.000001, (NdotX*(1-k) + k));\n}\n\nfn smithSurfaceRoughness(N: vec3<f32>, V: vec3<f32>, L: vec3<f32>, k: f32) -> f32 {\n  var ggx1: f32 = max(0.01, schlickGGX(N, V, k)); // Prevents void zones at the cost of some accuracy\n  var ggx2: f32 = schlickGGX(N, L, k);\n  return ggx1*ggx2;\n}\n\n// BRDF Combination\nfn cookTorrance(D: f32, F: f32, G: f32, N: vec3<f32>, V: vec3<f32>, L: vec3<f32>) -> f32 {\n  var num: f32 = D*F*G;\n  var denom: f32 = 4*mdot(V, N)*mdot(L, N);\n\n  return num / max(denom, 0.000001);\n}\n\n// Different lighting calculations for different light sources\nfn calcDirectionalLight(N: vec3<f32>, V: vec3<f32>, ior: f32, roughness: f32, metallic: f32, direction: vec3<f32>, color: vec3<f32>, base: vec3<f32>) -> PBRData {  \n  var L: vec3<f32> = normalize(direction); // Light Vector\n  var H: vec3<f32> = normalize(L + V); // Halfway Vector\n\n  var alpha = roughness*roughness;\n  var k: f32 = alpha*alpha / 2;\n\n  var D: f32 = trGGX(N, H, alpha); // Distribution\n  // var F: f32 = schlickFresnelIOR(V, N, ior, k); // Fresnel\n  var G: f32 = smithSurfaceRoughness(N, V, L, k); // Geometry\n\n  var brdf: f32 = cookTorrance(D, 1, G, N, V, L); // Fresnel term is replaced with 1 because it is added later\n  var incoming: vec3<f32> = color;\n  var angle: f32 = mdot(L, N);\n  angle = pow(angle, 1.5);\n\n  var specular: vec3<f32> = brdf*incoming*angle;\n  // Oren-Nayar gives a clay-like effect when fully rough which some people may not want, so it might be better to give a separate\n  // control property for the diffuse vs specular roughness\n  var diffuse: vec3<f32> = incoming*fujiiOrenNayar(base, roughness, N, L, V); \n  // Stores the specular and diffuse separately to allow for finer post processing\n  // Could also be done (propably more properly) with a struct\n  var out = PBRData(diffuse, specular);\n  \n  return out; // Returns angle along with color of light so the final color can be multiplied by angle as well (creates black areas)\n}\n\n// TODO: find some way to reduce the number of arguments going in here\nfn calcPointLight(N: vec3<f32>, V: vec3<f32>, fragPos: vec3<f32>, ior: f32, roughness: f32, metallic: f32, position: vec3<f32>, color: vec3<f32>, base: vec3<f32>) -> PBRData {\n  var L: vec3<f32> = normalize(position - fragPos); // Light Vector\n  var H: vec3<f32> = normalize(L + V); // Halfway Vector\n  var dist = distance(position, fragPos);\n\n  var alpha = roughness*roughness;\n  var k: f32 = alpha*alpha / 2; // could also be pow(alpha + 1.0, 2) / 8\n\n  var D: f32 = trGGX(N, H, alpha); // Distribution\n  // var F: f32 = schlickFresnelIOR(V, N, ior, k); // Fresnel\n  var G: f32 = smithSurfaceRoughness(N, V, L, k); // Geometry\n\n  var brdf: f32 = cookTorrance(D, 1, G, N, V, L);  \n  var incoming: vec3<f32> = color * (1. / (dist*dist));\n  var angle: f32 = mdot(L, N);\n  angle = pow(angle, 1.5); // Smoothing factor makes it less accurate, but reduces ugly \"seams\" bewteen light sources\n\n  var specular: vec3<f32> = brdf*incoming*angle;\n  var diffuse: vec3<f32> = incoming*fujiiOrenNayar(base, roughness, N, L, V);\n\n  // Stores the specular and diffuse separately to allow for finer post processing\n  // Could also be done (propably more properly) with a struct\n  var out = PBRData(diffuse, specular);\n  \n  return out; // Returns angle along with color of light so the final color can be multiplied by angle as well (creates black areas)\n}\n\n// For a reason unknown to me, spheres dont seem to behave propperly with head-on spot lights\nfn calcSpotLight(N: vec3<f32>, V: vec3<f32>, fragPos: vec3<f32>, ior: f32, roughness: f32, metallic: f32, position: vec3<f32>, direction: vec3<f32>, cones: vec2<f32>, color: vec3<f32>, base: vec3<f32>) -> PBRData {\n  var L: vec3<f32> = normalize(position - fragPos);\n  var H: vec3<f32> = normalize(L + V); // Halfway Vector\n  var dist = distance(position, fragPos);\n\n  var alpha = roughness*roughness;\n  var k: f32 = alpha*alpha / 2; // could also be pow(alpha + 1.0, 2) / 8\n\n  var D: f32 = trGGX(N, H, alpha); // Distribution\n  // var F: f32 = schlickFresnelIOR(V, N, ior, k); // Fresnel\n  var G: f32 = smithSurfaceRoughness(N, V, L, k); // Geometry\n\n  var brdf: f32 = cookTorrance(D, 1, G, N, V, L);  \n  \n  // Cones.x is the inner phi and cones.y is the outer phi\n  var theta: f32 = mdot(normalize(direction), L);\n  var epsilon: f32 = cones.x - cones.y;\n  var intensity: f32 = (theta - cones.y) / epsilon;\n  intensity = clamp(intensity, 0.0, 1.0);\n  intensity /= dist*dist;\n\n  var incoming: vec3<f32> = color * intensity;\n\n  var angle: f32 = mdot(L, N);\n  angle = pow(angle, 1.5); // Smoothing factor makes it less accurate, but reduces ugly \"seams\" bewteen light sources\n\n  var specular: vec3<f32> = brdf*incoming*angle;\n  var diffuse: vec3<f32> = incoming*fujiiOrenNayar(base, roughness, N, L, V);\n\n  // Stores the specular and diffuse separately to allow for finer post processing\n  // Could also be done (propably more properly) with a struct\n  var out = PBRData(diffuse, specular);\n  \n  return out; // Returns angle along with color of light so the final color can be multiplied by angle as well (creates black areas)\n}\n\n// Environment mapping stuff\n// Takes in a vector and converts it to an equivalent coordinate in a rectilinear texture. Should be replaced with cubemaps at some point\nfn vecToRectCoord(dir: vec3<f32>) -> vec2<f32> {\n  var tau: f32 = 6.28318530718;\n  var out: vec2<f32> = vec2<f32>(0.);\n\n  out.x = atan2(dir.z, dir.x) / tau;\n  out.x += 0.5;\n\n  out.y = (dir.y * .5) + .5;\n\n  return out;\n}\n\n//VTK::Renderer::Dec\n\n//VTK::Color::Dec\n\n//VTK::TCoord::Dec\n\n// optional surface normal declaration\n//VTK::Normal::Dec\n\n//VTK::Select::Dec\n\n//VTK::RenderEncoder::Dec\n\n//VTK::Mapper::Dec\n\n//VTK::IOStructs::Dec\n\n@fragment\nfn main(\n//VTK::IOStructs::Input\n)\n//VTK::IOStructs::Output\n{\n  var output : fragmentOutput;\n\n  // Temporary ambient, diffuse, and opacity\n  var ambientColor: vec4<f32> = mapperUBO.AmbientColor;\n  var diffuseColor: vec4<f32> = mapperUBO.DiffuseColor;\n  var opacity: f32 = mapperUBO.Opacity;\n\n  // This should be declared somewhere else\n  var _diffuseMap: vec4<f32> = vec4<f32>(1);\n  var _roughnessMap: vec4<f32> = vec4<f32>(1);\n  var _metallicMap: vec4<f32> = vec4<f32>(1);\n  var _normalMap: vec4<f32> = vec4<f32>(0, 0, 1, 0); // normal map was setting off the normal vector detection in fragment\n  var _ambientOcclusionMap: vec4<f32> = vec4<f32>(0);\n  var _emissionMap: vec4<f32> = vec4<f32>(0);\n\n  //VTK::Color::Impl\n\n  //VTK::TCoord::Impl\n\n  //VTK::Normal::Impl\n\n  var computedColor: vec4<f32> = vec4<f32>(diffuseColor.rgb, 1.);\n\n  //VTK::Light::Impl\n\n  //VTK::Select::Impl\n\n  if (computedColor.a == 0.0) { discard; };\n\n  //VTK::Position::Impl\n\n  //VTK::RenderEncoder::Impl\n\n  return output;\n}\n";
 
 function isEdges(hash) {
   // edge pipelines have "edge" in them
@@ -72,6 +72,9 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
     var utime = model.UBO.getSendTime();
 
     if (publicAPI.getMTime() > utime || ppty.getMTime() > utime || model.renderable.getMTime() > utime) {
+      var _ppty$getEdgeColorByR;
+
+      // Matricies
       var keyMats = model.WebGPUActor.getKeyMatrices(model.WebGPURenderer);
       model.UBO.setArray('BCWCMatrix', keyMats.bcwc);
       model.UBO.setArray('BCSCMatrix', keyMats.bcsc);
@@ -79,25 +82,42 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
 
       if (model.is2D) {
         model.UBO.setValue('ZValue', model.WebGPUActor.getRenderable().getProperty().getDisplayLocation() === DisplayLocation.FOREGROUND ? 1.0 : 0.0);
-        var aColor = ppty.getColorByReference();
+
+        var _aColor = ppty.getColorByReference();
+
         model.UBO.setValue('AmbientIntensity', 1.0);
-        model.UBO.setArray('AmbientColor', [aColor[0], aColor[1], aColor[2], 1.0]);
+        model.UBO.setArray('DiffuseColor', [_aColor[0], _aColor[1], _aColor[2], 1.0]);
         model.UBO.setValue('DiffuseIntensity', 0.0);
         model.UBO.setValue('SpecularIntensity', 0.0);
       } else {
-        var _aColor = ppty.getAmbientColorByReference();
+        // Base Colors
+        var _aColor2 = ppty.getAmbientColorByReference();
 
         model.UBO.setValue('AmbientIntensity', ppty.getAmbient());
-        model.UBO.setArray('AmbientColor', [_aColor[0], _aColor[1], _aColor[2], 1.0]);
+        model.UBO.setArray('AmbientColor', [_aColor2[0], _aColor2[1], _aColor2[2], 1.0]);
         model.UBO.setValue('DiffuseIntensity', ppty.getDiffuse());
-        _aColor = ppty.getDiffuseColorByReference();
-        model.UBO.setArray('DiffuseColor', [_aColor[0], _aColor[1], _aColor[2], 1.0]);
+        _aColor2 = ppty.getDiffuseColorByReference();
+        model.UBO.setArray('DiffuseColor', [_aColor2[0], _aColor2[1], _aColor2[2], 1.0]); // Roughness
+
+        model.UBO.setValue('Roughness', ppty.getRoughness());
+        model.UBO.setValue('BaseIOR', ppty.getBaseIOR()); // Metallic
+
+        model.UBO.setValue('Metallic', ppty.getMetallic()); // Normal
+
+        model.UBO.setValue('NormalStrength', ppty.getNormalStrength()); // Emission
+
+        model.UBO.setValue('Emission', ppty.getEmission()); // Specular
+
         model.UBO.setValue('SpecularIntensity', ppty.getSpecular());
-        model.UBO.setValue('SpecularPower', ppty.getSpecularPower());
-        _aColor = ppty.getSpecularColorByReference();
-        model.UBO.setArray('SpecularColor', [_aColor[0], _aColor[1], _aColor[2], 1.0]);
-        _aColor = ppty.getEdgeColorByReference();
-        model.UBO.setArray('EdgeColor', [_aColor[0], _aColor[1], _aColor[2], 1.0]);
+        _aColor2 = ppty.getSpecularColorByReference();
+        model.UBO.setArray('SpecularColor', [_aColor2[0], _aColor2[1], _aColor2[2], 1.0]);
+      } // Edge and line rendering
+
+
+      var aColor = (_ppty$getEdgeColorByR = ppty.getEdgeColorByReference) === null || _ppty$getEdgeColorByR === void 0 ? void 0 : _ppty$getEdgeColorByR.call(ppty);
+
+      if (aColor) {
+        model.UBO.setArray('EdgeColor', [aColor[0], aColor[1], aColor[2], 1.0]);
       }
 
       model.UBO.setValue('LineWidth', ppty.getLineWidth());
@@ -130,10 +150,11 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
   publicAPI.replaceShaderPosition = function (hash, pipeline, vertexInput) {
     var vDesc = pipeline.getShaderDescription('vertex');
     vDesc.addBuiltinOutput('vec4<f32>', '@builtin(position) Position');
+    if (!vDesc.hasOutput('vertexVC')) vDesc.addOutput('vec4<f32>', 'vertexVC');
     var code = vDesc.getCode();
 
     if (model.useRendererMatrix) {
-      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Position::Impl', ['    var pCoord: vec4<f32> = rendererUBO.SCPCMatrix*mapperUBO.BCSCMatrix*vertexBC;', '//VTK::Position::Impl']).result;
+      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Position::Impl', ['    var pCoord: vec4<f32> = rendererUBO.SCPCMatrix*mapperUBO.BCSCMatrix*vertexBC;', '    output.vertexVC = rendererUBO.SCVCMatrix * mapperUBO.BCSCMatrix * vec4<f32>(vertexBC.xyz, 1.0);', '//VTK::Position::Impl']).result;
 
       if (model.forceZValue) {
         code = vtkWebGPUShaderCache.substitute(code, '//VTK::Position::Impl', ['pCoord = vec4<f32>(pCoord.xyz/pCoord.w, 1.0);', 'pCoord.z = mapperUBO.ZValue;', '//VTK::Position::Impl']).result;
@@ -161,16 +182,38 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
 
   publicAPI.replaceShaderNormal = function (hash, pipeline, vertexInput) {
     var normalBuffer = vertexInput.getBuffer('normalMC');
+    var actor = model.WebGPUActor.getRenderable();
 
     if (normalBuffer) {
       var vDesc = pipeline.getShaderDescription('vertex');
-      vDesc.addOutput('vec3<f32>', 'normalVC', normalBuffer.getArrayInformation()[0].interpolation);
+
+      if (!vDesc.hasOutput('normalVC')) {
+        vDesc.addOutput('vec3<f32>', 'normalVC', normalBuffer.getArrayInformation()[0].interpolation);
+      }
+
+      if (!vDesc.hasOutput('tangentVC')) {
+        vDesc.addOutput('vec3<f32>', 'tangentVC', normalBuffer.getArrayInformation()[0].interpolation);
+      }
+
+      if (!vDesc.hasOutput('bitangentVC')) {
+        vDesc.addOutput('vec3<f32>', 'bitangentVC', normalBuffer.getArrayInformation()[0].interpolation);
+      }
+
       var code = vDesc.getCode();
-      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Normal::Impl', ['  output.normalVC = normalize((rendererUBO.WCVCNormals * mapperUBO.MCWCNormals * normalMC).xyz);']).result;
+      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Normal::Impl', ['  output.normalVC = normalize((rendererUBO.WCVCNormals * mapperUBO.MCWCNormals * normalMC).xyz);', // This is just an approximation, but it happens to work extremely well
+      // It only works well for normals that are head on and not super angled though
+      // Definitely needs to be replaced
+      '  var c1: vec3<f32> = cross(output.normalVC, vec3<f32>(0, 0, 1));', '  var c2: vec3<f32> = cross(output.normalVC, vec3<f32>(0, 1, 0));', '  var tangent: vec3<f32> = mix(c1, c2, distance(c1, c2));', '  output.tangentVC = normalize(tangent);', '  output.bitangentVC = normalize(cross(output.normalVC, tangent));']).result;
       vDesc.setCode(code);
       var fDesc = pipeline.getShaderDescription('fragment');
       code = fDesc.getCode();
-      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Normal::Impl', ['  var normal: vec3<f32> = input.normalVC;', '  if (!input.frontFacing) { normal = -normal; }']).result;
+
+      if (actor.getProperty().getNormalTexture()) {
+        code = vtkWebGPUShaderCache.substitute(code, '//VTK::Normal::Impl', ['  var normal: vec3<f32> = input.normalVC;', '  if (!input.frontFacing) { normal = -normal; }', '  var tangent: vec3<f32> = input.tangentVC;', '  var bitangent: vec3<f32> = input.bitangentVC;', '  var TCVCMatrix: mat3x3<f32> = mat3x3<f32>(', '    tangent.x, bitangent.x, normal.x,', '    tangent.y, bitangent.y, normal.y,', '    tangent.z, bitangent.z, normal.z,', '  );', '  normal = TCVCMatrix * (_normalMap.xyz * 2 - 1);', '  normal = mix(input.normalVC, normal, mapperUBO.NormalStrength);', '  normal = normalize(normal);']).result;
+      } else {
+        code = vtkWebGPUShaderCache.substitute(code, '//VTK::Normal::Impl', ['  var normal: vec3<f32> = input.normalVC;', '  if (!input.frontFacing) { normal = -normal; }', '  normal = normalize(normal);']).result;
+      }
+
       fDesc.setCode(code);
     }
   };
@@ -179,14 +222,24 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
   // fragment shader code. That is the lighting trigger.
 
   publicAPI.replaceShaderLight = function (hash, pipeline, vertexInput) {
+    if (hash.includes('sel')) return;
+    var vDesc = pipeline.getShaderDescription('vertex');
+    if (!vDesc.hasOutput('vertexVC')) vDesc.addOutput('vec4<f32>', 'vertexVC');
     var fDesc = pipeline.getShaderDescription('fragment');
-    var code = fDesc.getCode();
-
-    if (code.includes('var normal')) {
-      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Light::Impl', ['  var df: f32  = max(0.0, normal.z);', '  var sf: f32 = pow(df, mapperUBO.SpecularPower);', '  var diffuse: vec3<f32> = df * diffuseColor.rgb;', '  var specular: vec3<f32> = sf * mapperUBO.SpecularColor.rgb * mapperUBO.SpecularColor.a;']).result;
-      fDesc.setCode(code);
+    var code = fDesc.getCode(); // Code that runs if the fragment shader includes normals
+
+    if (code.includes('var normal:') && model.useRendererMatrix && !isEdges(hash) && !model.is2D && !hash.includes('sel')) {
+      code = vtkWebGPUShaderCache.substitute(code, '//VTK::Light::Impl', [// Constants
+      '  var pi: f32 = 3.14159265359;', // Vectors needed for light calculations
+      '  var fragPos: vec3<f32> = vec3<f32>(input.vertexVC.xyz);', '  var V: vec3<f32> = mix(normalize(-fragPos), vec3<f32>(0, 0, 1), f32(rendererUBO.cameraParallel)); // View Vector', // Values needed for light calculations
+      '  var baseColor: vec3<f32> = _diffuseMap.rgb * diffuseColor.rgb;', '  var roughness: f32 = max(0.000001, mapperUBO.Roughness * _roughnessMap.r);', // Need to have a different way of sampling greyscale values aside from .r
+      '  var metallic: f32 = mapperUBO.Metallic * _metallicMap.r;', '  var alpha: f32 = roughness*roughness;', '  var ior: f32 = mapperUBO.BaseIOR;', '  var k: f32 = alpha*alpha / 2;', // Split diffuse and specular components
+      '  var diffuse: vec3<f32> = vec3<f32>(0.);', '  var specular: vec3<f32> = vec3<f32>(0.);', '  var emission: vec3<f32> = _emissionMap.rgb * mapperUBO.Emission;', // Summing diffuse and specular components of directional lights
+      '  {', '    var i: i32 = 0;', '    loop {', '      if !(i < rendererUBO.LightCount) { break; }', '      switch (i32(rendererLightSSBO.values[i].LightData.x)) {', '         // Point Light', '         case 0 {', '           var color: vec3<f32> = rendererLightSSBO.values[i].LightColor.rgb * rendererLightSSBO.values[i].LightColor.w;', '           var pos: vec3<f32> = (rendererLightSSBO.values[i].LightPos).xyz;', '           var calculated: PBRData = calcPointLight(normal, V, fragPos, ior, roughness, metallic, pos, color, baseColor);', '           diffuse += max(vec3<f32>(0), calculated.diffuse);', '           specular += max(vec3<f32>(0), calculated.specular);', '          }', '         // Directional light', '         case 1 {', '           var dir: vec3<f32> = (rendererUBO.WCVCNormals * vec4<f32>(normalize(rendererLightSSBO.values[i].LightDir.xyz), 0.)).xyz;', '           dir = normalize(dir);', '           var color: vec3<f32> = rendererLightSSBO.values[i].LightColor.rgb * rendererLightSSBO.values[i].LightColor.w;', '           var calculated: PBRData = calcDirectionalLight(normal, V, ior, roughness, metallic, dir, color, baseColor); // diffuseColor.rgb needs to be fixed with a more dynamic diffuse color', '           diffuse += max(vec3<f32>(0), calculated.diffuse);', '           specular += max(vec3<f32>(0), calculated.specular);', '         }', '         // Spot Light', '         case 2 {', '           var color: vec3<f32> = rendererLightSSBO.values[i].LightColor.rgb * rendererLightSSBO.values[i].LightColor.w;', '           var pos: vec3<f32> = (rendererLightSSBO.values[i].LightPos).xyz;', '           var dir: vec3<f32> = (rendererUBO.WCVCNormals * vec4<f32>(normalize(rendererLightSSBO.values[i].LightDir.xyz), 0.)).xyz;', '           dir = normalize(dir);', '           var cones: vec2<f32> = vec2<f32>(rendererLightSSBO.values[i].LightData.y, rendererLightSSBO.values[i].LightData.z);', '           var calculated: PBRData = calcSpotLight(normal, V, fragPos, ior, roughness, metallic, pos, dir, cones, color, baseColor);', '           diffuse += max(vec3<f32>(0), calculated.diffuse);', '           specular += max(vec3<f32>(0), calculated.specular);', '         }', '         default { continue; }', '       }', '      continuing { i++; }', '    }', '  }', // Final variables for combining specular and diffuse
+      '  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;']).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, mapperUBO.Opacity);']).result;
       fDesc.setCode(code);
     }
   };
@@ -194,6 +247,7 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
   model.shaderReplacements.set('replaceShaderLight', publicAPI.replaceShaderLight);
 
   publicAPI.replaceShaderColor = function (hash, pipeline, vertexInput) {
+    // By default, set the colors to be flat
     if (isEdges(hash)) {
       var _fDesc = pipeline.getShaderDescription('fragment');
 
@@ -204,15 +258,18 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       _fDesc.setCode(_code);
 
       return;
-    }
+    } // If there's no vertex color buffer return the shader as is
+
 
     var colorBuffer = vertexInput.getBuffer('colorVI');
-    if (!colorBuffer) return;
+    if (!colorBuffer) return; // Modifies the vertex shader to include the vertex colors and interpolation in the outputs
+
     var vDesc = pipeline.getShaderDescription('vertex');
     vDesc.addOutput('vec4<f32>', 'color', colorBuffer.getArrayInformation()[0].interpolation);
     var code = vDesc.getCode();
     code = vtkWebGPUShaderCache.substitute(code, '//VTK::Color::Impl', ['  output.color = colorVI;']).result;
-    vDesc.setCode(code);
+    vDesc.setCode(code); // Sets the fragment shader to accept the color inputs from the vertex shader
+
     var fDesc = pipeline.getShaderDescription('fragment');
     code = fDesc.getCode();
     code = vtkWebGPUShaderCache.substitute(code, '//VTK::Color::Impl', ['ambientColor = input.color;', 'diffuseColor = input.color;', 'opacity = mapperUBO.Opacity * input.color.a;']).result;
@@ -222,27 +279,70 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
   model.shaderReplacements.set('replaceShaderColor', publicAPI.replaceShaderColor);
 
   publicAPI.replaceShaderTCoord = function (hash, pipeline, vertexInput) {
+    var _actor$getProperty$ge, _actor$getProperty, _actor$getProperty$ge2, _actor$getProperty$ge4, _actor$getProperty3, _actor$getProperty$ge5, _actor$getProperty$ge6, _actor$getProperty4, _actor$getProperty$ge7, _actor$getProperty$ge8, _actor$getProperty5, _actor$getProperty$ge9, _actor$getProperty$ge10, _actor$getProperty6, _actor$getProperty$ge11, _actor$getProperty$ge12, _actor$getProperty7, _actor$getProperty$ge13;
+
     if (!vertexInput.hasAttribute('tcoord')) return;
     var vDesc = pipeline.getShaderDescription('vertex');
     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;
+    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(); // todo handle multiple textures? Blend multiply ?
+    code = fDesc.getCode();
+    var actor = model.WebGPUActor.getRenderable();
 
-    if (model.textures.length) {
-      var tdims = model.textures[0].getDimensions();
+    var checkDims = function checkDims(texture) {
+      if (!texture) return false;
+      var dims = texture.getDimensionality();
+      return dims === numComp;
+    };
 
-      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));
+    var usedTextures = [];
+
+    if ((_actor$getProperty$ge = (_actor$getProperty = actor.getProperty()).getDiffuseTexture) !== null && _actor$getProperty$ge !== void 0 && (_actor$getProperty$ge2 = _actor$getProperty$ge.call(_actor$getProperty)) !== null && _actor$getProperty$ge2 !== void 0 && _actor$getProperty$ge2.getImageLoaded() || actor.getTextures()[0] || model.colorTexture) {
+      var _actor$getProperty$ge3, _actor$getProperty2;
+
+      if ( // Chained or statements here are questionable
+      checkDims((_actor$getProperty$ge3 = (_actor$getProperty2 = actor.getProperty()).getDiffuseTexture) === null || _actor$getProperty$ge3 === void 0 ? void 0 : _actor$getProperty$ge3.call(_actor$getProperty2)) || checkDims(actor.getTextures()[0]) || checkDims(model.colorTexture)) {
+        usedTextures.push('_diffuseMap = textureSample(DiffuseTexture, DiffuseTextureSampler, input.tcoordVS);');
+      }
+    }
+
+    if ((_actor$getProperty$ge4 = (_actor$getProperty3 = actor.getProperty()).getRoughnessTexture) !== null && _actor$getProperty$ge4 !== void 0 && (_actor$getProperty$ge5 = _actor$getProperty$ge4.call(_actor$getProperty3)) !== null && _actor$getProperty$ge5 !== void 0 && _actor$getProperty$ge5.getImageLoaded()) {
+      if (checkDims(actor.getProperty().getRoughnessTexture())) {
+        usedTextures.push('_roughnessMap = textureSample(RoughnessTexture, RoughnessTextureSampler, input.tcoordVS);');
+      }
+    }
+
+    if ((_actor$getProperty$ge6 = (_actor$getProperty4 = actor.getProperty()).getMetallicTexture) !== null && _actor$getProperty$ge6 !== void 0 && (_actor$getProperty$ge7 = _actor$getProperty$ge6.call(_actor$getProperty4)) !== null && _actor$getProperty$ge7 !== void 0 && _actor$getProperty$ge7.getImageLoaded()) {
+      if (checkDims(actor.getProperty().getMetallicTexture())) {
+        usedTextures.push('_metallicMap = textureSample(MetallicTexture, MetallicTextureSampler, input.tcoordVS);');
+      }
+    }
+
+    if ((_actor$getProperty$ge8 = (_actor$getProperty5 = actor.getProperty()).getNormalTexture) !== null && _actor$getProperty$ge8 !== void 0 && (_actor$getProperty$ge9 = _actor$getProperty$ge8.call(_actor$getProperty5)) !== null && _actor$getProperty$ge9 !== void 0 && _actor$getProperty$ge9.getImageLoaded()) {
+      if (checkDims(actor.getProperty().getNormalTexture())) {
+        usedTextures.push('_normalMap = textureSample(NormalTexture, NormalTextureSampler, input.tcoordVS);');
       }
     }
 
+    if ((_actor$getProperty$ge10 = (_actor$getProperty6 = actor.getProperty()).getAmbientOcclusionTexture) !== null && _actor$getProperty$ge10 !== void 0 && (_actor$getProperty$ge11 = _actor$getProperty$ge10.call(_actor$getProperty6)) !== null && _actor$getProperty$ge11 !== void 0 && _actor$getProperty$ge11.getImageLoaded()) {
+      if (checkDims(actor.getProperty().getAmbientOcclusionTexture())) {
+        usedTextures.push('_ambientOcclusionMap = textureSample(AmbientOcclusionTexture, AmbientOcclusionTextureSampler, input.tcoordVS);');
+      }
+    }
+
+    if ((_actor$getProperty$ge12 = (_actor$getProperty7 = actor.getProperty()).getEmissionTexture) !== null && _actor$getProperty$ge12 !== void 0 && (_actor$getProperty$ge13 = _actor$getProperty$ge12.call(_actor$getProperty7)) !== null && _actor$getProperty$ge13 !== void 0 && _actor$getProperty$ge13.getImageLoaded()) {
+      if (checkDims(actor.getProperty().getEmissionTexture())) {
+        usedTextures.push('_emissionMap = textureSample(EmissionTexture, EmissionTextureSampler, input.tcoordVS);');
+      }
+    }
+
+    code = vtkWebGPUShaderCache.substitute(code, '//VTK::TCoord::Impl', usedTextures).result;
     fDesc.setCode(code);
   };
 
@@ -309,7 +409,8 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       default:
         return 'line-list';
     }
-  };
+  }; // TODO: calculate tangents
+
 
   publicAPI.buildVertexInput = function () {
     var _model$renderable$get, _model$renderable;
@@ -379,7 +480,9 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
 
     if (!model.is2D && ( // no lighting on Property2D
     usage === BufferUsage.Triangles || usage === BufferUsage.Strips)) {
-      var normals = pd.getPointData().getNormals();
+      var normals = pd.getPointData().getNormals(); // https://vtk.org/doc/nightly/html/classvtkPolyDataTangents.html
+      // Need to find some way of using precomputed tangents (or computing new ones)
+
       var _buffRequest2 = {
         format: 'snorm8x4',
         indexBuffer: indexBuffer,
@@ -466,7 +569,7 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
   };
 
   publicAPI.updateTextures = function () {
-    var _model$renderable$get2, _model$renderable2;
+    var _model$renderable$get2, _model$renderable2, _actor$getProperty$ge14, _actor$getProperty8, _actor$getProperty$ge15, _actor$getProperty9, _actor$getProperty$ge16, _actor$getProperty10, _actor$getProperty$ge17, _actor$getProperty11, _actor$getProperty$ge18, _actor$getProperty12, _actor$getProperty$ge19, _actor$getProperty13, _renderer$getBackgrou;
 
     // we keep track of new and used textures so
     // that we can clean up any unused textures so we don't hold onto them
@@ -483,28 +586,69 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
       }
 
       model.colorTexture.setInputData(idata);
-      newTextures.push(model.colorTexture);
+      newTextures.push(['Diffuse', model.colorTexture]);
     } // actor textures?
 
 
     var actor = model.WebGPUActor.getRenderable();
-    var textures = actor.getTextures();
+    var renderer = model.WebGPURenderer.getRenderable(); // Reusing the old code for new and old textures, just loading in from properties instead of actor.getTextures()
+
+    var textures = []; // Feels like there should be a better way than individually adding all
+
+    if ((_actor$getProperty$ge14 = (_actor$getProperty8 = actor.getProperty()).getDiffuseTexture) !== null && _actor$getProperty$ge14 !== void 0 && _actor$getProperty$ge14.call(_actor$getProperty8)) {
+      var pair = ['Diffuse', actor.getProperty().getDiffuseTexture()];
+      textures.push(pair);
+    }
+
+    if (actor.getTextures()[0]) {
+      var _pair = ['Diffuse', actor.getTextures()[0]];
+      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()];
+      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()];
+      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()];
+      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()];
+      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()];
+      textures.push(_pair6);
+    }
+
+    if ((_renderer$getBackgrou = renderer.getBackgroundTexture) !== null && _renderer$getBackgrou !== void 0 && _renderer$getBackgrou.call(renderer)) {
+      var _pair7 = ['Background', renderer.getBackgroundTexture()];
+      textures.push(_pair7);
+    }
 
     for (var i = 0; i < textures.length; i++) {
-      if (textures[i].getInputData() || textures[i].getJsImageData() || textures[i].getCanvas()) {
+      if (textures[i][1].getInputData() || textures[i][1].getJsImageData() || textures[i][1].getCanvas()) {
         newTextures.push(textures[i]);
       }
 
-      if (textures[i].getImage() && textures[i].getImageLoaded()) {
+      if (textures[i][1].getImage() && textures[i][1].getImageLoaded()) {
         newTextures.push(textures[i]);
       }
     }
 
-    var usedCount = 0;
-
     for (var _i = 0; _i < newTextures.length; _i++) {
-      var srcTexture = newTextures[_i];
-      var newTex = model.device.getTextureManager().getTextureForVTKTexture(srcTexture);
+      var srcTexture = newTextures[_i][1];
+      var textureName = newTextures[_i][0];
+      var newTex = model.device.getTextureManager().getTextureForVTKTexture(srcTexture); // Generates hash
 
       if (newTex.getReady()) {
         // is this a new texture
@@ -512,7 +656,6 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
 
         for (var t = 0; t < model.textures.length; t++) {
           if (model.textures[t] === newTex) {
-            usedCount++;
             found = true;
             usedTextures[t] = true;
           }
@@ -520,7 +663,7 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
 
         if (!found) {
           usedTextures[model.textures.length] = true;
-          var tview = newTex.createView("Texture".concat(usedCount++));
+          var tview = newTex.createView("".concat(textureName, "Texture"));
           model.textures.push(newTex);
           model.textureViews.push(tview);
           var interpolate = srcTexture.getInterpolate() ? 'linear' : 'nearest';
@@ -623,14 +766,15 @@ var DEFAULT_VALUES = {
 }; // ----------------------------------------------------------------------------
 
 function extend(publicAPI, model) {
-  var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, DEFAULT_VALUES, initialValues); // Inheritance
+  var initiaLalues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  Object.assign(model, DEFAULT_VALUES, initiaLalues); // Inheritance
 
-  vtkWebGPUSimpleMapper.extend(publicAPI, model, initialValues);
+  vtkWebGPUSimpleMapper.extend(publicAPI, model, initiaLalues);
   model.fragmentShaderTemplate = vtkWebGPUPolyDataFS;
   model.vertexShaderTemplate = vtkWebGPUPolyDataVS;
   model._tmpMat3 = mat3.identity(new Float64Array(9));
-  model._tmpMat4 = mat4.identity(new Float64Array(16));
+  model._tmpMat4 = mat4.identity(new Float64Array(16)); // UBO
+
   model.UBO = vtkWebGPUUniformBuffer.newInstance({
     label: 'mapperUBO'
   });
@@ -643,12 +787,21 @@ function extend(publicAPI, model) {
   model.UBO.addEntry('SpecularColor', 'vec4<f32>');
   model.UBO.addEntry('AmbientIntensity', 'f32');
   model.UBO.addEntry('DiffuseIntensity', 'f32');
+  model.UBO.addEntry('Roughness', 'f32');
+  model.UBO.addEntry('Metallic', 'f32');
+  model.UBO.addEntry('Ambient', 'f32');
+  model.UBO.addEntry('Normal', 'f32');
+  model.UBO.addEntry('Emission', 'f32');
+  model.UBO.addEntry('NormalStrength', 'f32');
+  model.UBO.addEntry('BaseIOR', 'f32');
   model.UBO.addEntry('SpecularIntensity', 'f32');
   model.UBO.addEntry('LineWidth', 'f32');
   model.UBO.addEntry('Opacity', 'f32');
-  model.UBO.addEntry('SpecularPower', 'f32');
   model.UBO.addEntry('ZValue', 'f32');
-  model.UBO.addEntry('PropID', 'u32'); // Build VTK API
+  model.UBO.addEntry('PropID', 'u32');
+  model.UBO.addEntry('ClipNear', 'f32');
+  model.UBO.addEntry('ClipFar', 'f32');
+  model.UBO.addEntry('Time', 'u32'); // Build VTK API
 
   setGet(publicAPI, model, ['cellArray', 'currentInput', 'cellOffset', 'is2D', 'primitiveType', 'renderEncoder']);
   model.textures = []; // Object methods

package/Rendering/WebGPU/Glyph3DMapper.js

@@ -29,8 +29,9 @@ function vtkWebGPUGlyph3DCellArrayMapper(publicAPI, model) {
     var vDesc = pipeline.getShaderDescription('vertex');
     vDesc.addBuiltinInput('u32', '@builtin(instance_index) instanceIndex');
     vDesc.addBuiltinOutput('vec4<f32>', '@builtin(position) Position');
+    if (!vDesc.hasOutput('vertexVC')) vDesc.addOutput('vec3<f32>', 'vertexVC');
     var code = vDesc.getCode();
-    code = vtkWebGPUShaderCache.substitute(code, '//VTK::Position::Impl', ['    output.Position = rendererUBO.SCPCMatrix*mapperUBO.BCSCMatrix', '      *glyphSSBO.values[input.instanceIndex].matrix', '      *vertexBC;']).result;
+    code = vtkWebGPUShaderCache.substitute(code, '//VTK::Position::Impl', ['    var vertexSC: vec4<f32> = mapperUBO.BCSCMatrix*glyphSSBO.values[input.instanceIndex].matrix*vertexBC;', '    output.vertexVC = (rendererUBO.SCVCMatrix*vertexSC).xyz;', '    output.Position = rendererUBO.SCPCMatrix*vertexSC;']).result;
     vDesc.setCode(code);
   };
 

package/Rendering/WebGPU/ImageMapper.js

@@ -106,7 +106,10 @@ function vtkWebGPUImageMapper(publicAPI, model) {
       var modelToIndex = image.getWorldToIndex();
       mat4.multiply(tmpMat4, modelToIndex, tmpMat4); // tmpMat4 is now SC -> Index, save this as we need it later
 
-      mat4.invert(tmp3Mat4, tmpMat4);
+      mat4.invert(tmp3Mat4, tmpMat4); // need translation and scale
+
+      mat4.fromTranslation(tmp2Mat4, [0.5, 0.5, 0.5]);
+      mat4.multiply(tmpMat4, tmp2Mat4, tmpMat4);
       var dims = image.getDimensions();
       mat4.identity(tmp2Mat4);
       mat4.scale(tmp2Mat4, tmp2Mat4, [1.0 / dims[0], 1.0 / dims[1], 1.0 / dims[2]]);
@@ -143,22 +146,22 @@ function vtkWebGPUImageMapper(publicAPI, model) {
       }
 
       ptsArray1[axis0] = nSlice;
-      ptsArray1[axis1] = ext[axis1 * 2];
-      ptsArray1[axis2] = ext[axis2 * 2];
+      ptsArray1[axis1] = ext[axis1 * 2] - 0.5;
+      ptsArray1[axis2] = ext[axis2 * 2] - 0.5;
       ptsArray1[3] = 1.0;
       vec4.transformMat4(ptsArray1, ptsArray1, tmp3Mat4);
       model.UBO.setArray('Origin', ptsArray1);
       ptsArray2[axis0] = nSlice;
-      ptsArray2[axis1] = ext[axis1 * 2 + 1];
-      ptsArray2[axis2] = ext[axis2 * 2];
+      ptsArray2[axis1] = ext[axis1 * 2 + 1] + 0.5;
+      ptsArray2[axis2] = ext[axis2 * 2] - 0.5;
       ptsArray2[3] = 1.0;
       vec4.transformMat4(ptsArray2, ptsArray2, tmp3Mat4);
       vec4.subtract(ptsArray2, ptsArray2, ptsArray1);
       ptsArray2[3] = 1.0;
       model.UBO.setArray('Axis1', ptsArray2);
       ptsArray2[axis0] = nSlice;
-      ptsArray2[axis1] = ext[axis1 * 2];
-      ptsArray2[axis2] = ext[axis2 * 2 + 1];
+      ptsArray2[axis1] = ext[axis1 * 2] - 0.5;
+      ptsArray2[axis2] = ext[axis2 * 2 + 1] + 0.5;
       ptsArray2[3] = 1.0;
       vec4.transformMat4(ptsArray2, ptsArray2, tmp3Mat4);
       vec4.subtract(ptsArray2, ptsArray2, ptsArray1);
@@ -179,7 +182,7 @@ function vtkWebGPUImageMapper(publicAPI, model) {
         var target = iComps ? i : 0;
         var cfun = actor.getProperty().getRGBTransferFunction(target);
 
-        if (cfun && actor.getProperty().getUseLookupTableScalarRange()) {
+        if (cfun) {
           var cRange = cfun.getRange();
           cw = cRange[1] - cRange[0];
           cl = 0.5 * (cRange[1] + cRange[0]);

package/Rendering/WebGPU/Pipeline.js

@@ -83,17 +83,6 @@ function vtkWebGPUPipeline(publicAPI, model) {
   publicAPI.bindVertexInput = function (renderEncoder, vInput) {
     vInput.bindBuffers(renderEncoder);
   };
-
-  publicAPI.addDrawCallback = function (cb) {
-    model._drawCallbacks.push(cb);
-  }; // handle anything that needs to be done when drawing
-
-
-  publicAPI.draw = function (encoder) {
-    for (var cb = 0; cb < model._drawCallbacks.length; cb++) {
-      model._drawCallbacks[cb](encoder, publicAPI);
-    }
-  };
 } // ----------------------------------------------------------------------------
 // Object factory
 // ----------------------------------------------------------------------------
@@ -116,7 +105,6 @@ function extend(publicAPI, model) {
   obj(publicAPI, model);
   model.layouts = [];
   model.shaderDescriptions = [];
-  model._drawCallbacks = [];
   get(publicAPI, model, ['handle', 'pipelineDescription']);
   setGet(publicAPI, model, ['device', 'renderEncoder', 'topology', 'vertexState']); // For more macro methods, see "Sources/macros.js"
   // Object specific methods

package/Rendering/WebGPU/RenderEncoder.js

@@ -74,7 +74,6 @@ function vtkWebGPURenderEncoder(publicAPI, model) {
     }
 
     model.boundPipeline = pl;
-    pl.draw(publicAPI);
   };
 
   publicAPI.replaceShaderCode = function (pipeline) {