@sage-rsc/talking-head-react 1.3.8 → 1.3.9

package/dist/index.js

@@ -4398,14 +4398,14 @@ class Be {
    * This is called from updatePoseBase for pose-based animations
    */
   applyShoulderAdjustment() {
-    const e = new y.Euler();
+    const t = new y.Euler(), e = 1;
     if (this.poseAvatar.props["LeftShoulder.quaternion"]) {
       const n = this.poseAvatar.props["LeftShoulder.quaternion"];
-      e.setFromQuaternion(n, "XYZ"), e.x += -0.6, n.setFromEuler(e, "XYZ");
+      t.setFromQuaternion(n, "XYZ"), t.x > e && (t.x = Math.max(e, t.x - 0.4)), n.setFromEuler(t, "XYZ");
     }
     if (this.poseAvatar.props["RightShoulder.quaternion"]) {
       const n = this.poseAvatar.props["RightShoulder.quaternion"];
-      e.setFromQuaternion(n, "XYZ"), e.x += -0.6, n.setFromEuler(e, "XYZ");
+      t.setFromQuaternion(n, "XYZ"), t.x > e && (t.x = Math.max(e, t.x - 0.4)), n.setFromEuler(t, "XYZ");
     }
   }
   /**
@@ -4415,8 +4415,10 @@ class Be {
    */
   applyShoulderAdjustmentToBones() {
     if (!this.armature) return;
-    const t = -0.6, e = new y.Euler(), n = new y.Quaternion(), i = this.armature.getObjectByName("LeftShoulder"), s = this.armature.getObjectByName("RightShoulder");
-    i && i.quaternion && (e.setFromQuaternion(i.quaternion, "XYZ"), e.x += t, n.setFromEuler(e, "XYZ"), i.quaternion.copy(n), i.updateMatrixWorld(!0)), s && s.quaternion && (e.setFromQuaternion(s.quaternion, "XYZ"), e.x += t, n.setFromEuler(e, "XYZ"), s.quaternion.copy(n), s.updateMatrixWorld(!0));
+    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 = 1;
+    t.quaternion && (n.setFromQuaternion(t.quaternion, "XYZ"), n.x > s && (n.x = Math.max(s, n.x - 0.4)), i.setFromEuler(n, "XYZ"), t.quaternion.copy(i), t.updateMatrixWorld(!0)), e.quaternion && (n.setFromQuaternion(e.quaternion, "XYZ"), n.x > s && (n.x = Math.max(s, n.x - 0.4)), 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.3.8",
+  "version": "1.3.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/scripts/update-talkinghead.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+# Script to help update TalkingHead while preserving customizations
+
+set -e
+
+echo "=== TalkingHead Update Helper ==="
+echo ""
+echo "This script helps identify customizations to preserve during update."
+echo ""
+
+# Colors for output
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+echo -e "${GREEN}Step 1: Identifying custom methods...${NC}"
+echo ""
+echo "=== Position Locking Methods ==="
+grep -n "lockAvatarPosition\|unlockAvatarPosition\|maintainLockedPosition" src/lib/talkinghead.mjs | head -20
+
+echo ""
+echo "=== Shoulder Adjustment Methods ==="
+grep -n "applyShoulderAdjustment" src/lib/talkinghead.mjs | head -10
+
+echo ""
+echo "=== Position Locking Calls ==="
+grep -n "lockAvatarPosition\|unlockAvatarPosition\|positionWasLocked\|lockedPosition" src/lib/talkinghead.mjs | head -20
+
+echo ""
+echo -e "${YELLOW}Step 2: Custom files to preserve (DO NOT REPLACE):${NC}"
+echo "- src/components/TalkingHeadComponent.jsx"
+echo "- src/components/TalkingHeadAvatar.jsx"
+echo "- src/components/SimpleTalkingAvatar.jsx"
+echo "- src/components/CurriculumLearning.jsx"
+echo "- src/config/ttsConfig.js"
+echo "- src/lib/enhancedFBXLoader.js"
+echo "- src/lib/fbxAnimationLoader.js"
+echo "- src/utils/animationLoader.js"
+echo "- scripts/generate-animation-manifest.js"
+
+echo ""
+echo -e "${GREEN}Step 3: Next steps:${NC}"
+echo "1. Download latest TalkingHead source"
+echo "2. Compare talkinghead.mjs files"
+echo "3. Merge changes while preserving custom methods above"
+echo "4. Test thoroughly"
+echo ""
+echo "To compare files, use:"
+echo "  diff -u old-talkinghead.mjs src/lib/talkinghead.mjs > talkinghead.diff"
+echo ""
+

package/src/lib/talkinghead.mjs

@@ -1618,15 +1618,17 @@ class TalkingHead {
    * This is called from updatePoseBase for pose-based animations
    */
   applyShoulderAdjustment() {
-    // Shoulder adjustment: reduce X-axis rotation by ~0.6 radians (34 degrees) to lower shoulders to a relaxed position
-    const shoulderAdjustment = -0.6; // Negative to lower shoulders (increased for more relaxed look)
     const tempEuler = new THREE.Euler();
+    const maxX = 1.0; // Maximum X rotation for relaxed shoulders
     
     // Adjust left shoulder
     if (this.poseAvatar.props['LeftShoulder.quaternion']) {
       const leftShoulder = this.poseAvatar.props['LeftShoulder.quaternion'];
       tempEuler.setFromQuaternion(leftShoulder, 'XYZ');
-      tempEuler.x += shoulderAdjustment; // Reduce X rotation to lower shoulder
+      // Reduce X rotation if too high for relaxed shoulders
+      if (tempEuler.x > maxX) {
+        tempEuler.x = Math.max(maxX, tempEuler.x - 0.4);
+      }
       leftShoulder.setFromEuler(tempEuler, 'XYZ');
     }
     
@@ -1634,7 +1636,10 @@ class TalkingHead {
     if (this.poseAvatar.props['RightShoulder.quaternion']) {
       const rightShoulder = this.poseAvatar.props['RightShoulder.quaternion'];
       tempEuler.setFromQuaternion(rightShoulder, 'XYZ');
-      tempEuler.x += shoulderAdjustment; // Reduce X rotation to lower shoulder
+      // Reduce X rotation if too high for relaxed shoulders
+      if (tempEuler.x > maxX) {
+        tempEuler.x = Math.max(maxX, tempEuler.x - 0.4);
+      }
       rightShoulder.setFromEuler(tempEuler, 'XYZ');
     }
   }
@@ -1647,28 +1652,41 @@ class TalkingHead {
   applyShoulderAdjustmentToBones() {
     if (!this.armature) return;
     
-    // Shoulder adjustment: reduce X-axis rotation by ~0.6 radians (34 degrees) to lower shoulders
-    const shoulderAdjustment = -0.6; // Negative to lower shoulders
-    const tempEuler = new THREE.Euler();
-    const tempQuaternion = new THREE.Quaternion();
-    
     // Get shoulder bones directly from armature
     const leftShoulderBone = this.armature.getObjectByName('LeftShoulder');
     const rightShoulderBone = this.armature.getObjectByName('RightShoulder');
     
+    if (!leftShoulderBone || !rightShoulderBone) return;
+    
+    const tempEuler = new THREE.Euler();
+    const tempQuaternion = new THREE.Quaternion();
+    
+    // Target relaxed shoulder rotation for natural appearance
+    // Reduce X rotation (forward tilt) to lower shoulders
+    // Typical values: 1.5-1.8 (high/stiff) -> 0.9-1.1 (relaxed)
+    const maxX = 1.0; // Maximum X rotation for relaxed shoulders
+    
     // Adjust left shoulder bone directly
-    if (leftShoulderBone && leftShoulderBone.quaternion) {
+    if (leftShoulderBone.quaternion) {
       tempEuler.setFromQuaternion(leftShoulderBone.quaternion, 'XYZ');
-      tempEuler.x += shoulderAdjustment; // Reduce X rotation to lower shoulder
+      // Reduce X rotation if it's too high for relaxed shoulders
+      if (tempEuler.x > maxX) {
+        // Smooth interpolation towards relaxed position
+        tempEuler.x = Math.max(maxX, tempEuler.x - 0.4);
+      }
       tempQuaternion.setFromEuler(tempEuler, 'XYZ');
       leftShoulderBone.quaternion.copy(tempQuaternion);
       leftShoulderBone.updateMatrixWorld(true);
     }
     
     // Adjust right shoulder bone directly
-    if (rightShoulderBone && rightShoulderBone.quaternion) {
+    if (rightShoulderBone.quaternion) {
       tempEuler.setFromQuaternion(rightShoulderBone.quaternion, 'XYZ');
-      tempEuler.x += shoulderAdjustment; // Reduce X rotation to lower shoulder
+      // Reduce X rotation if it's too high for relaxed shoulders
+      if (tempEuler.x > maxX) {
+        // Smooth interpolation towards relaxed position
+        tempEuler.x = Math.max(maxX, tempEuler.x - 0.4);
+      }
       tempQuaternion.setFromEuler(tempEuler, 'XYZ');
       rightShoulderBone.quaternion.copy(tempQuaternion);
       rightShoulderBone.updateMatrixWorld(true);