@sage-rsc/talking-head-react 1.4.8 → 1.4.9

package/dist/index.js

@@ -4418,17 +4418,8 @@ class Be {
     if (!this.armature) return;
     const t = this.armature.getObjectByName("LeftShoulder"), e = this.armature.getObjectByName("RightShoulder");
     if (!t || !e) return;
-    const n = new y.Euler(), i = new y.Quaternion(), s = 0.6, o = 0.7;
-    if (t.quaternion) {
-      n.setFromQuaternion(t.quaternion, "XYZ");
-      const l = n.x;
-      n.x > o ? n.x = s : n.x > s && (n.x = s + (n.x - s) * 0.2), Math.abs(n.x - l) > 0.01 && (i.setFromEuler(n, "XYZ"), t.quaternion.copy(i), t.updateMatrixWorld(!0));
-    }
-    if (e.quaternion) {
-      n.setFromQuaternion(e.quaternion, "XYZ");
-      const l = n.x;
-      n.x > o ? n.x = s : n.x > s && (n.x = s + (n.x - s) * 0.2), Math.abs(n.x - l) > 0.01 && (i.setFromEuler(n, "XYZ"), e.quaternion.copy(i), e.updateMatrixWorld(!0));
-    }
+    const n = new y.Euler(), i = new y.Quaternion(), s = this.mixer && this.currentFBXAction && this.currentFBXAction.isRunning(), o = 0.5, l = 0.6;
+    t.quaternion && (n.setFromQuaternion(t.quaternion, "XYZ"), n.x > l ? n.x = o : n.x > o && (s ? n.x = o : n.x = o + (n.x - o) * 0.1), i.setFromEuler(n, "XYZ"), t.quaternion.copy(i), t.updateMatrixWorld(!0)), e.quaternion && (n.setFromQuaternion(e.quaternion, "XYZ"), n.x > l ? n.x = o : n.x > o && (s ? n.x = o : n.x = o + (n.x - o) * 0.1), i.setFromEuler(n, "XYZ"), e.quaternion.copy(i), e.updateMatrixWorld(!0));
   }
   /**
   * Update avatar pose deltas

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sage-rsc/talking-head-react",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "description": "A reusable React component for 3D talking avatars with lip-sync and text-to-speech",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

package/src/lib/talkinghead.mjs

@@ -1667,55 +1667,66 @@ class TalkingHead {
     const tempEuler = new THREE.Euler();
     const tempQuaternion = new THREE.Quaternion();
     
+    // Check if FBX animation is playing - if so, be even more aggressive
+    const isFBXPlaying = this.mixer && this.currentFBXAction && this.currentFBXAction.isRunning();
+    
     // Research-based relaxed shoulder rotation values
-    // Natural relaxed shoulders: X rotation ~0.5-0.7 radians (much lower for natural look)
+    // Natural relaxed shoulders: X rotation ~0.4-0.5 radians
     // High/stiff shoulders: X rotation ~1.5-1.8 radians
-    // We aggressively clamp to a very relaxed position
-    const targetX = 0.6; // Target X rotation for relaxed, natural shoulders (radians) - lowered significantly
-    const maxX = 0.7; // Maximum allowed X rotation - lowered significantly
+    // We ALWAYS clamp to relaxed position, especially during FBX animations
+    const targetX = 0.5; // Target X rotation for relaxed, natural shoulders (radians)
+    const maxX = 0.6; // Maximum allowed X rotation - very strict
     
     // Adjust left shoulder bone directly
     if (leftShoulderBone.quaternion) {
       tempEuler.setFromQuaternion(leftShoulderBone.quaternion, 'XYZ');
-      const originalX = tempEuler.x;
       
-      // Aggressively clamp X rotation to relaxed position
+      // ALWAYS clamp X rotation to relaxed position (no threshold check)
+      // During FBX animations, be even more aggressive
       if (tempEuler.x > maxX) {
-        // Force to target relaxed position
+        // Force to target relaxed position immediately
         tempEuler.x = targetX;
       } else if (tempEuler.x > targetX) {
-        // Smoothly reduce if slightly above target
-        tempEuler.x = targetX + (tempEuler.x - targetX) * 0.2; // More aggressive reduction
+        // If slightly above target, reduce aggressively
+        if (isFBXPlaying) {
+          // During FBX animations, force to target immediately
+          tempEuler.x = targetX;
+        } else {
+          // Otherwise, reduce smoothly but still aggressively
+          tempEuler.x = targetX + (tempEuler.x - targetX) * 0.1;
+        }
       }
       
-      // Only update if we actually changed something
-      if (Math.abs(tempEuler.x - originalX) > 0.01) {
-        tempQuaternion.setFromEuler(tempEuler, 'XYZ');
-        leftShoulderBone.quaternion.copy(tempQuaternion);
-        leftShoulderBone.updateMatrixWorld(true);
-      }
+      // Always apply the adjustment (no change detection)
+      tempQuaternion.setFromEuler(tempEuler, 'XYZ');
+      leftShoulderBone.quaternion.copy(tempQuaternion);
+      leftShoulderBone.updateMatrixWorld(true);
     }
     
     // Adjust right shoulder bone directly
     if (rightShoulderBone.quaternion) {
       tempEuler.setFromQuaternion(rightShoulderBone.quaternion, 'XYZ');
-      const originalX = tempEuler.x;
       
-      // Aggressively clamp X rotation to relaxed position
+      // ALWAYS clamp X rotation to relaxed position (no threshold check)
+      // During FBX animations, be even more aggressive
       if (tempEuler.x > maxX) {
-        // Force to target relaxed position
+        // Force to target relaxed position immediately
         tempEuler.x = targetX;
       } else if (tempEuler.x > targetX) {
-        // Smoothly reduce if slightly above target
-        tempEuler.x = targetX + (tempEuler.x - targetX) * 0.2; // More aggressive reduction
+        // If slightly above target, reduce aggressively
+        if (isFBXPlaying) {
+          // During FBX animations, force to target immediately
+          tempEuler.x = targetX;
+        } else {
+          // Otherwise, reduce smoothly but still aggressively
+          tempEuler.x = targetX + (tempEuler.x - targetX) * 0.1;
+        }
       }
       
-      // Only update if we actually changed something
-      if (Math.abs(tempEuler.x - originalX) > 0.01) {
-        tempQuaternion.setFromEuler(tempEuler, 'XYZ');
-        rightShoulderBone.quaternion.copy(tempQuaternion);
-        rightShoulderBone.updateMatrixWorld(true);
-      }
+      // Always apply the adjustment (no change detection)
+      tempQuaternion.setFromEuler(tempEuler, 'XYZ');
+      rightShoulderBone.quaternion.copy(tempQuaternion);
+      rightShoulderBone.updateMatrixWorld(true);
     }
   }