@lovelace_lol/loom3 1.0.13 → 1.0.15

package/dist/index.cjs

@@ -192,6 +192,17 @@ var BakedAnimationController = class {
     __publicField(this, "actionIdToClip", /* @__PURE__ */ new Map());
     this.host = host;
   }
+  getActionId(action) {
+    if (!action) return void 0;
+    return this.actionIds.get(action) ?? action.__actionId;
+  }
+  setActionId(action, clipName) {
+    const actionId = makeActionId();
+    this.actionIds.set(action, actionId);
+    this.actionIdToClip.set(actionId, clipName);
+    action.__actionId = actionId;
+    return actionId;
+  }
   getMeshNamesForAU(auId, config, explicitMeshNames) {
     if (explicitMeshNames && explicitMeshNames.length > 0) {
       return explicitMeshNames;
@@ -696,19 +707,13 @@ var BakedAnimationController = class {
       mixerWeight
     } = options || {};
     let action = this.clipActions.get(clip.name);
-    let actionId = action ? this.actionIds.get(action) || action.__actionId : void 0;
+    let actionId = this.getActionId(action);
     if (action && !actionId) {
-      actionId = makeActionId();
-      this.actionIds.set(action, actionId);
-      this.actionIdToClip.set(actionId, clip.name);
-      action.__actionId = actionId;
+      actionId = this.setActionId(action, clip.name);
     }
     if (!action) {
       action = this.animationMixer.clipAction(clip);
-      actionId = makeActionId();
-      this.actionIds.set(action, actionId);
-      this.actionIdToClip.set(actionId, clip.name);
-      action.__actionId = actionId;
+      actionId = this.setActionId(action, clip.name);
     }
     const existingClip = this.animationClips.find((c) => c.name === clip.name);
     if (!existingClip) {
@@ -861,10 +866,10 @@ var BakedAnimationController = class {
     const debugSnapshot = () => ({
       target: name,
       params,
-      clipActions: Array.from(this.clipActions.entries()).map(([k, a]) => ({ name: k, actionId: this.actionIds.get(a) || a.__actionId })),
-      animationActions: Array.from(this.animationActions.entries()).map(([k, a]) => ({ name: k, actionId: this.actionIds.get(a) || a.__actionId })),
+      clipActions: Array.from(this.clipActions.entries()).map(([k, a]) => ({ name: k, actionId: this.getActionId(a) })),
+      animationActions: Array.from(this.animationActions.entries()).map(([k, a]) => ({ name: k, actionId: this.getActionId(a) })),
       clipHandles: Array.from(this.clipHandles.entries()).map(([k, h]) => ({ name: k, actionId: h.actionId })),
-      mixerActions: (this.animationMixer?._actions || []).map((a) => ({ name: a?.getClip?.()?.name || "", actionId: this.actionIds.get(a) || a.__actionId }))
+      mixerActions: (this.animationMixer?._actions || []).map((a) => ({ name: a?.getClip?.()?.name || "", actionId: this.getActionId(a) }))
     });
     console.log("[Loom3] updateClipParams start", debugSnapshot());
     const apply = (action) => {
@@ -1498,53 +1503,53 @@ var BONE_AU_TO_BINDINGS = {
   42: [{ node: "TONGUE", channel: "rx", scale: 1, maxDegrees: 20 }]
 };
 var VISEME_KEYS = [
-  "EE",
+  "AE",
   "Ah",
-  "Oh",
-  "OO",
-  "I",
-  "U",
-  "W",
-  "L",
-  "F_V",
-  "Th",
-  "S_Z",
   "B_M_P",
+  "Ch_J",
+  "EE",
+  "Er",
+  "F_V",
+  "Ih",
   "K_G_H_NG",
-  "AE",
-  "R"
+  "Oh",
+  "R",
+  "S_Z",
+  "T_L_D_N",
+  "Th",
+  "W_OO"
 ];
 var VISEME_JAW_AMOUNTS = [
-  0.2,
-  // 0: EE
+  0.75,
+  // 0: AE
   0.8,
   // 1: Ah
-  0.6,
-  // 2: Oh
-  0.5,
-  // 3: OO
-  0.2,
-  // 4: I
-  0.5,
-  // 5: U
-  0.4,
-  // 6: W
+  0,
+  // 2: B_M_P
   0.3,
-  // 7: L
-  0.1,
-  // 8: F_V
-  0.15,
-  // 9: Th
+  // 3: Ch_J
+  0.2,
+  // 4: EE
+  0.35,
+  // 5: Er
   0.1,
-  // 10: S_Z
-  0,
-  // 11: B_M_P
+  // 6: F_V
+  0.2,
+  // 7: Ih
   0.35,
-  // 12: K_G_H_NG
-  0.75,
-  // 13: AE
-  0.35
-  // 14: R
+  // 8: K_G_H_NG
+  0.6,
+  // 9: Oh
+  0.35,
+  // 10: R
+  0.1,
+  // 11: S_Z
+  0.3,
+  // 12: T_L_D_N
+  0.15,
+  // 13: Th
+  0.5
+  // 14: W_OO
 ];
 var isMixedAU = (id) => {
   const morphs = AU_TO_MORPHS[id];
@@ -2064,7 +2069,7 @@ var HairPhysicsController = class {
     this.clearRegisteredHairObjects();
     const result = [];
     for (const obj of objects) {
-      if (obj.isMesh) {
+      if (obj instanceof THREE.Mesh) {
         const mesh = obj;
         this.registeredHairObjects.set(mesh.name, mesh);
         const meshInfo = CC4_MESHES[mesh.name];
@@ -2140,7 +2145,7 @@ var HairPhysicsController = class {
       }
     } : this.hairPhysicsConfig.morphTargets;
     this.hairPhysicsConfig = { ...this.hairPhysicsConfig, ...config, direction, morphTargets };
-    const idleChanged = [
+    const idleKeys = [
       "idleSwayAmount",
       "idleSwaySpeed",
       "windStrength",
@@ -2149,14 +2154,16 @@ var HairPhysicsController = class {
       "windTurbulence",
       "windFrequency",
       "idleClipDuration"
-    ].some((key) => config[key] !== void 0);
+    ];
+    const idleChanged = idleKeys.some((key) => config[key] !== void 0);
     const morphTargetsChanged = config.morphTargets !== void 0;
     const directionChanged = config.direction !== void 0;
-    const impulseChanged = [
+    const impulseKeys = [
       "stiffness",
       "damping",
       "impulseClipDuration"
-    ].some((key) => config[key] !== void 0);
+    ];
+    const impulseChanged = impulseKeys.some((key) => config[key] !== void 0);
     const gravityChanged = morphTargetsChanged;
     if (idleChanged || morphTargetsChanged) {
       this.idleClipDirty = true;
@@ -2297,7 +2304,7 @@ var HairPhysicsController = class {
     if (state.position) {
       obj.position.set(state.position.x, state.position.y, state.position.z);
     }
-    if (state.color && obj.material) {
+    if (state.color && obj.material && !Array.isArray(obj.material)) {
       const mat = obj.material;
       if (mat.color) {
         mat.color.set(state.color.baseColor);
@@ -2675,35 +2682,29 @@ var HairPhysicsController = class {
 };
 
 // src/mappings/resolveProfile.ts
-var cloneArray = (value) => value.map((item) => {
-  if (item && typeof item === "object") {
-    return { ...item };
-  }
-  return item;
-});
+var isPlainObject = (value) => {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+};
 var cloneValue = (value) => {
   if (Array.isArray(value)) {
-    return cloneArray(value);
+    return value.map((item) => cloneValue(item));
   }
-  if (value && typeof value === "object") {
+  if (isPlainObject(value)) {
     return { ...value };
   }
   return value;
 };
 var mergeRecord = (base, override) => {
-  if (!override) {
-    const next2 = {};
-    for (const [key, value] of Object.entries(base)) {
-      next2[key] = cloneValue(value);
-    }
-    return next2;
-  }
   const next = {};
   for (const [key, value] of Object.entries(base)) {
     next[key] = cloneValue(value);
   }
-  for (const [key, value] of Object.entries(override)) {
-    next[key] = cloneValue(value);
+  if (override) {
+    for (const [key, value] of Object.entries(override)) {
+      if (value !== void 0) {
+        next[key] = cloneValue(value);
+      }
+    }
   }
   return next;
 };