@lovelace_lol/loom3 1.0.43 → 1.0.44

package/dist/index.cjs

@@ -74,6 +74,9 @@ function bindingTargets(binding) {
   if (targets && targets.length > 0) return targets;
   return binding.morph !== void 0 && binding.morph !== "" ? [binding.morph] : [];
 }
+function normalizeBindingWeight(weight) {
+  return Number.isFinite(weight) ? Math.max(0, weight ?? 1) : 1;
+}
 function getProfileVisemeSlots(profile) {
   if (profile.visemeSlots && profile.visemeSlots.length > 0) {
     return [...profile.visemeSlots].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
@@ -99,6 +102,23 @@ function compileVisemeKeys(profile) {
     return target ?? profile.visemeKeys?.[index] ?? "";
   });
 }
+function getVisemeBindingTargets(profile, visemeIndex) {
+  const slots = getProfileVisemeSlots(profile);
+  const slot = slots[visemeIndex];
+  const binding = slot ? profile.visemeBindings?.[slot.id] : void 0;
+  const boundTargets = binding?.targets?.filter((target) => target.morph !== void 0 && target.morph !== "").map((target) => ({
+    morph: target.morph,
+    weight: normalizeBindingWeight(target.weight)
+  }));
+  if (boundTargets && boundTargets.length > 0) {
+    return boundTargets;
+  }
+  if (binding?.morph !== void 0 && binding.morph !== "") {
+    return [{ morph: binding.morph, weight: 1 }];
+  }
+  const legacyTarget = profile.visemeKeys?.[visemeIndex];
+  return legacyTarget !== void 0 && legacyTarget !== "" ? [{ morph: legacyTarget, weight: 1 }] : [];
+}
 function getVisemeJawAmounts(profile) {
   const slots = getProfileVisemeSlots(profile);
   if (slots.length === 0) return profile.visemeJawAmounts ? [...profile.visemeJawAmounts] : void 0;
@@ -1735,12 +1755,13 @@ var BakedAnimationController = class {
     const globalBalance = options?.balance ?? 0;
     const balanceMap = options?.balanceMap;
     const meshNames = options?.meshNames;
+    const visemeSlotCount = getProfileVisemeSlots(config).length;
     let maxTime = 0;
     const isNumericAU = (id) => /^\d+$/.test(id);
     const isVisemeIndex = (id) => {
       if (options?.snippetCategory !== "visemeSnippet") return false;
       const num = Number(id);
-      return !Number.isNaN(num) && num >= 0 && num < config.visemeKeys.length;
+      return !Number.isNaN(num) && num >= 0 && num < visemeSlotCount;
     };
     const sampleAt = (arr, t) => {
       if (!arr.length) return 0;
@@ -1778,11 +1799,13 @@ var BakedAnimationController = class {
         const auId = Number(curveId);
         if (isVisemeIndex(curveId)) {
           const visemeMeshNames = this.getMeshNamesForViseme(config, meshNames);
-          const visemeKey = config.visemeKeys[auId];
-          if (typeof visemeKey === "number") {
-            this.addMorphIndexTracks(tracks, visemeKey, keyframes, intensityScale, visemeMeshNames);
-          } else if (visemeKey) {
-            this.addMorphTracks(tracks, visemeKey, keyframes, intensityScale, visemeMeshNames);
+          for (const target of getVisemeBindingTargets(config, auId)) {
+            const effectiveScale = intensityScale * target.weight;
+            if (typeof target.morph === "number") {
+              this.addMorphIndexTracks(tracks, target.morph, keyframes, effectiveScale, visemeMeshNames);
+            } else if (target.morph) {
+              this.addMorphTracks(tracks, target.morph, keyframes, effectiveScale, visemeMeshNames);
+            }
           }
         } else {
           const auMeshNames = this.getMeshNamesForAU(auId, config, meshNames);
@@ -1825,7 +1848,7 @@ var BakedAnimationController = class {
     }
     const autoVisemeJaw = options?.autoVisemeJaw !== false;
     const jawScale = options?.jawScale ?? 1;
-    const visemeJawAmounts = config.visemeJawAmounts;
+    const visemeJawAmounts = getVisemeJawAmounts(config);
     if (autoVisemeJaw && jawScale > 0 && visemeJawAmounts && options?.snippetCategory === "visemeSnippet" && keyframeTimes.length > 0) {
       const bones = this.host.getBones();
       const jawEntry = bones["JAW"];
@@ -1833,7 +1856,7 @@ var BakedAnimationController = class {
         const jawValues = [];
         for (const t of keyframeTimes) {
           let jawAmount = 0;
-          for (let visemeIdx = 0; visemeIdx < config.visemeKeys.length; visemeIdx++) {
+          for (let visemeIdx = 0; visemeIdx < visemeSlotCount; visemeIdx++) {
             const visemeCurve = curves[String(visemeIdx)];
             if (!visemeCurve) continue;
             const visemeValue = clampIntensity(sampleAt(visemeCurve, t) * intensityScale);
@@ -5361,10 +5384,15 @@ var _Loom3 = class _Loom3 {
       };
       this.resolvedAUMorphTargets.set(auId, resolved);
     }
-    for (let i = 0; i < (this.config.visemeKeys || []).length; i += 1) {
-      const key = this.config.visemeKeys[i];
+    for (let i = 0; i < getProfileVisemeSlots(this.config).length; i += 1) {
       const visemeMeshNames = this.getMeshNamesForViseme();
-      const targets = typeof key === "number" ? this.resolveMorphTargetsByIndex(key, visemeMeshNames) : this.resolveMorphTargets(key, visemeMeshNames);
+      const targets = [];
+      for (const bindingTarget of getVisemeBindingTargets(this.config, i)) {
+        const resolved = typeof bindingTarget.morph === "number" ? this.resolveMorphTargetsByIndex(bindingTarget.morph, visemeMeshNames) : this.resolveMorphTargets(bindingTarget.morph, visemeMeshNames);
+        for (const target of resolved) {
+          targets.push({ ...target, weight: bindingTarget.weight });
+        }
+      }
       this.resolvedVisemeTargets[i] = targets;
     }
   }
@@ -5832,46 +5860,33 @@ var _Loom3 = class _Loom3 {
   // VISEME CONTROL
   // ============================================================================
   setViseme(visemeIndex, value, jawScale = 1) {
-    if (visemeIndex < 0 || visemeIndex >= this.config.visemeKeys.length) return;
+    if (visemeIndex < 0 || visemeIndex >= this.visemeValues.length) return;
     const val = clamp012(value);
     this.visemeValues[visemeIndex] = val;
     this.visemeJawScales[visemeIndex] = jawScale;
-    const targets = this.resolvedVisemeTargets[visemeIndex];
-    if (targets && targets.length > 0) {
-      this.applyMorphTargets(targets, val);
-    } else {
-      const morphKey = this.config.visemeKeys[visemeIndex];
-      const visemeMeshNames = this.getMeshNamesForViseme();
-      if (typeof morphKey === "number") {
-        this.setMorphInfluence(morphKey, val, visemeMeshNames);
-      } else if (typeof morphKey === "string") {
-        this.setMorph(morphKey, val, visemeMeshNames);
-      }
-    }
-    const jawAmount = this.getVisemeJawAmount(visemeIndex) * val * jawScale;
-    if (Math.abs(jawScale) > 1e-6 && Math.abs(jawAmount) > 1e-6) {
-      this.updateBoneRotation("JAW", "pitch", jawAmount);
-    }
+    this.applyVisemeRuntimeState();
   }
   transitionViseme(visemeIndex, to, durationMs = 80, jawScale = 1) {
-    if (visemeIndex < 0 || visemeIndex >= this.config.visemeKeys.length) {
+    if (visemeIndex < 0 || visemeIndex >= this.visemeValues.length) {
       return { promise: Promise.resolve(), pause: () => {
       }, resume: () => {
       }, cancel: () => {
       } };
     }
-    const morphKey = this.config.visemeKeys[visemeIndex];
     const target = clamp012(to);
-    this.visemeValues[visemeIndex] = target;
+    const from = this.visemeValues[visemeIndex] ?? 0;
     this.visemeJawScales[visemeIndex] = jawScale;
-    const visemeMeshNames = this.getMeshNamesForViseme();
-    const morphHandle = typeof morphKey === "number" ? this.transitionMorphInfluence(morphKey, target, durationMs, visemeMeshNames) : this.transitionMorph(morphKey, target, durationMs, visemeMeshNames);
-    const jawAmount = this.getVisemeJawAmount(visemeIndex) * target * jawScale;
-    if (Math.abs(jawScale) <= 1e-6 || Math.abs(jawAmount) <= 1e-6) {
-      return morphHandle;
-    }
-    const jawHandle = this.transitionBoneRotation("JAW", "pitch", jawAmount, durationMs);
-    return this.combineHandles([morphHandle, jawHandle]);
+    return this.animation.addTransition(
+      `viseme_value_${visemeIndex}`,
+      from,
+      target,
+      durationMs,
+      (value) => {
+        this.visemeValues[visemeIndex] = clamp012(value);
+        this.visemeJawScales[visemeIndex] = jawScale;
+        this.applyVisemeRuntimeState();
+      }
+    );
   }
   setVisemeById(slotId, value, jawScale = 1) {
     const index = getVisemeSlotIndex(this.config, slotId);
@@ -5935,8 +5950,9 @@ var _Loom3 = class _Loom3 {
   }
   resetToNeutral() {
     this.auValues = {};
-    this.visemeValues = new Array(this.config.visemeKeys.length).fill(0);
-    this.visemeJawScales = new Array(this.config.visemeKeys.length).fill(1);
+    const visemeCount = getProfileVisemeSlots(this.config).length;
+    this.visemeValues = new Array(visemeCount).fill(0);
+    this.visemeJawScales = new Array(visemeCount).fill(1);
     this.translations = {};
     this.initBoneRotations();
     this.clearTransitions();
@@ -5970,11 +5986,7 @@ var _Loom3 = class _Loom3 {
       if (Number.isNaN(auId)) continue;
       this.setAU(auId, value, this.auBalances[auId]);
     }
-    for (let visemeIndex = 0; visemeIndex < this.visemeValues.length; visemeIndex += 1) {
-      const value = this.visemeValues[visemeIndex] ?? 0;
-      if (value <= 0) continue;
-      this.setViseme(visemeIndex, value, this.visemeJawScales[visemeIndex] ?? 1);
-    }
+    this.applyVisemeRuntimeState();
     if (this.model) {
       this.flushPendingComposites();
       this.model.updateMatrixWorld(true);
@@ -6332,6 +6344,37 @@ var _Loom3 = class _Loom3 {
       target.infl[target.idx] = val;
     }
   }
+  applyVisemeRuntimeState() {
+    for (const targets of this.resolvedVisemeTargets) {
+      for (const target of targets || []) {
+        if (target.idx < target.infl.length) {
+          target.infl[target.idx] = 0;
+        }
+      }
+    }
+    for (let index = 0; index < this.visemeValues.length; index += 1) {
+      const value = clamp012(this.visemeValues[index] ?? 0);
+      if (value <= 1e-6) continue;
+      const targets = this.resolvedVisemeTargets[index] || [];
+      for (const target of targets) {
+        if (target.idx >= target.infl.length) continue;
+        const weighted = clamp012(value * target.weight);
+        target.infl[target.idx] = Math.max(target.infl[target.idx] ?? 0, weighted);
+      }
+    }
+    this.updateBoneRotation("JAW", "pitch", this.getActiveVisemeJawAmount());
+  }
+  getActiveVisemeJawAmount() {
+    let jawAmount = 0;
+    for (let index = 0; index < this.visemeValues.length; index += 1) {
+      const value = clamp012(this.visemeValues[index] ?? 0);
+      if (value <= 1e-6) continue;
+      const jawScale = this.visemeJawScales[index] ?? 1;
+      if (Math.abs(jawScale) <= 1e-6) continue;
+      jawAmount = Math.max(jawAmount, this.getVisemeJawAmount(index) * value * jawScale);
+    }
+    return jawAmount;
+  }
   getMorphValue(key) {
     if (this.faceMesh) {
       const dict = this.faceMesh.morphTargetDictionary;
@@ -6517,7 +6560,7 @@ var _Loom3 = class _Loom3 {
     return meshNames?.length ? `idx:${index}@${meshNames.join(",")}` : `idx:${index}`;
   }
   syncVisemeRuntimeState() {
-    const visemeCount = this.config.visemeKeys.length;
+    const visemeCount = getProfileVisemeSlots(this.config).length;
     this.visemeValues = Array.from(
       { length: visemeCount },
       (_, index) => this.visemeValues[index] ?? 0
@@ -8640,6 +8683,7 @@ exports.getModelForwardDirection = getModelForwardDirection;
 exports.getPreset = getPreset;
 exports.getPresetWithProfile = getPresetWithProfile;
 exports.getProfileVisemeSlots = getProfileVisemeSlots;
+exports.getVisemeBindingTargets = getVisemeBindingTargets;
 exports.getVisemeJawAmounts = getVisemeJawAmounts;
 exports.getVisemeSlotIndex = getVisemeSlotIndex;
 exports.hasLeftRightMorphs = hasLeftRightMorphs;