@kitware/vtk.js 32.7.1 → 32.7.2

package/IO/Geometry/GLTFImporter/Animations.js

@@ -133,7 +133,7 @@ function createAnimationSampler(glTFSampler) {
         result = cubicSplineInterpolate(path, t0, t1, i0, i1, time);
         break;
       default:
-        throw new Error(`Unknown interpolation method: ${glTFSampler.interpolation}`);
+        vtkWarningMacro(`Unknown interpolation method: ${glTFSampler.interpolation}`);
     }
     return result;
   }

package/IO/Geometry/GLTFImporter/Parser.js

@@ -101,7 +101,7 @@ class GLTFParser {
     if (mesh.primitives) {
       mesh.primitives = mesh.primitives.map((primitive, idx) => {
         const attributes = primitive.attributes;
-        primitive.name = `submesh-${idx}`;
+        primitive.name = `primitive-${idx}`;
         primitive.attributes = {};
         for (const attribute in attributes) {
           const attr = SEMANTIC_ATTRIBUTE_MAP[attribute];

package/IO/Geometry/GLTFImporter/Reader.js

@@ -30,18 +30,15 @@ async function parseGLTF(gltf, options) {
 }
 
 /**
- * Creates VTK polydata from a GLTF mesh
- * @param {GLTFMesh} mesh - The GLTF mesh
+ * Creates VTK polydata from a GLTF mesh primitive
+ * @param {GLTFPrimitive} primitive - The GLTF mesh primitive
  * @returns {vtkPolyData} The created VTK polydata
  */
-async function createPolyDataFromGLTFMesh(mesh) {
-  const primitive = mesh.primitives[0]; // For simplicity, we'll just use the first primitive
-
+async function createPolyDataFromGLTFMesh(primitive) {
   if (!primitive || !primitive.attributes) {
-    vtkWarningMacro('Mesh has no position data, skipping');
+    vtkWarningMacro('Primitive has no position data, skipping');
     return null;
   }
-  const mode = primitive.mode;
   if (primitive.extensions?.KHR_draco_mesh_compression) {
     return handleKHRDracoMeshCompression(primitive.extensions.KHR_draco_mesh_compression);
   }
@@ -118,10 +115,10 @@ async function createPolyDataFromGLTFMesh(mesh) {
   });
 
   // Handle indices if available
-  if (primitive.indices !== undefined) {
+  if (primitive.indices != null) {
     const indices = primitive.indices.value;
     const nCells = indices.length - 2;
-    switch (mode) {
+    switch (primitive.mode) {
       case MODES.GL_LINE_STRIP:
       case MODES.GL_TRIANGLE_STRIP:
       case MODES.GL_LINE_LOOP:
@@ -135,7 +132,7 @@ async function createPolyDataFromGLTFMesh(mesh) {
         }
     }
   }
-  switch (mode) {
+  switch (primitive.mode) {
     case MODES.GL_TRIANGLES:
     case MODES.GL_TRIANGLE_FAN:
       polyData.setPolys(cells);
@@ -159,7 +156,7 @@ async function createPolyDataFromGLTFMesh(mesh) {
 
 /**
  * Creates a VTK property from a GLTF material
- * @param {*} model - The vtk model object
+ * @param {object} model - The vtk model object
  * @param {GLTFMaterial} material - The GLTF material
  * @param {vtkActor} actor - The VTK actor
  */
@@ -169,15 +166,15 @@ async function createPropertyFromGLTFMaterial(model, material, actor) {
   const emissiveFactor = material.emissiveFactor;
   const property = actor.getProperty();
   const pbr = material.pbrMetallicRoughness;
-  if (pbr !== undefined) {
+  if (pbr != null) {
     if (!pbr?.metallicFactor || pbr?.metallicFactor <= 0 || pbr?.metallicFactor >= 1) {
-      vtkWarningMacro('Invalid material.pbrMetallicRoughness.metallicFactor value. Using default value instead.');
+      vtkDebugMacro('Invalid material.pbrMetallicRoughness.metallicFactor value. Using default value instead.');
     } else metallicFactor = pbr.metallicFactor;
     if (!pbr?.roughnessFactor || pbr?.roughnessFactor <= 0 || pbr?.roughnessFactor >= 1) {
-      vtkWarningMacro('Invalid material.pbrMetallicRoughness.roughnessFactor value. Using default value instead.');
+      vtkDebugMacro('Invalid material.pbrMetallicRoughness.roughnessFactor value. Using default value instead.');
     } else roughnessFactor = pbr.roughnessFactor;
     const color = pbr.baseColorFactor;
-    if (color !== undefined) {
+    if (color != null) {
       property.setDiffuseColor(color[0], color[1], color[2]);
       property.setOpacity(color[3]);
     }
@@ -187,7 +184,7 @@ async function createPropertyFromGLTFMaterial(model, material, actor) {
     if (pbr.baseColorTexture) {
       pbr.baseColorTexture.extensions;
       const tex = pbr.baseColorTexture.texture;
-      if (tex.extensions !== undefined) {
+      if (tex.extensions != null) {
         const extensionsNames = Object.keys(tex.extensions);
         extensionsNames.forEach(extensionName => {
           // TODO: Handle KHR_texture_basisu extension
@@ -243,7 +240,7 @@ async function createPropertyFromGLTFMaterial(model, material, actor) {
       property.setEmissionTexture(emissiveTex);
 
       // Handle mutiple Uvs
-      if (material.emissiveTexture.texCoord !== undefined) {
+      if (material.emissiveTexture.texCoord != null) {
         const pd = actor.getMapper().getInputData().getPointData();
         pd.setActiveTCoords(`TEXCOORD_${material.emissiveTexture.texCoord}`);
       }
@@ -257,14 +254,14 @@ async function createPropertyFromGLTFMaterial(model, material, actor) {
       const normalImage = await loadImage(tex.source);
       const normalTex = createVTKTextureFromGLTFTexture(normalImage, sampler);
       property.setNormalTexture(normalTex);
-      if (material.normalTexture.scale !== undefined) {
+      if (material.normalTexture.scale != null) {
         property.setNormalStrength(material.normalTexture.scale);
       }
     }
   }
 
   // Material extensions
-  if (material.extensions !== undefined) {
+  if (material.extensions != null) {
     const extensionsNames = Object.keys(material.extensions);
     extensionsNames.forEach(extensionName => {
       const extension = material.extensions[extensionName];
@@ -291,17 +288,17 @@ async function createPropertyFromGLTFMaterial(model, material, actor) {
 
 /**
  * Handles primitive extensions
+ * @param {string} nodeId The GLTF node id
  * @param {*} extensions The extensions object
  * @param {*} model The vtk model object
- * @param {GLTFNode} node The GLTF node
  */
-function handlePrimitiveExtensions(extensions, model, node) {
+function handlePrimitiveExtensions(nodeId, extensions, model) {
   const extensionsNames = Object.keys(extensions);
   extensionsNames.forEach(extensionName => {
     const extension = extensions[extensionName];
     switch (extensionName) {
       case 'KHR_materials_variants':
-        model.variantMappings.set(node.id, extension.mappings);
+        model.variantMappings.set(nodeId, extension.mappings);
         break;
       default:
         vtkWarningMacro(`Unhandled extension: ${extensionName}`);
@@ -314,33 +311,43 @@ function handlePrimitiveExtensions(extensions, model, node) {
  * @param {GLTFMesh} mesh - The GLTF mesh
  * @returns {vtkActor} The created VTK actor
  */
-async function createActorFromGTLFNode(model, node, worldMatrix) {
+async function createActorFromGTLFNode(worldMatrix) {
   const actor = vtkActor.newInstance();
   const mapper = vtkMapper.newInstance();
   mapper.setColorModeToDirectScalars();
   actor.setMapper(mapper);
   actor.setUserMatrix(worldMatrix);
-  if (node.mesh !== undefined) {
-    const polyData = await createPolyDataFromGLTFMesh(node.mesh);
-    mapper.setInputData(polyData);
-    const primitive = node.mesh.primitives[0]; // the first one for now
+  const polydata = vtkPolyData.newInstance();
+  mapper.setInputData(polydata);
+  return actor;
+}
 
-    // Support for materials
-    if (primitive.material !== undefined) {
-      await createPropertyFromGLTFMaterial(model, primitive.material, actor);
-    }
-    if (primitive.extensions !== undefined) {
-      handlePrimitiveExtensions(primitive.extensions, model, node);
-    }
-  } else {
-    const polyData = vtkPolyData.newInstance();
-    mapper.setInputData(polyData);
+/**
+ * Creates a VTK actor from a GLTF mesh
+ * @param {GLTFMesh} mesh - The GLTF mesh
+ * @returns {vtkActor} The created VTK actor
+ */
+async function createActorFromGTLFPrimitive(model, primitive, worldMatrix) {
+  const actor = vtkActor.newInstance();
+  const mapper = vtkMapper.newInstance();
+  mapper.setColorModeToDirectScalars();
+  actor.setMapper(mapper);
+  actor.setUserMatrix(worldMatrix);
+  const polydata = await createPolyDataFromGLTFMesh(primitive);
+  mapper.setInputData(polydata);
+
+  // Support for materials
+  if (primitive.material != null) {
+    await createPropertyFromGLTFMaterial(model, primitive.material, actor);
+  }
+  if (primitive.extensions != null) {
+    handlePrimitiveExtensions(`${primitive.name}`, primitive.extensions, model);
   }
   return actor;
 }
 
 /**
- *
+ * Creates a GLTF animation object
  * @param {GLTFAnimation} animation
  * @returns
  */
@@ -366,7 +373,7 @@ function getTransformationMatrix(node) {
   const translation = node.translation ?? vec3.create();
   const rotation = node.rotation ?? quat.create();
   const scale = node.scale ?? vec3.fromValues(1.0, 1.0, 1.0);
-  const matrix = node.matrix !== undefined ? mat4.clone(node.matrix) : mat4.fromRotationTranslationScale(mat4.create(), rotation, translation, scale);
+  const matrix = node.matrix != null ? mat4.clone(node.matrix) : mat4.fromRotationTranslationScale(mat4.create(), rotation, translation, scale);
   return matrix;
 }
 
@@ -384,13 +391,17 @@ async function processNode(node, model) {
   const worldMatrix = mat4.multiply(mat4.create(), parentMatrix, node.transform);
 
   // Create actor for the current node
-  const actor = await createActorFromGTLFNode(model, node, worldMatrix);
-  if (actor) {
-    actor.setUserMatrix(worldMatrix);
+  if (node.mesh != null) {
+    const nodeActor = await createActorFromGTLFNode(worldMatrix);
     if (parentActor) {
-      actor.setParentProp(parentActor);
+      nodeActor.setParentProp(parentActor);
     }
-    model.actors.set(node.id, actor);
+    model.actors.set(`${node.id}`, nodeActor);
+    await Promise.all(node.mesh.primitives.map(async (primitive, i) => {
+      const actor = await createActorFromGTLFPrimitive(model, primitive, worldMatrix);
+      actor.setParentProp(nodeActor);
+      model.actors.set(`${node.id}_${primitive.name}`, actor);
+    }));
   }
 
   // Handle KHRLightsPunctual extension

package/IO/Geometry/GLTFImporter/Utils.js

@@ -153,7 +153,7 @@ function createVTKTextureFromGLTFTexture(image, sampler, extensions) {
         texture.setInterpolate(true);
       }
     } else {
-      texture.MipmapOn();
+      texture.setMipLevel(8);
       texture.setInterpolate(true);
       texture.setEdgeClamp(true);
     }

package/package.json

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