@sage-rsc/talking-head-react 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sage-rsc/talking-head-react",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "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,32 +1667,28 @@ class TalkingHead {
     const tempEuler = new THREE.Euler();
     const tempQuaternion = new THREE.Quaternion();
     
-    // Check if FBX animation is playing
-    const isFBXPlaying = this.mixer && this.currentFBXAction && this.currentFBXAction.isRunning();
-    
-    // Instead of forcing to a fixed value, reduce X rotation proportionally
-    // This maintains the relative relationship between shoulders and arms
-    // Natural relaxed shoulders: X rotation typically 0.3-0.6 radians
-    // High shoulders: X rotation > 0.8 radians
-    // We reduce high rotations by 40-50% to bring them down while maintaining arm relationships
-    const reductionFactor = isFBXPlaying ? 0.5 : 0.6; // Reduce by 50% during FBX, 40% otherwise
-    const maxAllowedX = 0.7; // Maximum allowed X rotation
+    // Research-based relaxed shoulder rotation values
+    // Natural relaxed shoulders: X rotation ~0.5-0.7 radians (much lower for natural look)
+    // 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
     
     // Adjust left shoulder bone directly
     if (leftShoulderBone.quaternion) {
       tempEuler.setFromQuaternion(leftShoulderBone.quaternion, 'XYZ');
       const originalX = tempEuler.x;
       
-      // Reduce X rotation proportionally if it's too high
-      if (tempEuler.x > maxAllowedX) {
-        // Reduce by percentage to maintain arm-shoulder relationship
-        tempEuler.x = maxAllowedX + (tempEuler.x - maxAllowedX) * (1 - reductionFactor);
-      } else if (tempEuler.x > 0.5) {
-        // Slight reduction for moderately high shoulders
-        tempEuler.x = tempEuler.x * (1 - reductionFactor * 0.5);
+      // Aggressively clamp X rotation to relaxed position
+      if (tempEuler.x > maxX) {
+        // Force to target relaxed position
+        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
       }
       
-      // Only update if we changed something significantly
+      // Only update if we actually changed something
       if (Math.abs(tempEuler.x - originalX) > 0.01) {
         tempQuaternion.setFromEuler(tempEuler, 'XYZ');
         leftShoulderBone.quaternion.copy(tempQuaternion);
@@ -1705,16 +1701,16 @@ class TalkingHead {
       tempEuler.setFromQuaternion(rightShoulderBone.quaternion, 'XYZ');
       const originalX = tempEuler.x;
       
-      // Reduce X rotation proportionally if it's too high
-      if (tempEuler.x > maxAllowedX) {
-        // Reduce by percentage to maintain arm-shoulder relationship
-        tempEuler.x = maxAllowedX + (tempEuler.x - maxAllowedX) * (1 - reductionFactor);
-      } else if (tempEuler.x > 0.5) {
-        // Slight reduction for moderately high shoulders
-        tempEuler.x = tempEuler.x * (1 - reductionFactor * 0.5);
+      // Aggressively clamp X rotation to relaxed position
+      if (tempEuler.x > maxX) {
+        // Force to target relaxed position
+        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
       }
       
-      // Only update if we changed something significantly
+      // Only update if we actually changed something
       if (Math.abs(tempEuler.x - originalX) > 0.01) {
         tempQuaternion.setFromEuler(tempEuler, 'XYZ');
         rightShoulderBone.quaternion.copy(tempQuaternion);
@@ -5764,6 +5760,7 @@ 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', '');
@@ -5774,8 +5771,13 @@ class TalkingHead {
           // Map bone name to avatar skeleton
           const mappedBoneName = mapBoneName(fbxBoneName);
           
-          // Note: We allow shoulder rotation tracks to play so arms position correctly
-          // The shoulder adjustment function will override them after animation updates
+          // 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
+            }
+          }
           
           if (mappedBoneName && property) {
             // Create new track with mapped bone name
@@ -5804,6 +5806,10 @@ 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(', '));
         }