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

package/dist/index.js

@@ -4016,7 +4016,7 @@ class Ne {
       default:
         r += 12, u = u * r;
     }
-    a = a * r, this.controlsEnd = new g.Vector3(a, u, 0), this.cameraEnd = new g.Vector3(a, u, r).applyEuler(new g.Euler(o, l, 0)), this.cameraClock === null && (this.controls.target.copy(this.controlsEnd), this.camera.position.copy(this.cameraEnd)), this.controlsStart = this.controls.target.clone(), this.cameraStart = this.camera.position.clone(), this.cameraClock = 0;
+    a = a * r, this.controlsEnd = new g.Vector3(a, u, 0), this.cameraEnd = new g.Vector3(a, u, r).applyEuler(new g.Euler(o, l, 0)), this.controls && (this.cameraClock === null && (this.controls.target.copy(this.controlsEnd), this.camera.position.copy(this.cameraEnd)), this.controlsStart = this.controls.target.clone(), this.cameraStart = this.camera.position.clone(), this.cameraClock = 0);
   }
   /**
   * Change light colors and intensities.
@@ -4035,7 +4035,7 @@ class Ne {
   * Resize avatar.
   */
   onResize() {
-    this.isAvatarOnly || (this.camera.aspect = this.nodeAvatar.clientWidth / this.nodeAvatar.clientHeight, this.camera.updateProjectionMatrix(), this.renderer.setSize(this.nodeAvatar.clientWidth, this.nodeAvatar.clientHeight), this.controls.update(), this.render());
+    this.isAvatarOnly || (this.camera.aspect = this.nodeAvatar.clientWidth / this.nodeAvatar.clientHeight, this.camera.updateProjectionMatrix(), this.renderer.setSize(this.nodeAvatar.clientWidth, this.nodeAvatar.clientHeight), this.controls && this.controls.update(), this.render());
   }
   /**
   * Update avatar pose.
@@ -4240,8 +4240,9 @@ class Ne {
       if ((!i && !s || i && s) && (this.poseTarget.props = this.mirrorPose(this.poseTarget.props), this.poseWeightOnLeft = !this.poseWeightOnLeft), this.gesture)
         for (let [l, h] of Object.entries(this.gesture))
           this.poseTarget.props.hasOwnProperty(l) && (this.poseTarget.props[l].copy(h), this.poseTarget.props[l].t = h.t, this.poseTarget.props[l].d = h.d);
-      this.poseBase && this.poseBase.props && this.poseDelta && this.poseDelta.props && Object.keys(this.poseDelta.props).forEach((l) => {
-        !this.poseTarget.props.hasOwnProperty(l) && this.poseBase.props[l] && (this.poseTarget.props[l] = this.poseBase.props[l].clone(), this.poseTarget.props[l].t = this.animClock, this.poseTarget.props[l].d = o);
+      this.poseBase && this.poseBase.props && this.poseDelta && this.poseDelta.props && this.poseTarget && this.poseTarget.props && Object.keys(this.poseDelta.props).forEach((l) => {
+        const h = this.poseBase.props[l];
+        !this.poseTarget.props.hasOwnProperty(l) && h && typeof h == "object" && typeof h.clone == "function" && (this.poseTarget.props[l] = h.clone(), this.poseTarget.props[l].t = this.animClock, this.poseTarget.props[l].d = o);
       });
     }
   }
@@ -4589,12 +4590,12 @@ class Ne {
     })))), e > 2 * this.animFrameDur && (e = 2 * this.animFrameDur), (this.viewName !== "full" || this.isAvatarOnly) && (t = this.mtRandomized[Math.floor(Math.random() * this.mtRandomized.length)], i = this.mtAvatar[t], i.needsUpdate || Object.assign(i, { base: (this.mood.baseline[t] || 0) + (1 + l / 255) * Math.random() / 5, needsUpdate: !0 })), this.updatePoseBase(this.animClock), this.mixer && this.mixer.update(e / 1e3 * this.mixer.timeScale), this.updatePoseDelta(), (this.isSpeaking || this.isListening) && h ? l > this.volumeMax ? (this.volumeHeadBase = 0.05, Math.random() > 0.6 && (this.volumeHeadTarget = -0.05 - Math.random() / 15), this.volumeMax = l) : (this.volumeMax *= 0.92, this.volumeHeadTarget = this.volumeHeadBase - 0.9 * (this.volumeHeadBase - this.volumeHeadTarget)) : (this.volumeHeadTarget = 0, this.volumeMax = 0), t = this.volumeHeadTarget - this.volumeHeadCurrent, i = Math.abs(t), i > 1e-4 && (o = i * (this.volumeHeadEasing(Math.min(1, this.volumeHeadVelocity * e / 1e3 / i) / 2 + 0.5) - 0.5), this.volumeHeadCurrent += Math.sign(t) * Math.min(i, o)), Math.abs(this.volumeHeadCurrent) > 1e-4 && (K.setFromAxisAngle(dt, this.volumeHeadCurrent), this.objectNeck.quaternion.multiply(K)), We.setFromObject(this.armature), this.objectLeftToeBase.getWorldPosition(Re), Re.sub(this.armature.position), this.objectRightToeBase.getWorldPosition(Ie), Ie.sub(this.armature.position), this.objectHips.position.y -= We.min.y / 2, this.objectHips.position.x -= (Re.x + Ie.x) / 4, this.objectHips.position.z -= (Re.z + Ie.z) / 2, this.dynamicbones.update(e), this.fbxAnimationLoader && this.fbxAnimationLoader.update(), this.applyShoulderAdjustmentToBones(), this.opt.update && this.opt.update(e), this.updateMorphTargets(e), this.isAvatarOnly)
       this.stats && this.stats.end();
     else {
-      if (this.cameraClock !== null && this.cameraClock < 1e3) {
+      if (this.controls && this.cameraClock !== null && this.cameraClock < 1e3) {
         this.cameraClock += e, this.cameraClock > 1e3 && (this.cameraClock = 1e3);
         let r = new g.Spherical().setFromVector3(this.cameraStart), d = new g.Spherical().setFromVector3(this.cameraEnd);
         r.phi += this.easing(this.cameraClock / 1e3) * (d.phi - r.phi), r.theta += this.easing(this.cameraClock / 1e3) * (d.theta - r.theta), r.radius += this.easing(this.cameraClock / 1e3) * (d.radius - r.radius), r.makeSafe(), this.camera.position.setFromSpherical(r), this.controlsStart.x !== this.controlsEnd.x ? this.controls.target.copy(this.controlsStart.lerp(this.controlsEnd, this.easing(this.cameraClock / 1e3))) : (r.setFromVector3(this.controlsStart), d.setFromVector3(this.controlsEnd), r.phi += this.easing(this.cameraClock / 1e3) * (d.phi - r.phi), r.theta += this.easing(this.cameraClock / 1e3) * (d.theta - r.theta), r.radius += this.easing(this.cameraClock / 1e3) * (d.radius - r.radius), r.makeSafe(), this.controls.target.setFromSpherical(r)), this.controls.update();
       }
-      this.controls.autoRotate && this.controls.update(), this.stats && this.stats.end(), this.render();
+      this.controls && this.controls.autoRotate && this.controls.update(), this.stats && this.stats.end(), this.render();
     }
   }
   /**
@@ -5431,14 +5432,14 @@ class Ne {
   * @return {numeric} Autorotate speed.
   */
   getAutoRotateSpeed(n) {
-    return this.controls.autoRotateSpeed;
+    return this.controls ? this.controls.autoRotateSpeed : 0;
   }
   /**
   * Set autorotate.
   * @param {numeric} speed Autorotate speed, e.g. value 2 = 30 secs per orbit at 60fps.
   */
   setAutoRotateSpeed(n) {
-    this.controls.autoRotateSpeed = n, this.controls.autoRotate = n > 0;
+    this.controls && (this.controls.autoRotateSpeed = n, this.controls.autoRotate = n > 0);
   }
   /**
   * Start animation cycle.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sage-rsc/talking-head-react",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "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

@@ -1512,6 +1512,11 @@ class TalkingHead {
     this.controlsEnd = new THREE.Vector3(x, y, 0);
     this.cameraEnd = new THREE.Vector3(x, y, z).applyEuler( new THREE.Euler( cameraRotateX, cameraRotateY, 0 ) );
 
+    // Guard against null controls (e.g., in avatarOnly mode or before initialization)
+    if ( !this.controls ) {
+      return;
+    }
+
     if ( this.cameraClock === null ) {
       this.controls.target.copy( this.controlsEnd );
       this.camera.position.copy( this.cameraEnd );
@@ -1585,7 +1590,9 @@ class TalkingHead {
       this.camera.aspect = this.nodeAvatar.clientWidth / this.nodeAvatar.clientHeight;
       this.camera.updateProjectionMatrix();
       this.renderer.setSize( this.nodeAvatar.clientWidth, this.nodeAvatar.clientHeight );
+      if ( this.controls ) {
       this.controls.update();
+      }
       this.render();
     }
   }
@@ -2089,10 +2096,12 @@ class TalkingHead {
 
     // Make sure deltas are included in the target
     // Guard against disposal: check if poseBase and its props exist
-    if (this.poseBase && this.poseBase.props && this.poseDelta && this.poseDelta.props) {
+    if (this.poseBase && this.poseBase.props && this.poseDelta && this.poseDelta.props && this.poseTarget && this.poseTarget.props) {
     Object.keys(this.poseDelta.props).forEach( key => {
-        if ( !this.poseTarget.props.hasOwnProperty(key) && this.poseBase.props[key] ) {
-        this.poseTarget.props[key] = this.poseBase.props[key].clone();
+        const baseProp = this.poseBase.props[key];
+        // Ensure baseProp exists, is an object, and has a clone method
+        if ( !this.poseTarget.props.hasOwnProperty(key) && baseProp && typeof baseProp === 'object' && typeof baseProp.clone === 'function' ) {
+          this.poseTarget.props[key] = baseProp.clone();
         this.poseTarget.props[key].t = this.animClock;
         this.poseTarget.props[key].d = duration;
       }
@@ -2829,7 +2838,7 @@ class TalkingHead {
     } else {
 
       // Camera
-      if ( this.cameraClock !== null && this.cameraClock < 1000 ) {
+      if ( this.controls && this.cameraClock !== null && this.cameraClock < 1000 ) {
         this.cameraClock += dt;
         if ( this.cameraClock > 1000 ) this.cameraClock = 1000;
         let s = new THREE.Spherical().setFromVector3(this.cameraStart);
@@ -2854,7 +2863,7 @@ class TalkingHead {
       }
 
       // Autorotate
-      if ( this.controls.autoRotate ) this.controls.update();
+      if ( this.controls && this.controls.autoRotate ) this.controls.update();
 
       // Statistics end
       if ( this.stats ) {
@@ -2890,7 +2899,7 @@ class TalkingHead {
       const langLower = lang.toLowerCase();
       // Use statically imported modules from LIPSYNC_MODULES
       if (LIPSYNC_MODULES[langLower]) {
-        const className = 'Lipsync' + lang.charAt(0).toUpperCase() + lang.slice(1);
+      const className = 'Lipsync' + lang.charAt(0).toUpperCase() + lang.slice(1);
         if (LIPSYNC_MODULES[langLower][className]) {
           this.lipsync[lang] = new LIPSYNC_MODULES[langLower][className];
         } else {
@@ -4358,7 +4367,7 @@ class TalkingHead {
   * @return {numeric} Autorotate speed.
   */
   getAutoRotateSpeed(k) {
-    return this.controls.autoRotateSpeed;
+    return this.controls ? this.controls.autoRotateSpeed : 0;
   }
 
   /**
@@ -4366,8 +4375,10 @@ class TalkingHead {
   * @param {numeric} speed Autorotate speed, e.g. value 2 = 30 secs per orbit at 60fps.
   */
   setAutoRotateSpeed(speed) {
+    if ( this.controls ) {
     this.controls.autoRotateSpeed = speed;
     this.controls.autoRotate = (speed > 0);
+    }
   }
 
   /**