@lovelace_lol/loom3 1.0.2 → 1.0.3

package/dist/index.js

@@ -129,6 +129,18 @@ var BakedAnimationController = class {
     __publicField(this, "actionIdToClip", /* @__PURE__ */ new Map());
     this.host = host;
   }
+  getMeshNamesForAU(auId, config, explicitMeshNames) {
+    if (explicitMeshNames && explicitMeshNames.length > 0) {
+      return explicitMeshNames;
+    }
+    if (typeof this.host.getMeshNamesForAU === "function") {
+      return this.host.getMeshNamesForAU(auId) || [];
+    }
+    const facePart = config.auInfo?.[String(auId)]?.facePart;
+    if (facePart === "Tongue") return config.morphToMesh?.tongue || [];
+    if (facePart === "Eye") return config.morphToMesh?.eye || [];
+    return config.morphToMesh?.face || [];
+  }
   update(dtSeconds) {
     if (this.animationMixer) {
       this.animationMixer.update(dtSeconds);
@@ -429,6 +441,7 @@ var BakedAnimationController = class {
             this.addMorphTracks(tracks, visemeKey, keyframes, intensityScale, meshNames);
           }
         } else {
+          const auMeshNames = this.getMeshNamesForAU(auId, config, meshNames);
           const morphsBySide = config.auToMorphs[auId];
           const mixWeight = this.host.isMixedAU(auId) ? this.host.getAUMixWeight(auId) : 1;
           const leftKeys = morphsBySide?.left ?? [];
@@ -439,26 +452,26 @@ var BakedAnimationController = class {
             let effectiveScale = intensityScale * mixWeight;
             if (curveBalance > 0) effectiveScale *= 1 - curveBalance;
             if (typeof morphKey === "number") {
-              this.addMorphIndexTracks(tracks, morphKey, keyframes, effectiveScale, meshNames);
+              this.addMorphIndexTracks(tracks, morphKey, keyframes, effectiveScale, auMeshNames);
             } else {
-              this.addMorphTracks(tracks, morphKey, keyframes, effectiveScale, meshNames);
+              this.addMorphTracks(tracks, morphKey, keyframes, effectiveScale, auMeshNames);
             }
           }
           for (const morphKey of rightKeys) {
             let effectiveScale = intensityScale * mixWeight;
             if (curveBalance < 0) effectiveScale *= 1 + curveBalance;
             if (typeof morphKey === "number") {
-              this.addMorphIndexTracks(tracks, morphKey, keyframes, effectiveScale, meshNames);
+              this.addMorphIndexTracks(tracks, morphKey, keyframes, effectiveScale, auMeshNames);
             } else {
-              this.addMorphTracks(tracks, morphKey, keyframes, effectiveScale, meshNames);
+              this.addMorphTracks(tracks, morphKey, keyframes, effectiveScale, auMeshNames);
             }
           }
           for (const morphKey of centerKeys) {
             const effectiveScale = intensityScale * mixWeight;
             if (typeof morphKey === "number") {
-              this.addMorphIndexTracks(tracks, morphKey, keyframes, effectiveScale, meshNames);
+              this.addMorphIndexTracks(tracks, morphKey, keyframes, effectiveScale, auMeshNames);
             } else {
-              this.addMorphTracks(tracks, morphKey, keyframes, effectiveScale, meshNames);
+              this.addMorphTracks(tracks, morphKey, keyframes, effectiveScale, auMeshNames);
             }
           }
         }
@@ -846,11 +859,9 @@ var BakedAnimationController = class {
   }
   addMorphTracks(tracks, morphKey, keyframes, intensityScale, meshNames) {
     const config = this.host.getConfig();
-    const meshes = this.host.getMeshes();
     const hasExplicitMeshes = !!(meshNames && meshNames.length > 0);
     const targetMeshNames = hasExplicitMeshes ? meshNames : config.morphToMesh?.face || [];
-    const targetMeshes = targetMeshNames.length ? targetMeshNames.map((name) => this.host.getMeshByName(name)).filter(Boolean) : meshes;
-    let added = false;
+    const targetMeshes = targetMeshNames.length ? targetMeshNames.map((name) => this.host.getMeshByName(name)).filter(Boolean) : [];
     const addTrackForMesh = (mesh) => {
       const dict = mesh.morphTargetDictionary;
       if (!dict || dict[morphKey] === void 0) return;
@@ -864,25 +875,17 @@ var BakedAnimationController = class {
       const trackName = `${mesh.uuid}.morphTargetInfluences[${morphIndex}]`;
       const track = new NumberKeyframeTrack(trackName, times, values);
       tracks.push(track);
-      added = true;
     };
     for (const mesh of targetMeshes) {
       addTrackForMesh(mesh);
     }
-    if (!added && !hasExplicitMeshes && targetMeshes !== meshes) {
-      for (const mesh of meshes) {
-        addTrackForMesh(mesh);
-      }
-    }
   }
   addMorphIndexTracks(tracks, morphIndex, keyframes, intensityScale, meshNames) {
     if (!Number.isInteger(morphIndex) || morphIndex < 0) return;
     const config = this.host.getConfig();
-    const meshes = this.host.getMeshes();
     const hasExplicitMeshes = !!(meshNames && meshNames.length > 0);
     const targetMeshNames = hasExplicitMeshes ? meshNames : config.morphToMesh?.face || [];
-    const targetMeshes = targetMeshNames.length ? targetMeshNames.map((name) => this.host.getMeshByName(name)).filter(Boolean) : meshes;
-    let added = false;
+    const targetMeshes = targetMeshNames.length ? targetMeshNames.map((name) => this.host.getMeshByName(name)).filter(Boolean) : [];
     const addTrackForMesh = (mesh) => {
       const infl = mesh.morphTargetInfluences;
       if (!infl || morphIndex < 0 || morphIndex >= infl.length) return;
@@ -895,16 +898,10 @@ var BakedAnimationController = class {
       const trackName = `${mesh.uuid}.morphTargetInfluences[${morphIndex}]`;
       const track = new NumberKeyframeTrack(trackName, times, values);
       tracks.push(track);
-      added = true;
     };
     for (const mesh of targetMeshes) {
       addTrackForMesh(mesh);
     }
-    if (!added && !hasExplicitMeshes && targetMeshes !== meshes) {
-      for (const mesh of meshes) {
-        addTrackForMesh(mesh);
-      }
-    }
   }
   ensureMixer() {
     const model = this.host.getModel();
@@ -3508,6 +3505,7 @@ var _Loom3 = class _Loom3 {
       getModel: () => this.model,
       getMeshes: () => this.meshes,
       getMeshByName: (name) => this.meshByName.get(name),
+      getMeshNamesForAU: (auId) => this.getMeshNamesForAU(auId),
       getBones: () => this.bones,
       getConfig: () => this.config,
       getCompositeRotations: () => this.compositeRotations,
@@ -3553,15 +3551,11 @@ var _Loom3 = class _Loom3 {
     this.resolvedFaceMeshes = this.resolveFaceMeshes(this.meshes);
     this.faceMesh = this.resolvedFaceMeshes.length > 0 ? this.meshByName.get(this.resolvedFaceMeshes[0]) || null : null;
     if (!this.config.morphToMesh?.face || this.config.morphToMesh.face.length === 0) {
-      const morphMeshNames = this.meshes.filter((m) => {
-        const infl = m.morphTargetInfluences;
-        const dict = m.morphTargetDictionary;
-        return Array.isArray(infl) && infl.length > 0 || dict && Object.keys(dict).length > 0;
-      }).map((m) => m.name).filter(Boolean);
-      if (morphMeshNames.length > 0) {
+      const faceMeshNames = this.resolvedFaceMeshes.filter((name) => this.meshByName.has(name));
+      if (faceMeshNames.length > 0) {
         this.config.morphToMesh = {
           ...this.config.morphToMesh,
-          face: Array.from(new Set(morphMeshNames))
+          face: Array.from(new Set(faceMeshNames))
         };
       }
     }