@lovelace_lol/loom3 1.0.43 → 1.0.45

package/dist/index.js

@@ -53,6 +53,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));
@@ -78,6 +81,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;
@@ -1714,12 +1734,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;
@@ -1757,11 +1778,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);
@@ -1804,7 +1827,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"];
@@ -1812,7 +1835,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);
@@ -5340,10 +5363,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;
     }
   }
@@ -5811,46 +5839,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);
@@ -5914,8 +5929,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();
@@ -5949,11 +5965,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);
@@ -6311,6 +6323,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;
@@ -6496,7 +6539,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
@@ -6968,7 +7011,7 @@ function normalizeRegionTree(regions, disabledNames) {
   });
 }
 
-// src/characters/extendCharacterConfigWithPreset.ts
+// src/profiles/resolveProfileConfig.ts
 var PROFILE_OVERRIDE_KEYS = [
   "name",
   "animalType",
@@ -7075,7 +7118,7 @@ function mergeRegion(base, override) {
     } : void 0
   };
 }
-function mergeRegionsByName(base, override) {
+function mergeProfileRegionsByName(base, override) {
   if (!base && !override) return void 0;
   const merged = /* @__PURE__ */ new Map();
   for (const region of base ?? []) {
@@ -7090,6 +7133,10 @@ function mergeRegionsByName(base, override) {
 function getAnnotationRegions(value) {
   return Array.isArray(value) ? value : void 0;
 }
+var mergeRegionsByName = mergeProfileRegionsByName;
+function getProfilePresetId(config) {
+  return config.profilePresetId ?? config.presetId ?? config.baseProfileId ?? config.auPresetType;
+}
 function getLegacyNestedOverrides(config) {
   return isPlainObject2(config.profile) ? config.profile : {};
 }
@@ -7097,12 +7144,12 @@ function getLegacyRuntimeRegions(config) {
   return Array.isArray(config.regions) && config.regions.length > 0 ? config.regions : void 0;
 }
 function getCanonicalAnnotationOverrides(config) {
-  return mergeRegionsByName(
+  return mergeProfileRegionsByName(
     getAnnotationRegions(getLegacyNestedOverrides(config).annotationRegions),
     getAnnotationRegions(config.annotationRegions)
   );
 }
-function extractProfileOverrides(config) {
+function extractLegacyCharacterProfileOverrides(config) {
   const topLevelConfig = config;
   const legacyNestedOverrides = getLegacyNestedOverrides(config);
   const canonicalAnnotationOverrides = getCanonicalAnnotationOverrides(config);
@@ -7125,12 +7172,18 @@ function extractProfileOverrides(config) {
   }
   return overrides;
 }
-function applyCharacterProfileToPreset(config) {
-  const presetType = config.auPresetType;
+function extractProfileOverrides(config) {
+  return extractLegacyCharacterProfileOverrides(config);
+}
+function resolveProfileFromPreset(config) {
+  const presetType = getProfilePresetId(config);
   if (!presetType) {
     return null;
   }
-  return extendPresetWithProfile(getPreset(presetType), extractProfileOverrides(config));
+  return extendPresetWithProfile(getPreset(presetType), extractLegacyCharacterProfileOverrides(config));
+}
+function applyCharacterProfileToPreset(config) {
+  return resolveProfileFromPreset(config);
 }
 function orderExtendedRegions(extendedRegions, prioritizedLists) {
   if (!extendedRegions) return void 0;
@@ -7151,15 +7204,15 @@ function orderExtendedRegions(extendedRegions, prioritizedLists) {
   }
   return orderedNames.map((name) => extendedByName.get(name)).filter((region) => Boolean(region));
 }
-function extendCharacterConfigWithPreset(config) {
-  const presetType = config.auPresetType;
+function extendProfileConfigWithPreset(config) {
+  const presetType = getProfilePresetId(config);
   if (!presetType || presetType === "custom") {
     return config;
   }
   const canonicalAnnotationOverrides = getCanonicalAnnotationOverrides(config);
   const legacyRuntimeRegions = getLegacyRuntimeRegions(config);
-  const profileOverrides = extractProfileOverrides(config);
-  const extendedPresetProfile = applyCharacterProfileToPreset(config);
+  const profileOverrides = extractLegacyCharacterProfileOverrides(config);
+  const extendedPresetProfile = resolveProfileFromPreset(config);
   if (!extendedPresetProfile) {
     return config;
   }
@@ -7173,7 +7226,7 @@ function extendCharacterConfigWithPreset(config) {
   const extendedRegionNames = new Set((extendedAnnotationRegions ?? []).map((region) => region.name));
   const legacyExtraRegions = canonicalAnnotationOverrides && legacyRuntimeRegions ? legacyRuntimeRegions.filter((region) => !presetRegionNames.has(region.name) && !extendedRegionNames.has(region.name)).map((region) => cloneRegion(region)) : void 0;
   const mergedRegions = normalizeRegionTree(
-    mergeRegionsByName(extendedAnnotationRegions, legacyExtraRegions),
+    mergeProfileRegionsByName(extendedAnnotationRegions, legacyExtraRegions),
     profileOverrides.disabledRegions
   );
   const extendedRegions = orderExtendedRegions(
@@ -7187,6 +7240,9 @@ function extendCharacterConfigWithPreset(config) {
     regions: extendedRegions ?? config.regions
   };
 }
+function extendCharacterConfigWithPreset(config) {
+  return extendProfileConfigWithPreset(config);
+}
 var DEFAULT_EPSILON = 1e-4;
 var DEFAULT_YAW_WEIGHT = 0.35;
 var DEFAULT_PITCH_WEIGHT = 0.2;
@@ -7411,9 +7467,9 @@ function detectFacingDirection(model, eyeBoneNames = {
 function normalizeLooseName(value) {
   return value.replace(/\./g, "");
 }
-function resolveBoneNameCandidates(semanticName, config) {
-  if (!config) return [semanticName];
-  const { bonePrefix, boneSuffix, boneNodes } = config;
+function resolveBoneNameCandidates(semanticName, profile) {
+  if (!profile) return [semanticName];
+  const { bonePrefix, boneSuffix, boneNodes } = profile;
   if (!boneNodes || !boneNodes[semanticName]) {
     return [semanticName];
   }
@@ -7427,14 +7483,14 @@ function resolveBoneNameCandidates(semanticName, config) {
   const fullyAffixed = suffix && !prefixedBase.endsWith(suffix) ? `${prefixedBase}${suffix}` : prefixedBase;
   return Array.from(/* @__PURE__ */ new Set([fullyAffixed, baseName]));
 }
-function resolveBoneName(semanticName, config) {
-  return resolveBoneNameCandidates(semanticName, config)[0] ?? semanticName;
+function resolveBoneName(semanticName, profile) {
+  return resolveBoneNameCandidates(semanticName, profile)[0] ?? semanticName;
 }
-function resolveBoneNames(names, config) {
+function resolveBoneNames(names, profile) {
   if (!names || names.length === 0) return [];
   return Array.from(
     new Set(
-      names.flatMap((name) => resolveBoneNameCandidates(name, config))
+      names.flatMap((name) => resolveBoneNameCandidates(name, profile))
     )
   );
 }
@@ -7447,8 +7503,8 @@ function fuzzyNameMatch(objectName, targetName, suffixPattern) {
   const regex = suffixPattern ? new RegExp(suffixPattern) : /^[_\.]\d+$/;
   return regex.test(suffix);
 }
-function resolveFaceCenter(model, region, config) {
-  const resolvedBones = resolveBoneNames(region.bones, config);
+function resolveFaceCenter(model, region, profile) {
+  const resolvedBones = resolveBoneNames(region.bones, profile);
   const headBoneNames = resolvedBones.filter((name) => name.toLowerCase().includes("head"));
   const result = findFaceCenter(model, {
     headBoneNames: headBoneNames.length > 0 ? headBoneNames : void 0,
@@ -8569,6 +8625,6 @@ async function analyzeModel(options) {
   };
 }
 
-export { AU_INFO, AU_MAPPING_CONFIG, AU_MIX_DEFAULTS, AU_TO_MORPHS, AnimationThree, BETTA_FISH_PRESET, BLENDING_MODES, BONE_AU_TO_BINDINGS, CC4_BONE_NODES, CC4_BONE_PREFIX, CC4_EYE_MESH_NODES, CC4_MAPPING_SECTIONS, CC4_MESHES, CC4_PRESET, CC4_SUFFIX_PATTERN, CC4_VISEME_SLOTS, CC4_VISEME_SYSTEM_ID, COMPOSITE_ROTATIONS, CONTINUUM_LABELS, CONTINUUM_PAIRS_MAP, DEFAULT_HAIR_PHYSICS_CONFIG, FISH_AU_MAPPING_CONFIG, HairPhysics, Loom3, Loom3 as Loom3Three, Loom3 as LoomLargeThree, MORPH_TO_MESH, VISEME_JAW_AMOUNTS, VISEME_KEYS, analyzeModel, applyCharacterProfileToPreset, buildMappingEditorModel, collectMorphMeshes, compileVisemeKeys, computeCameraRelativeGazeOffset, detectFacingDirection, extendCharacterConfigWithPreset, extendPresetWithProfile, extractFromGLTF, extractModelData, extractProfileOverrides, findFaceCenter, fuzzyNameMatch, generateMappingCorrections, getMeshNamesForAUProfile, getMeshNamesForVisemeProfile, getModelForwardDirection, getPreset, getPresetWithProfile, getProfileVisemeSlots, getVisemeJawAmounts, getVisemeSlotIndex, hasLeftRightMorphs, isMixedAU, isPresetCompatible, mapProviderVisemeToSlot, mergeRegionsByName as mergeCharacterRegionsByName, resolveBoneName, resolveBoneNames, resolveFaceCenter, resolvePreset, resolvePresetWithOverrides, resolveVisemeMeshCategory, suggestBestPreset, validateMappingConfig, validateMappings };
+export { AU_INFO, AU_MAPPING_CONFIG, AU_MIX_DEFAULTS, AU_TO_MORPHS, AnimationThree, BETTA_FISH_PRESET, BLENDING_MODES, BONE_AU_TO_BINDINGS, CC4_BONE_NODES, CC4_BONE_PREFIX, CC4_EYE_MESH_NODES, CC4_MAPPING_SECTIONS, CC4_MESHES, CC4_PRESET, CC4_SUFFIX_PATTERN, CC4_VISEME_SLOTS, CC4_VISEME_SYSTEM_ID, COMPOSITE_ROTATIONS, CONTINUUM_LABELS, CONTINUUM_PAIRS_MAP, DEFAULT_HAIR_PHYSICS_CONFIG, FISH_AU_MAPPING_CONFIG, HairPhysics, Loom3, Loom3 as Loom3Three, Loom3 as LoomLargeThree, MORPH_TO_MESH, VISEME_JAW_AMOUNTS, VISEME_KEYS, analyzeModel, applyCharacterProfileToPreset, buildMappingEditorModel, collectMorphMeshes, compileVisemeKeys, computeCameraRelativeGazeOffset, detectFacingDirection, extendCharacterConfigWithPreset, extendPresetWithProfile, extendProfileConfigWithPreset, extractFromGLTF, extractLegacyCharacterProfileOverrides, extractModelData, extractProfileOverrides, findFaceCenter, fuzzyNameMatch, generateMappingCorrections, getMeshNamesForAUProfile, getMeshNamesForVisemeProfile, getModelForwardDirection, getPreset, getPresetWithProfile, getProfilePresetId, getProfileVisemeSlots, getVisemeBindingTargets, getVisemeJawAmounts, getVisemeSlotIndex, hasLeftRightMorphs, isMixedAU, isPresetCompatible, mapProviderVisemeToSlot, mergeRegionsByName as mergeCharacterRegionsByName, mergeProfileRegionsByName, resolveBoneName, resolveBoneNames, resolveFaceCenter, resolvePreset, resolvePresetWithOverrides, resolveProfileFromPreset, resolveVisemeMeshCategory, suggestBestPreset, validateMappingConfig, validateMappings };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map