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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sage-rsc/talking-head-react",
-  "version": "1.3.8",
+  "version": "1.4.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/scripts/merge-talkinghead.js

@@ -0,0 +1,108 @@
+#!/usr/bin/env node
+/**
+ * Merge script to update TalkingHead while preserving customizations
+ * 
+ * This script:
+ * 1. Takes upstream talkinghead.mjs as base
+ * 2. Extracts custom methods from current version
+ * 3. Inserts them into the right places in upstream version
+ */
+
+import fs from 'fs';
+import path from 'path';
+
+const UPSTREAM_FILE = '/tmp/upstream-talkinghead.mjs';
+const CURRENT_FILE = 'src/lib/talkinghead.mjs';
+const OUTPUT_FILE = 'src/lib/talkinghead.mjs.merged';
+
+// Custom methods to extract and preserve
+const CUSTOM_METHODS = [
+  'lockAvatarPosition',
+  'unlockAvatarPosition', 
+  'maintainLockedPosition',
+  'applyShoulderAdjustment',
+  'applyShoulderAdjustmentToBones',
+  'initializeFBXAnimationLoader',
+  'setBodyMovement',
+  'applyBodyMovementAnimation',
+  'createBodyMovementAnimation'
+];
+
+// Custom code sections to preserve
+const CUSTOM_SECTIONS = [
+  // Imports
+  { start: /import \{ AudioAnalyzer \}/, end: /^import/ },
+  { start: /\/\/ Import lipsync modules statically/, end: /^const LIPSYNC_MODULES/ },
+  { start: /^const LIPSYNC_MODULES/, end: /^\};/ },
+  
+  // Position locking calls in methods
+  { start: /this\.lockAvatarPosition\(\)/, end: null },
+  { start: /this\.unlockAvatarPosition\(\)/, end: null },
+  { start: /this\.maintainLockedPosition\(\)/, end: null },
+  { start: /this\.positionWasLocked/, end: null },
+  
+  // Shoulder adjustment calls
+  { start: /this\.applyShoulderAdjustment\(\)/, end: null },
+  { start: /this\.applyShoulderAdjustmentToBones\(\)/, end: null },
+  
+  // FBX loader calls
+  { start: /this\.fbxAnimationLoader/, end: null },
+];
+
+console.log('Reading files...');
+const upstream = fs.readFileSync(UPSTREAM_FILE, 'utf8');
+const current = fs.readFileSync(CURRENT_FILE, 'utf8');
+
+console.log(`Upstream: ${upstream.split('\\n').length} lines`);
+console.log(`Current: ${current.split('\\n').length} lines`);
+
+// Extract custom methods from current file
+const customMethods = {};
+const lines = current.split('\\n');
+
+CUSTOM_METHODS.forEach(methodName => {
+  const methodRegex = new RegExp(`^  ${methodName}\\(`);
+  const startIdx = lines.findIndex(line => methodRegex.test(line));
+  
+  if (startIdx !== -1) {
+    // Find the end of the method (next method or closing brace at same indent level)
+    let braceCount = 0;
+    let inMethod = false;
+    let endIdx = startIdx;
+    
+    for (let i = startIdx; i < lines.length; i++) {
+      const line = lines[i];
+      if (line.match(/^  [a-zA-Z].*\(/)) {
+        if (inMethod && braceCount === 0) {
+          endIdx = i;
+          break;
+        }
+        if (line.match(methodRegex)) {
+          inMethod = true;
+        }
+      }
+      braceCount += (line.match(/{/g) || []).length;
+      braceCount -= (line.match(/}/g) || []).length;
+      
+      if (inMethod && braceCount === 0 && i > startIdx) {
+        endIdx = i + 1;
+        break;
+      }
+    }
+    
+    customMethods[methodName] = lines.slice(startIdx, endIdx).join('\\n');
+    console.log(`Extracted ${methodName}: ${endIdx - startIdx} lines`);
+  }
+});
+
+console.log('\\nExtracted custom methods:', Object.keys(customMethods));
+
+// For now, just report what was found
+console.log('\\n=== Merge Strategy ===');
+console.log('1. Start with upstream file');
+console.log('2. Add custom imports at top');
+console.log('3. Insert custom methods before dispose()');
+console.log('4. Add custom method calls in appropriate places');
+console.log('\\nManual merge required due to complexity.');
+console.log('See CUSTOMIZATIONS.md for detailed list of what to preserve.');
+

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 ""
+