@lovelace_lol/loom3 1.0.34 → 1.0.35

package/dist/index.d.cts

@@ -1360,6 +1360,7 @@ declare class Loom3 implements LoomLarge {
     private bones;
     private mixWeights;
     private visemeValues;
+    private visemeJawScales;
     private static readonly VISEME_JAW_AMOUNTS;
     private bakedAnimations;
     private hairPhysics;
@@ -1453,6 +1454,7 @@ declare class Loom3 implements LoomLarge {
     clearTransitions(): void;
     getActiveTransitionCount(): number;
     resetToNeutral(): void;
+    private reinitializeRuntimeStateFromCurrentControls;
     getMeshList(): MeshInfo[];
     /** Get all morph targets grouped by mesh name */
     getMorphTargets(): Record<string, string[]>;
@@ -1556,6 +1558,10 @@ declare class Loom3 implements LoomLarge {
     private getMorphValueByIndex;
     private getMorphKeyCacheKey;
     private getMorphIndexCacheKey;
+    private syncVisemeRuntimeState;
+    private getVisemeJawAmount;
+    private collectResolvedExpressionMorphTargets;
+    private resetMorphTargetHandles;
     private isMixedAU;
     private getEffectiveBoneAUValue;
     private getCompositeAxisValueForNode;

package/dist/index.d.ts

@@ -1360,6 +1360,7 @@ declare class Loom3 implements LoomLarge {
     private bones;
     private mixWeights;
     private visemeValues;
+    private visemeJawScales;
     private static readonly VISEME_JAW_AMOUNTS;
     private bakedAnimations;
     private hairPhysics;
@@ -1453,6 +1454,7 @@ declare class Loom3 implements LoomLarge {
     clearTransitions(): void;
     getActiveTransitionCount(): number;
     resetToNeutral(): void;
+    private reinitializeRuntimeStateFromCurrentControls;
     getMeshList(): MeshInfo[];
     /** Get all morph targets grouped by mesh name */
     getMorphTargets(): Record<string, string[]>;
@@ -1556,6 +1558,10 @@ declare class Loom3 implements LoomLarge {
     private getMorphValueByIndex;
     private getMorphKeyCacheKey;
     private getMorphIndexCacheKey;
+    private syncVisemeRuntimeState;
+    private getVisemeJawAmount;
+    private collectResolvedExpressionMorphTargets;
+    private resetMorphTargetHandles;
     private isMixedAU;
     private getEffectiveBoneAUValue;
     private getCompositeAxisValueForNode;

package/dist/index.js

@@ -3916,7 +3916,8 @@ var _Loom3 = class _Loom3 {
     __publicField(this, "bones", {});
     __publicField(this, "mixWeights", {});
     // Viseme state
-    __publicField(this, "visemeValues", new Array(15).fill(0));
+    __publicField(this, "visemeValues", []);
+    __publicField(this, "visemeJawScales", []);
     __publicField(this, "bakedAnimations");
     __publicField(this, "hairPhysics");
     // Internal animation loop
@@ -3929,6 +3930,7 @@ var _Loom3 = class _Loom3 {
     const basePreset = config.presetType ? getPreset(config.presetType) : CC4_PRESET;
     this.config = extendPresetWithProfile(basePreset, config.profile);
     this.mixWeights = { ...this.config.auMixDefaults };
+    this.syncVisemeRuntimeState();
     this.animation = animation || new AnimationThree();
     this.compositeRotations = this.config.compositeRotations || COMPOSITE_ROTATIONS;
     this.auToCompositeMap = buildAUToCompositeMap(this.compositeRotations);
@@ -4461,6 +4463,7 @@ var _Loom3 = class _Loom3 {
     if (visemeIndex < 0 || visemeIndex >= this.config.visemeKeys.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);
@@ -4473,7 +4476,7 @@ var _Loom3 = class _Loom3 {
         this.setMorph(morphKey, val, visemeMeshNames);
       }
     }
-    const jawAmount = _Loom3.VISEME_JAW_AMOUNTS[visemeIndex] * val * jawScale;
+    const jawAmount = this.getVisemeJawAmount(visemeIndex) * val * jawScale;
     if (Math.abs(jawScale) > 1e-6 && Math.abs(jawAmount) > 1e-6) {
       this.updateBoneRotation("JAW", "pitch", jawAmount);
     }
@@ -4488,9 +4491,10 @@ var _Loom3 = class _Loom3 {
     const morphKey = this.config.visemeKeys[visemeIndex];
     const target = clamp012(to);
     this.visemeValues[visemeIndex] = target;
+    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 = _Loom3.VISEME_JAW_AMOUNTS[visemeIndex] * target * jawScale;
+    const jawAmount = this.getVisemeJawAmount(visemeIndex) * target * jawScale;
     if (Math.abs(jawScale) <= 1e-6 || Math.abs(jawAmount) <= 1e-6) {
       return morphHandle;
     }
@@ -4544,6 +4548,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);
+    this.translations = {};
     this.initBoneRotations();
     this.clearTransitions();
     for (const m of this.meshes) {
@@ -4559,6 +4566,33 @@ var _Loom3 = class _Loom3 {
       entry.obj.quaternion.copy(entry.baseQuat);
     });
   }
+  reinitializeRuntimeStateFromCurrentControls(staleMorphTargets = []) {
+    this.clearTransitions();
+    this.resetMorphTargetHandles(staleMorphTargets);
+    this.translations = {};
+    this.initBoneRotations();
+    Object.values(this.bones).forEach((entry) => {
+      if (!entry) return;
+      entry.obj.position.copy(entry.basePos);
+      entry.obj.quaternion.copy(entry.baseQuat);
+      entry.obj.updateMatrixWorld(false);
+    });
+    for (const [auIdStr, value] of Object.entries(this.auValues)) {
+      if (value <= 0) continue;
+      const auId = Number(auIdStr);
+      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);
+    }
+    if (this.model) {
+      this.flushPendingComposites();
+      this.model.updateMatrixWorld(true);
+    }
+  }
   // ============================================================================
   // MESH CONTROL
   // ============================================================================
@@ -4789,12 +4823,20 @@ var _Loom3 = class _Loom3 {
   }
   setProfile(profile) {
     this.config = profile;
+    this.compositeRotations = this.config.compositeRotations || COMPOSITE_ROTATIONS;
+    this.auToCompositeMap = buildAUToCompositeMap(this.compositeRotations);
     this.mixWeights = { ...profile.auMixDefaults };
+    this.syncVisemeRuntimeState();
+    let staleMorphTargets = [];
     if (this.model) {
+      staleMorphTargets = this.collectResolvedExpressionMorphTargets();
+      this.bones = this.resolveBones(this.model);
+      this.missingBoneWarnings.clear();
       this.rebuildMorphTargetsCache();
     }
     this.hairPhysics.refreshMeshSelection();
     this.applyHairPhysicsProfileConfig();
+    this.reinitializeRuntimeStateFromCurrentControls(staleMorphTargets);
   }
   getProfile() {
     return this.config;
@@ -4932,6 +4974,39 @@ var _Loom3 = class _Loom3 {
   getMorphIndexCacheKey(index, meshNames) {
     return meshNames?.length ? `idx:${index}@${meshNames.join(",")}` : `idx:${index}`;
   }
+  syncVisemeRuntimeState() {
+    const visemeCount = this.config.visemeKeys.length;
+    this.visemeValues = Array.from(
+      { length: visemeCount },
+      (_, index) => this.visemeValues[index] ?? 0
+    );
+    this.visemeJawScales = Array.from(
+      { length: visemeCount },
+      (_, index) => this.visemeJawScales[index] ?? 1
+    );
+  }
+  getVisemeJawAmount(visemeIndex) {
+    return this.config.visemeJawAmounts?.[visemeIndex] ?? _Loom3.VISEME_JAW_AMOUNTS[visemeIndex] ?? 0;
+  }
+  collectResolvedExpressionMorphTargets() {
+    const targets = [];
+    for (const resolved of this.resolvedAUMorphTargets.values()) {
+      targets.push(...resolved.left, ...resolved.right, ...resolved.center);
+    }
+    for (const resolved of this.resolvedVisemeTargets) {
+      if (resolved?.length) {
+        targets.push(...resolved);
+      }
+    }
+    return targets;
+  }
+  resetMorphTargetHandles(targets) {
+    for (const { infl, idx } of targets) {
+      if (idx < infl.length) {
+        infl[idx] = 0;
+      }
+    }
+  }
   isMixedAU(id) {
     const morphs = this.config.auToMorphs[id];
     const hasMorphs = !!(morphs?.left?.length || morphs?.right?.length || morphs?.center?.length);
@@ -5073,12 +5148,25 @@ var _Loom3 = class _Loom3 {
   }
   resolveBones(root) {
     const resolved = {};
+    const previousBones = this.bones;
     const snapshot = (obj) => ({
       obj,
       basePos: { x: obj.position.x, y: obj.position.y, z: obj.position.z },
       baseQuat: obj.quaternion.clone(),
       baseEuler: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z, order: obj.rotation.order }
     });
+    const snapshotPreservingBasePose = (obj) => {
+      const existing = Object.values(previousBones).find((entry) => entry?.obj === obj);
+      if (!existing) {
+        return snapshot(obj);
+      }
+      return {
+        obj,
+        basePos: { ...existing.basePos },
+        baseQuat: existing.baseQuat.clone(),
+        baseEuler: { ...existing.baseEuler }
+      };
+    };
     const prefix = this.config.bonePrefix || "";
     const suffix = this.config.boneSuffix || "";
     const suffixRegex = this.config.suffixPattern ? new RegExp(this.config.suffixPattern) : null;
@@ -5109,19 +5197,19 @@ var _Loom3 = class _Loom3 {
     for (const [key, nodeName] of Object.entries(this.config.boneNodes)) {
       const node = findNode(nodeName);
       if (node) {
-        resolved[key] = snapshot(node);
+        resolved[key] = snapshotPreservingBasePose(node);
       }
     }
     if (!resolved.EYE_L && this.config.eyeMeshNodes) {
       const node = findNode(this.config.eyeMeshNodes.LEFT);
       if (node) {
-        resolved.EYE_L = snapshot(node);
+        resolved.EYE_L = snapshotPreservingBasePose(node);
       }
     }
     if (!resolved.EYE_R && this.config.eyeMeshNodes) {
       const node = findNode(this.config.eyeMeshNodes.RIGHT);
       if (node) {
-        resolved.EYE_R = snapshot(node);
+        resolved.EYE_R = snapshotPreservingBasePose(node);
       }
     }
     return resolved;