@luma.gl/gltf 9.3.5 → 9.4.0-alpha.1

package/dist/dist.dev.js

@@ -264,7 +264,7 @@ var __exports__ = (() => {
   }
 
   // ../../node_modules/@loaders.gl/images/dist/lib/utils/version.js
-  var VERSION = true ? "4.4.0" : "latest";
+  var VERSION = true ? "4.4.2" : "latest";
 
   // ../../node_modules/@loaders.gl/images/dist/lib/category-api/image-type.js
   var parseImageNode = globalThis.loaders?.parseImageNode;
@@ -4141,6 +4141,15 @@ var __exports__ = (() => {
   }
 
   // src/parsers/parse-pbr-material.ts
+  var GLTF_ATTRIBUTE_ALIASES = {
+    NORMAL: ["NORMAL", "normals"],
+    TANGENT: ["TANGENT"],
+    TEXCOORD_0: ["TEXCOORD_0", "texCoords"],
+    TEXCOORD_1: ["TEXCOORD_1", "texCoords1"],
+    JOINTS_0: ["JOINTS_0"],
+    WEIGHTS_0: ["WEIGHTS_0"],
+    COLOR_0: ["COLOR_0", "colors"]
+  };
   function parsePBRMaterial(device, material, attributes, options) {
     const parsedMaterial = {
       defines: {
@@ -4174,17 +4183,19 @@ var __exports__ = (() => {
       parsedMaterial.uniforms.scaleDiffBaseMR = [0, 0, 0, 0];
       parsedMaterial.uniforms.scaleFGDSpec = [0, 0, 0, 0];
     }
-    if (attributes["NORMAL"])
+    if (hasGLTFAttribute(attributes, "NORMAL"))
       parsedMaterial.defines["HAS_NORMALS"] = true;
-    if (attributes["TANGENT"] && options?.useTangents)
+    if (hasGLTFAttribute(attributes, "TANGENT") && options?.useTangents) {
       parsedMaterial.defines["HAS_TANGENTS"] = true;
-    if (attributes["TEXCOORD_0"])
+    }
+    if (hasGLTFAttribute(attributes, "TEXCOORD_0"))
       parsedMaterial.defines["HAS_UV"] = true;
-    if (attributes["TEXCOORD_1"])
+    if (hasGLTFAttribute(attributes, "TEXCOORD_1"))
       parsedMaterial.defines["HAS_UV_1"] = true;
-    if (attributes["JOINTS_0"] && attributes["WEIGHTS_0"])
+    if (hasGLTFAttribute(attributes, "JOINTS_0") && hasGLTFAttribute(attributes, "WEIGHTS_0")) {
       parsedMaterial.defines["HAS_SKIN"] = true;
-    if (attributes["COLOR_0"])
+    }
+    if (hasGLTFAttribute(attributes, "COLOR_0"))
       parsedMaterial.defines["HAS_COLORS"] = true;
     if (options?.imageBasedLightingEnvironment)
       parsedMaterial.defines["USE_IBL"] = true;
@@ -4200,19 +4211,19 @@ var __exports__ = (() => {
   }
   function warnOnMissingExpectedAttributes(material, attributes) {
     const uvDependentTextureSlots = getUvDependentTextureSlots(material, 0);
-    if (uvDependentTextureSlots.length > 0 && !attributes["TEXCOORD_0"]) {
+    if (uvDependentTextureSlots.length > 0 && !hasGLTFAttribute(attributes, "TEXCOORD_0")) {
       import_core2.log.warn(
         `glTF material uses ${uvDependentTextureSlots.join(", ")} but primitive is missing TEXCOORD_0; textured shading will sample the default UV coordinates`
       )();
     }
     const uv1DependentTextureSlots = getUvDependentTextureSlots(material, 1);
-    if (uv1DependentTextureSlots.length > 0 && !attributes["TEXCOORD_1"]) {
+    if (uv1DependentTextureSlots.length > 0 && !hasGLTFAttribute(attributes, "TEXCOORD_1")) {
       import_core2.log.warn(
         `glTF material uses ${uv1DependentTextureSlots.join(", ")} with TEXCOORD_1 but primitive is missing TEXCOORD_1; those textures will be skipped`
       )();
     }
     const isUnlitMaterial = Boolean(material.unlit || material.extensions?.KHR_materials_unlit);
-    if (isUnlitMaterial || attributes["NORMAL"]) {
+    if (isUnlitMaterial || hasGLTFAttribute(attributes, "NORMAL")) {
       return;
     }
     const missingNormalReason = material.normalTexture ? "lit PBR shading with normalTexture" : "lit PBR shading";
@@ -4233,6 +4244,9 @@ var __exports__ = (() => {
     }
     return uvDependentTextureSlots;
   }
+  function hasGLTFAttribute(attributes, attributeName) {
+    return GLTF_ATTRIBUTE_ALIASES[attributeName].some((alias) => Boolean(attributes[alias]));
+  }
   function getNestedTextureInfo(material, pathSegments) {
     let value = material;
     for (const pathSegment of pathSegments) {
@@ -4700,7 +4714,7 @@ var __exports__ = (() => {
       )();
       return;
     }
-    if (textureCoordinateSet === 1 && !attributes["TEXCOORD_1"]) {
+    if (textureCoordinateSet === 1 && !hasGLTFAttribute(attributes, "TEXCOORD_1")) {
       import_core2.log.warn(
         `Skipping ${String(uniformName)} because it requires TEXCOORD_1 but the primitive does not provide TEXCOORD_1`
       )();
@@ -5471,7 +5485,7 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
   }
 
   // src/gltf/gltf-animator.ts
-  var import_core7 = __toESM(require_core(), 1);
+  var import_engine5 = __toESM(require_engine(), 1);
 
   // src/gltf/animations/interpolate.ts
   var import_core5 = __toESM(require_core(), 1);
@@ -5560,27 +5574,23 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
   }
 
   // src/gltf/gltf-animator.ts
-  var GLTFSingleAnimator = class {
+  var GLTFAnimationClip = class extends import_engine5.AnimationClipController {
     /** Animation definition being played. */
     animation;
     /** Target scenegraph lookup table. */
     gltfNodeIdToNodeMap;
     /** Materials aligned with the source glTF materials array. */
     materials;
-    /** Playback start time in seconds. */
-    startTime = 0;
-    /** Whether playback is currently enabled. */
-    playing = true;
-    /** Playback speed multiplier. */
-    speed = 1;
     /** Mutable runtime texture-transform state for animated material slots. */
     materialTextureTransformState = /* @__PURE__ */ new Map();
     /** Creates a single-animation controller. */
     constructor(props) {
+      super({ name: props.animation.name || "unnamed" });
       this.animation = props.animation;
       this.gltfNodeIdToNodeMap = props.gltfNodeIdToNodeMap;
       this.materials = props.materials || [];
       this.animation.name ||= "unnamed";
+      this.name = this.animation.name;
       Object.assign(this, props);
       if (this.animation.channels.some((channel) => channel.type !== "node") && !this.materials.length) {
         throw new Error(
@@ -5588,13 +5598,8 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
         );
       }
     }
-    /** Advances the animation to the supplied wall-clock time in milliseconds. */
-    setTime(timeMs) {
-      if (!this.playing) {
-        return;
-      }
-      const absTime = timeMs / 1e3;
-      const time = (absTime - this.startTime) * this.speed;
+    /** Applies the resolved local clip time in seconds. */
+    applyTime(time) {
       this.animation.channels.forEach((channel) => {
         if (channel.type === "node") {
           const { sampler, targetNodeId, path } = channel;
@@ -5627,32 +5632,19 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
       });
     }
   };
-  var GLTFAnimator = class {
-    /** Individual animation controllers. */
-    animations;
+  var GLTFAnimator = class extends import_engine5.Animator {
     /** Creates an animator for the supplied glTF scenegraph. */
     constructor(props) {
-      this.animations = props.animations.map((animation, index) => {
-        const name = animation.name || `Animation-${index}`;
-        return new GLTFSingleAnimator({
-          gltfNodeIdToNodeMap: props.gltfNodeIdToNodeMap,
-          materials: props.materials,
-          animation: { name, channels: animation.channels }
-        });
-      });
-    }
-    /** @deprecated Use .setTime(). Will be removed (deck.gl is using this) */
-    animate(time) {
-      import_core7.log.warn("GLTFAnimator#animate is deprecated. Use GLTFAnimator#setTime instead")();
-      this.setTime(time);
-    }
-    /** Advances every animation to the supplied wall-clock time in milliseconds. */
-    setTime(time) {
-      this.animations.forEach((animation) => animation.setTime(time));
-    }
-    /** Returns the per-animation controllers managed by this animator. */
-    getAnimations() {
-      return this.animations;
+      super(
+        props.animations.map((animation, index) => {
+          const name = animation.name || `Animation-${index}`;
+          return new GLTFAnimationClip({
+            gltfNodeIdToNodeMap: props.gltfNodeIdToNodeMap,
+            materials: props.materials,
+            animation: { name, channels: animation.channels }
+          });
+        })
+      );
     }
   };
   function applyMaterialAnimationValue(material, channel, value) {
@@ -5728,7 +5720,7 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
   }
 
   // src/parsers/parse-gltf-animations.ts
-  var import_core8 = __toESM(require_core(), 1);
+  var import_core7 = __toESM(require_core(), 1);
 
   // src/gltf/gltf-extension-support.ts
   var UNKNOWN_EXTENSION_SUPPORT = {
@@ -5984,7 +5976,7 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
   function parseAnimationPointerChannel(gltf, target, sampler) {
     const pointer = target.extensions?.["KHR_animation_pointer"]?.pointer;
     if (typeof pointer !== "string" || !pointer.startsWith("/")) {
-      import_core8.log.warn("KHR_animation_pointer channel is missing a valid JSON pointer and will be skipped")();
+      import_core7.log.warn("KHR_animation_pointer channel is missing a valid JSON pointer and will be skipped")();
       return null;
     }
     const pointerSegments = splitJsonPointer(pointer);
@@ -6012,7 +6004,7 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
     const nodeIndex = Number(pointerSegments[1]);
     const targetNode = gltf.nodes[nodeIndex];
     if (!Number.isInteger(nodeIndex) || !targetNode) {
-      import_core8.log.warn(
+      import_core7.log.warn(
         `KHR_animation_pointer target ${pointer} references a missing node and will be skipped`
       )();
       return null;
@@ -6026,7 +6018,7 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
       return null;
     }
     if (path === "weights") {
-      import_core8.log.warn(
+      import_core7.log.warn(
         `KHR_animation_pointer target ${pointer} will be skipped because morph weights are not implemented in GLTFAnimator`
       )();
       return null;
@@ -6049,7 +6041,7 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
     const materialIndex = Number(pointerSegments[1]);
     const material = gltf.materials[materialIndex];
     if (!Number.isInteger(materialIndex) || !material) {
-      import_core8.log.warn(
+      import_core7.log.warn(
         `KHR_animation_pointer target ${pointer} references a missing material and will be skipped`
       )();
       return null;
@@ -6238,7 +6230,7 @@ fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4f {
     return extensionIndex >= 0 && extensionName ? extensionName : null;
   }
   function warnUnsupportedAnimationPointer(pointer, reason) {
-    import_core8.log.warn(`KHR_animation_pointer target ${pointer} will be skipped because ${reason}`)();
+    import_core7.log.warn(`KHR_animation_pointer target ${pointer} will be skipped because ${reason}`)();
   }
   function accessorToJsArray1D(accessor, accessorCache) {
     if (accessorCache.has(accessor)) {