@lovelace_lol/loom3 1.0.3 → 1.0.4

package/dist/index.d.cts

@@ -658,8 +658,19 @@ interface Profile {
     rightMorphSuffixes?: string[];
     /** Morph category to mesh names (e.g., 'face' → ['CC_Base_Body_1']) */
     morphToMesh: Record<string, string[]>;
+    /**
+     * Optional map from AU `facePart` labels (from `auInfo`) to `morphToMesh` categories.
+     * This makes AU mesh routing fully preset/profile configurable.
+     * Example: { Eye: 'eye', Eyes: 'eye', Eyelids: 'eye', Tongue: 'tongue' }.
+     */
+    auFacePartToMeshCategory?: Record<string, string>;
     /** Viseme targets in order (typically 15 phoneme positions) */
     visemeKeys: MorphTargetRef[];
+    /**
+     * Optional `morphToMesh` category to use for viseme morph routing.
+     * Falls back to `morphToMesh.viseme` (if present), then `morphToMesh.face`.
+     */
+    visemeMeshCategory?: string;
     /** Optional: Jaw opening amounts per viseme index (0-1). Used for auto-generating jaw rotation in clips. */
     visemeJawAmounts?: number[];
     /** Optional: Default mix weights for bone/morph blending (0 = morph only, 1 = bone only) */
@@ -1516,9 +1527,10 @@ declare class Loom3 implements LoomLarge {
     getProfile(): Profile;
     /**
      * Get the mesh names that should receive morph influences for a given AU.
-     * Routes by facePart: Tongue → tongue, Eye → eye, everything else → face.
+     * Routing is driven by `auFacePartToMeshCategory` in profile config.
      */
     getMeshNamesForAU(auId: number): string[];
+    getMeshNamesForViseme(): string[];
     registerHairObjects(objects: Object3D[]): Array<{
         name: string;
         isMesh: boolean;

package/dist/index.d.ts

@@ -658,8 +658,19 @@ interface Profile {
     rightMorphSuffixes?: string[];
     /** Morph category to mesh names (e.g., 'face' → ['CC_Base_Body_1']) */
     morphToMesh: Record<string, string[]>;
+    /**
+     * Optional map from AU `facePart` labels (from `auInfo`) to `morphToMesh` categories.
+     * This makes AU mesh routing fully preset/profile configurable.
+     * Example: { Eye: 'eye', Eyes: 'eye', Eyelids: 'eye', Tongue: 'tongue' }.
+     */
+    auFacePartToMeshCategory?: Record<string, string>;
     /** Viseme targets in order (typically 15 phoneme positions) */
     visemeKeys: MorphTargetRef[];
+    /**
+     * Optional `morphToMesh` category to use for viseme morph routing.
+     * Falls back to `morphToMesh.viseme` (if present), then `morphToMesh.face`.
+     */
+    visemeMeshCategory?: string;
     /** Optional: Jaw opening amounts per viseme index (0-1). Used for auto-generating jaw rotation in clips. */
     visemeJawAmounts?: number[];
     /** Optional: Default mix weights for bone/morph blending (0 = morph only, 1 = bone only) */
@@ -1516,9 +1527,10 @@ declare class Loom3 implements LoomLarge {
     getProfile(): Profile;
     /**
      * Get the mesh names that should receive morph influences for a given AU.
-     * Routes by facePart: Tongue → tongue, Eye → eye, everything else → face.
+     * Routing is driven by `auFacePartToMeshCategory` in profile config.
      */
     getMeshNamesForAU(auId: number): string[];
+    getMeshNamesForViseme(): string[];
     registerHairObjects(objects: Object3D[]): Array<{
         name: string;
         isMesh: boolean;

package/dist/index.js

@@ -137,8 +137,22 @@ var BakedAnimationController = class {
       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 || [];
+    if (facePart) {
+      const category = config.auFacePartToMeshCategory?.[facePart];
+      if (category) return config.morphToMesh?.[category] || [];
+    }
+    return config.morphToMesh?.face || [];
+  }
+  getMeshNamesForViseme(config, explicitMeshNames) {
+    if (explicitMeshNames && explicitMeshNames.length > 0) {
+      return explicitMeshNames;
+    }
+    if (typeof this.host.getMeshNamesForViseme === "function") {
+      return this.host.getMeshNamesForViseme() || [];
+    }
+    const category = config.visemeMeshCategory || (config.morphToMesh?.viseme ? "viseme" : "face");
+    const visemeMeshes = config.morphToMesh?.[category];
+    if (visemeMeshes && visemeMeshes.length > 0) return visemeMeshes;
     return config.morphToMesh?.face || [];
   }
   update(dtSeconds) {
@@ -434,11 +448,12 @@ var BakedAnimationController = class {
       if (isNumericAU(curveId)) {
         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, meshNames);
+            this.addMorphIndexTracks(tracks, visemeKey, keyframes, intensityScale, visemeMeshNames);
           } else if (visemeKey) {
-            this.addMorphTracks(tracks, visemeKey, keyframes, intensityScale, meshNames);
+            this.addMorphTracks(tracks, visemeKey, keyframes, intensityScale, visemeMeshNames);
           }
         } else {
           const auMeshNames = this.getMeshNamesForAU(auId, config, meshNames);
@@ -1763,6 +1778,12 @@ var MORPH_TO_MESH = {
   tongue: ["CC_Base_Tongue", "CC_Base_Tongue_1"],
   hair: ["Side_part_wavy", "Side_part_wavy_1", "Side_part_wavy_2"]
 };
+var AU_FACEPART_TO_MESH_CATEGORY = {
+  Eye: "eye",
+  Eyes: "eye",
+  Eyelids: "eye",
+  Tongue: "tongue"
+};
 var CC4_HAIR_PHYSICS = {
   stiffness: 7.5,
   damping: 0.18,
@@ -1808,7 +1829,9 @@ var CC4_PRESET = {
   bonePrefix: CC4_BONE_PREFIX,
   suffixPattern: CC4_SUFFIX_PATTERN,
   morphToMesh: MORPH_TO_MESH,
+  auFacePartToMeshCategory: AU_FACEPART_TO_MESH_CATEGORY,
   visemeKeys: VISEME_KEYS,
+  visemeMeshCategory: "viseme",
   visemeJawAmounts: VISEME_JAW_AMOUNTS,
   auMixDefaults: AU_MIX_DEFAULTS,
   auInfo: AU_INFO,
@@ -2128,9 +2151,10 @@ var HairPhysicsController = class {
     if (meshName) {
       targetMesh = this.registeredHairObjects.get(meshName);
     } else {
-      for (const [name, mesh] of this.registeredHairObjects) {
-        const info = CC4_MESHES[name];
-        if (info?.category === "hair") {
+      const hairMeshNames = this.getHairMeshNames();
+      for (const name of hairMeshNames) {
+        const mesh = this.registeredHairObjects.get(name) || this.host.getMeshByName(name);
+        if (mesh) {
           targetMesh = mesh;
           break;
         }
@@ -2224,6 +2248,15 @@ var HairPhysicsController = class {
   }
   getHairMeshNames() {
     if (this.cachedHairMeshNames) return this.cachedHairMeshNames;
+    if (typeof this.host.getSelectedHairMeshNames === "function") {
+      const selectedHairMeshNames = this.host.getSelectedHairMeshNames() || [];
+      const resolved = selectedHairMeshNames.filter((name) => {
+        const mesh = this.registeredHairObjects.get(name) || this.host.getMeshByName(name);
+        return !!mesh;
+      });
+      this.cachedHairMeshNames = Array.from(new Set(resolved));
+      return this.cachedHairMeshNames;
+    }
     const names = [];
     this.registeredHairObjects.forEach((mesh, name) => {
       const info = CC4_MESHES[name];
@@ -2239,6 +2272,18 @@ var HairPhysicsController = class {
     this.cachedHairMeshNames = names;
     return names;
   }
+  refreshMeshSelection() {
+    this.cachedHairMeshNames = null;
+    this.idleClipDirty = true;
+    this.gravityClipDirty = true;
+    this.impulseClipDirty = true;
+    this.warnMissingHairMorphTargets();
+    if (this.hairPhysicsEnabled) {
+      this.startIdleClip();
+      this.startGravityClip();
+      this.buildImpulseClips();
+    }
+  }
   supportsMixerClips() {
     return typeof this.host.buildClip === "function";
   }
@@ -2253,7 +2298,11 @@ var HairPhysicsController = class {
       return;
     }
     const hairMeshNames = this.getHairMeshNames();
-    if (hairMeshNames.length === 0) return;
+    if (hairMeshNames.length === 0) {
+      this.stopIdleClip();
+      this.idleClipDirty = false;
+      return;
+    }
     if (!this.idleClipDirty && this.idleClipHandle) return;
     this.stopIdleClip();
     const duration = Math.max(0.5, cfg.idleClipDuration);
@@ -2271,7 +2320,11 @@ var HairPhysicsController = class {
   startGravityClip() {
     if (!this.hairPhysicsEnabled || !this.supportsMixerClips()) return;
     const hairMeshNames = this.getHairMeshNames();
-    if (hairMeshNames.length === 0) return;
+    if (hairMeshNames.length === 0) {
+      this.stopGravityClip();
+      this.gravityClipDirty = false;
+      return;
+    }
     if (!this.gravityClipDirty && this.gravityClipHandle) return;
     this.stopGravityClip();
     const morphTargets = this.hairPhysicsConfig.morphTargets;
@@ -2324,7 +2377,11 @@ var HairPhysicsController = class {
   buildImpulseClips() {
     if (!this.hairPhysicsEnabled || !this.supportsMixerClips()) return;
     const hairMeshNames = this.getHairMeshNames();
-    if (hairMeshNames.length === 0) return;
+    if (hairMeshNames.length === 0) {
+      this.stopImpulseClips();
+      this.impulseClipDirty = false;
+      return;
+    }
     if (!this.impulseClipDirty && this.impulseClips.left && this.impulseClips.right && this.impulseClips.front) {
       return;
     }
@@ -2660,7 +2717,9 @@ function resolveProfile(base, override) {
     auToBones: mergeRecord(base.auToBones, override.auToBones),
     boneNodes: mergeRecord(base.boneNodes, override.boneNodes),
     morphToMesh: mergeRecord(base.morphToMesh, override.morphToMesh),
+    auFacePartToMeshCategory: base.auFacePartToMeshCategory || override.auFacePartToMeshCategory ? mergeRecord(base.auFacePartToMeshCategory || {}, override.auFacePartToMeshCategory || {}) : void 0,
     visemeKeys: override.visemeKeys ? [...override.visemeKeys] : [...base.visemeKeys],
+    visemeMeshCategory: override.visemeMeshCategory ?? base.visemeMeshCategory,
     auMixDefaults: base.auMixDefaults || override.auMixDefaults ? mergeRecord(base.auMixDefaults || {}, override.auMixDefaults || {}) : void 0,
     auInfo: base.auInfo || override.auInfo ? mergeRecord(base.auInfo || {}, override.auInfo || {}) : void 0,
     eyeMeshNodes: override.eyeMeshNodes ?? base.eyeMeshNodes,
@@ -3498,6 +3557,7 @@ var _Loom3 = class _Loom3 {
     this.auToCompositeMap = buildAUToCompositeMap(this.compositeRotations);
     this.hairPhysics = new HairPhysicsController({
       getMeshByName: (name) => this.meshByName.get(name),
+      getSelectedHairMeshNames: () => this.config.morphToMesh?.hair || [],
       buildClip: (clipName, curves, options) => this.buildClip(clipName, curves, options),
       cleanupSnippet: (name) => this.cleanupSnippet(name)
     });
@@ -3506,6 +3566,7 @@ var _Loom3 = class _Loom3 {
       getMeshes: () => this.meshes,
       getMeshByName: (name) => this.meshByName.get(name),
       getMeshNamesForAU: (auId) => this.getMeshNamesForAU(auId),
+      getMeshNamesForViseme: () => this.getMeshNamesForViseme(),
       getBones: () => this.bones,
       getConfig: () => this.config,
       getCompositeRotations: () => this.compositeRotations,
@@ -3602,7 +3663,8 @@ var _Loom3 = class _Loom3 {
     }
     for (let i = 0; i < (this.config.visemeKeys || []).length; i += 1) {
       const key = this.config.visemeKeys[i];
-      const targets = typeof key === "number" ? this.resolveMorphTargetsByIndex(key) : this.resolveMorphTargets(key);
+      const visemeMeshNames = this.getMeshNamesForViseme();
+      const targets = typeof key === "number" ? this.resolveMorphTargetsByIndex(key, visemeMeshNames) : this.resolveMorphTargets(key, visemeMeshNames);
       this.resolvedVisemeTargets[i] = targets;
     }
   }
@@ -4034,10 +4096,11 @@ var _Loom3 = class _Loom3 {
       this.applyMorphTargets(targets, val);
     } else {
       const morphKey = this.config.visemeKeys[visemeIndex];
+      const visemeMeshNames = this.getMeshNamesForViseme();
       if (typeof morphKey === "number") {
-        this.setMorphInfluence(morphKey, val);
+        this.setMorphInfluence(morphKey, val, visemeMeshNames);
       } else if (typeof morphKey === "string") {
-        this.setMorph(morphKey, val);
+        this.setMorph(morphKey, val, visemeMeshNames);
       }
     }
     const jawAmount = _Loom3.VISEME_JAW_AMOUNTS[visemeIndex] * val * jawScale;
@@ -4055,7 +4118,8 @@ var _Loom3 = class _Loom3 {
     const morphKey = this.config.visemeKeys[visemeIndex];
     const target = clamp012(to);
     this.visemeValues[visemeIndex] = target;
-    const morphHandle = typeof morphKey === "number" ? this.transitionMorphInfluence(morphKey, target, durationMs) : this.transitionMorph(morphKey, target, durationMs);
+    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;
     if (Math.abs(jawScale) <= 1e-6 || Math.abs(jawAmount) <= 1e-6) {
       return morphHandle;
@@ -4359,6 +4423,7 @@ var _Loom3 = class _Loom3 {
     if (this.model) {
       this.rebuildMorphTargetsCache();
     }
+    this.hairPhysics.refreshMeshSelection();
     this.applyHairPhysicsProfileConfig();
   }
   getProfile() {
@@ -4366,20 +4431,24 @@ var _Loom3 = class _Loom3 {
   }
   /**
    * Get the mesh names that should receive morph influences for a given AU.
-   * Routes by facePart: Tongue → tongue, Eye → eye, everything else → face.
+   * Routing is driven by `auFacePartToMeshCategory` in profile config.
    */
   getMeshNamesForAU(auId) {
     const m = this.config.morphToMesh;
     const info = this.config.auInfo?.[String(auId)];
-    if (!info?.facePart) return m?.face || [];
-    switch (info.facePart) {
-      case "Tongue":
-        return m?.tongue || [];
-      case "Eye":
-        return m?.eye || [];
-      default:
-        return m?.face || [];
+    const facePart = info?.facePart;
+    if (facePart) {
+      const category = this.config.auFacePartToMeshCategory?.[facePart];
+      if (category) {
+        return m?.[category] || [];
+      }
     }
+    return m?.face || [];
+  }
+  getMeshNamesForViseme() {
+    const m = this.config.morphToMesh;
+    const category = this.config.visemeMeshCategory || (m?.viseme ? "viseme" : "face");
+    return m?.[category] || m?.face || [];
   }
   // ============================================================================
   // HAIR PHYSICS