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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sage-rsc/talking-head-react",
-  "version": "1.4.7",
+  "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);
     }
   }
 
@@ -5760,7 +5771,6 @@ class TalkingHead {
         // Filter and map animation tracks
         const mappedTracks = [];
         const unmappedBones = new Set();
-        let filteredShoulderTracks = 0;
         anim.tracks.forEach(track => {
           // Remove mixamorig prefix first
           let trackName = track.name.replaceAll('mixamorig', '');
@@ -5771,13 +5781,8 @@ class TalkingHead {
           // Map bone name to avatar skeleton
           const mappedBoneName = mapBoneName(fbxBoneName);
           
-          // Filter out shoulder rotation tracks - we'll control shoulders manually
-          if (mappedBoneName && (mappedBoneName === 'LeftShoulder' || mappedBoneName === 'RightShoulder')) {
-            if (property === 'quaternion' || property === 'rotation') {
-              filteredShoulderTracks++;
-              return; // Skip this track - don't add it to mappedTracks
-            }
-          }
+          // Note: We allow shoulder rotation tracks to play so arms position correctly
+          // The shoulder adjustment function will override them after animation updates
           
           if (mappedBoneName && property) {
             // Create new track with mapped bone name
@@ -5806,10 +5811,6 @@ class TalkingHead {
           }
         });
         
-        if (filteredShoulderTracks > 0) {
-          console.log(`✓ Filtered out ${filteredShoulderTracks} shoulder rotation track(s) to prevent high shoulders`);
-        }
-        
         if (unmappedBones.size > 0) {
           console.warn(`⚠️ ${unmappedBones.size} bone(s) could not be mapped:`, Array.from(unmappedBones).sort().join(', '));
         }