@memori.ai/memori-react 7.13.4 → 7.14.0

package/src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx

@@ -25,7 +25,9 @@ interface Props {
   avatarDepth?: number;
   stopProcessing: () => void;
   resetVisemeQueue: () => void;
-  updateCurrentViseme: (currentTime: number) => { name: string; weight: number } | null;
+  updateCurrentViseme: (
+    currentTime: number
+  ) => { name: string; weight: number } | null;
   setCameraZ: (value: number) => void;
 }
 
@@ -55,9 +57,15 @@ export const AvatarView: React.FC<Props & { halfBody: boolean }> = ({
     action: animation || 'Idle1',
     weight: 1,
   });
-  const [morphTargetInfluences, setMorphTargetInfluences] = useState<Record<string, number>>({});
-  const [morphTargetDictionary, setMorphTargetDictionary] = useState<Record<string, number>>({});
-  const [emotionMorphTargets, setEmotionMorphTargets] = useState<Record<string, number>>({});
+  const [morphTargetInfluences, setMorphTargetInfluences] = useState<
+    Record<string, number>
+  >({});
+  const [morphTargetDictionary, setMorphTargetDictionary] = useState<
+    Record<string, number>
+  >({});
+  const [emotionMorphTargets, setEmotionMorphTargets] = useState<
+    Record<string, number>
+  >({});
   const [isRPM, setIsRPM] = useState(false);
   const [timeScale, setTimeScale] = useState(0.8);
 
@@ -71,73 +79,92 @@ export const AvatarView: React.FC<Props & { halfBody: boolean }> = ({
   };
 
   // Helper function to get default emotion state (all set to 0)
-  const getDefaultEmotions = () => 
-    Object.keys(emotionMap).reduce((acc, key) => ({...acc, [key]: 0}), {});
+  const getDefaultEmotions = () =>
+    Object.keys(emotionMap).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
 
   // Handlers for different blend shape types
-  const handleRPMBlendShape = useCallback((outputContent: string) => 
-    MAPPING_BLEND_SHAPE_TO_EMOTION_RPM[outputContent as keyof typeof MAPPING_BLEND_SHAPE_TO_EMOTION_RPM],
-  []);
+  const handleRPMBlendShape = useCallback(
+    (outputContent: string) =>
+      MAPPING_BLEND_SHAPE_TO_EMOTION_RPM[
+        outputContent as keyof typeof MAPPING_BLEND_SHAPE_TO_EMOTION_RPM
+      ],
+    []
+  );
 
-  const handleCustomGLBBlendShape = useCallback((outputContent: string) => 
-    MAPPING_BLEND_SHAPE_TO_EMOTION_CUSTOM_GLB[outputContent as keyof typeof MAPPING_BLEND_SHAPE_TO_EMOTION_CUSTOM_GLB],
-  []);
+  const handleCustomGLBBlendShape = useCallback(
+    (outputContent: string) =>
+      MAPPING_BLEND_SHAPE_TO_EMOTION_CUSTOM_GLB[
+        outputContent as keyof typeof MAPPING_BLEND_SHAPE_TO_EMOTION_CUSTOM_GLB
+      ],
+    []
+  );
 
   // Handler for setting emotion morph target influences, used for RPM and GLB blend shapes
-  const setEmotionMorphTargetInfluences = useCallback((action: string, outputContent: string) => {
-    if (action.startsWith('Loading')) return;
+  const setEmotionMorphTargetInfluences = useCallback(
+    (action: string, outputContent: string) => {
+      if (action.startsWith('Loading')) return;
 
-    const defaultEmotions = getDefaultEmotions();
+      const defaultEmotions = getDefaultEmotions();
 
-    // If output content is default, set default emotions
-    if (outputContent === 'default') {
-      setEmotionMorphTargets(defaultEmotions);
-      return;
-    }
+      // If output content is default, set default emotions
+      if (outputContent === 'default') {
+        setEmotionMorphTargets(defaultEmotions);
+        return;
+      }
 
-    // If RPM, convert emotion to blend shape
-    /*from the chat output, we get the emotion and we convert it to the blend shapes
-    * we map the emotion to the blend shape, example:
-    * Anger -> {browDownLeft: 1, browDownRight: 0}
-    * Joy -> {browUpLeft: 1, browUpRight: 0}
-    * Surprise -> {browUpLeft: 1, browUpRight: 0}
-    * Sadness -> {browDownLeft: 1, browDownRight: 0}
-    * Fear -> {browDownLeft: 1, browDownRight: 0}
-    */ 
-    if (isRPM) {
-      const emotion = handleRPMBlendShape(outputContent);
-      setEmotionMorphTargets((_) => ({...defaultEmotions, ...emotion}));
-    } else {
-      // If GLB, convert italian emotions to english ones
-      const emotion = handleCustomGLBBlendShape(outputContent);
-      const emotionValues = emotion === 'default' ? defaultEmotions : emotionMap[emotion];
-      setEmotionMorphTargets((_) => ({...defaultEmotions, ...emotionValues}));
-    }
-  }, [isRPM, handleRPMBlendShape, handleCustomGLBBlendShape]);
+      // If RPM, convert emotion to blend shape
+      /*from the chat output, we get the emotion and we convert it to the blend shapes
+       * we map the emotion to the blend shape, example:
+       * Anger -> {browDownLeft: 1, browDownRight: 0}
+       * Joy -> {browUpLeft: 1, browUpRight: 0}
+       * Surprise -> {browUpLeft: 1, browUpRight: 0}
+       * Sadness -> {browDownLeft: 1, browDownRight: 0}
+       * Fear -> {browDownLeft: 1, browDownRight: 0}
+       */
+      if (isRPM) {
+        const emotion = handleRPMBlendShape(outputContent);
+        setEmotionMorphTargets(_ => ({ ...defaultEmotions, ...emotion }));
+      } else {
+        // If GLB, convert italian emotions to english ones
+        const emotion = handleCustomGLBBlendShape(outputContent);
+        const emotionValues =
+          emotion === 'default' ? defaultEmotions : emotionMap[emotion];
+        setEmotionMorphTargets(_ => ({ ...defaultEmotions, ...emotionValues }));
+      }
+    },
+    [isRPM, handleRPMBlendShape, handleCustomGLBBlendShape]
+  );
 
   // Callback handlers for various avatar state changes
-  const onBaseActionChange = useCallback((action: string, outputContent: string) => {
+  const onBaseActionChange = useCallback(
+    (action: string, outputContent: string) => {
+      // Set emotion morph target influences
+      setEmotionMorphTargetInfluences(action, outputContent);
 
-    // Set emotion morph target influences
-    setEmotionMorphTargetInfluences(action, outputContent);
-
-    // Set current base action
-    setCurrentBaseAction({action, weight: 1});
-  }, [setEmotionMorphTargetInfluences]);
+      // Set current base action
+      setCurrentBaseAction({ action, weight: 1 });
+    },
+    [setEmotionMorphTargetInfluences]
+  );
 
-  const onMorphTargetInfluencesChange = useCallback((influences: Record<string, number>) => {
-    // Set morph target influences
-    setMorphTargetInfluences(prev => ({...prev, ...influences}));
-  }, []);
+  const onMorphTargetInfluencesChange = useCallback(
+    (influences: Record<string, number>) => {
+      // Set morph target influences
+      setMorphTargetInfluences(prev => ({ ...prev, ...influences }));
+    },
+    []
+  );
 
-  const onMorphTargetDictionaryChange = useCallback((dictionary: Record<string, number>) => {
-    // Set morph target dictionary
-    setMorphTargetDictionary(dictionary);
-  }, []);
+  const onMorphTargetDictionaryChange = useCallback(
+    (dictionary: Record<string, number>) => {
+      // Set morph target dictionary
+      setMorphTargetDictionary(dictionary);
+    },
+    []
+  );
 
   // Effect to handle animation changes based on loading state and chat emissions
   useEffect(() => {
-
     // If loading, set a random loading animation
     if (loading) {
       const randomNumber = Math.floor(Math.random() * 3) + 1;
@@ -145,16 +172,40 @@ export const AvatarView: React.FC<Props & { halfBody: boolean }> = ({
       return;
     }
 
-    // If there's chat emission, set the corresponding emotion animation
-    const hasOutputTag = chatEmission?.includes('<output class="memori-emotion">');
-    const outputContent = hasOutputTag
-      ? chatEmission?.split('<output class="memori-emotion">')[1]?.split('</output>')[0]?.trim()
+    // Check if chat emission contains animation control
+    const hasOutputTagEmotion = chatEmission?.includes(
+      '<output class="memori-emotion">'
+    );
+    const outputContentEmotion = hasOutputTagEmotion
+      ? chatEmission
+          ?.split('<output class="memori-emotion">')[1]
+          ?.split('</output>')[0]
+          ?.trim()
+      : null;
+
+    // Check if chat emission contains animation sequence
+    const hasOutputTagSequence = chatEmission?.includes(
+      '<output class="animation-sequence">'
+    );
+    const outputContentSequence = hasOutputTagSequence
+      ? chatEmission
+          ?.split('<output class="animation-sequence">')[1]
+          ?.split('</output>')[0]
+          ?.trim()
       : null;
 
-    // If there's an emotion, set the corresponding animation
-    if (outputContent) {
+    if (outputContentSequence && outputContentSequence.includes('->')) {
+      // It's a sequence
+      onBaseActionChange(outputContentSequence, outputContentSequence);
+    } else if (outputContentEmotion) {
+
+      console.log('[AvatarView] outputContentEmotion:', outputContentEmotion);
+      // It's an emotion
       const randomNumber = Math.floor(Math.random() * 3) + 1;
-      onBaseActionChange(`${outputContent}${randomNumber}`, outputContent);
+      onBaseActionChange(
+        `${outputContentEmotion}${randomNumber}`,
+        outputContentEmotion
+      );
     } else {
       const randomNumber = Math.floor(Math.random() * 5) + 1;
       onBaseActionChange(`Idle${randomNumber === 3 ? 4 : randomNumber}`, '');
@@ -187,12 +238,9 @@ export const AvatarView: React.FC<Props & { halfBody: boolean }> = ({
           modifyTimeScale={setTimeScale}
         />
       )}
-      
+
       {halfBody ? (
-        <HalfBodyAvatar
-          {...commonAvatarProps}
-          headMovement={headMovement}
-        />
+        <HalfBodyAvatar {...commonAvatarProps} headMovement={headMovement} />
       ) : (
         <FullbodyAvatar
           {...commonAvatarProps}

package/src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx

@@ -8,9 +8,9 @@ import {
 import { useAnimations, useGLTF } from '@react-three/drei';
 import { useFrame } from '@react-three/fiber';
 import { AnimationState, FullbodyAvatarProps } from './types';
-import { AnimationController } from './AnimationController';
-import { MorphTargetController } from '../MorphTargetController';
-import { AvatarPositionController } from '../PositionController';
+import { AnimationController } from '../controllers/AnimationController';
+import { MorphTargetController } from '../controllers/MorphTargetController';
+import { AvatarPositionController } from '../controllers/AvatarPositionController';
 import {
   AVATAR_POSITION,
   AVATAR_ROTATION,
@@ -152,6 +152,8 @@ export function FullbodyAvatar({
         AnimationState.LOADING,
         currentBaseAction.action
       );
+    }  else if (currentBaseAction.action.includes('->')) {
+      animationControllerRef.current.playSequence(currentBaseAction.action);
     } else if (currentBaseAction.action.startsWith('Idle')) {
       animationControllerRef.current.transitionTo(AnimationState.IDLE);
     } else {

package/src/components/Avatar/AvatarView/AvatarComponent/components/{FullbodyAvatar → controllers}/AnimationController.ts

@@ -1,4 +1,4 @@
-import { AnimationState, AnimationConfig } from './types';
+import { AnimationState, AnimationConfig } from '../FullbodyAvatar/types';
 import { AnimationAction, AnimationMixer, LoopOnce } from 'three';
 import { DEFAULT_CONFIG, MAX_IDLE_LOOPS_DEFAULT } from '../../constants';
 
@@ -28,6 +28,10 @@ export class AnimationController {
   private lastAnimationTime: number = 0;
   // Flag to check if chat has already started
   private isChatAlreadyStarted: boolean = false;
+  // Sequence of animations
+  private sequence: string[] | null = null;
+  // Index of current animation in sequence
+  private sequenceIndex: number = 0;
 
   constructor(
     mixer: AnimationMixer,
@@ -108,6 +112,33 @@ export class AnimationController {
     return idleAction;
   }
 
+  /**
+   * Plays a sequence of animations
+   */
+  playSequence(sequenceString: string) {
+    const animations = sequenceString.split('->').map(anim => anim.trim());
+    console.log('[AnimationController] playSequence:', animations);
+
+    this.sequence = animations;
+    this.sequenceIndex = 0;
+
+    const firstAnim = this.parseAnimationName(animations[0]);
+    this.transitionTo(AnimationState.EMOTION, firstAnim);
+  }
+
+  // Animation Name Parsing
+  private parseAnimationName(animation: string): string {
+    const randomMatch = animation.match(/(\w+)\[(\d+),(\d+)\]/);
+    if (randomMatch) {
+      const [_, base, min, max] = randomMatch;
+      const random =
+        Math.floor(Math.random() * (Number(max) - Number(min) + 1)) +
+        Number(min);
+      return `${base}${random}`;
+    }
+    return animation;
+  }
+
   /**
    * Transitions to a new animation state
    */
@@ -197,6 +228,26 @@ export class AnimationController {
     // Check for loop completion in idle animations
     this.checkForLoop();
 
+    // Sequence progression,
+    // If sequence is playing, transition to the next animation in the sequence
+    // If sequence is finished, transition to idle
+    if (
+      this.sequence &&
+      this.currentState === AnimationState.EMOTION &&
+      this.currentAction.time >= this.currentAction.getClip().duration * 0.9
+    ) {
+      this.sequenceIndex++;
+
+      if (this.sequenceIndex < this.sequence.length) {
+        const nextAnim = this.parseAnimationName(this.sequence[this.sequenceIndex]);
+        this.transitionTo(AnimationState.EMOTION, nextAnim);
+      } else {
+        this.sequence = null;
+        this.sequenceIndex = 0;
+        this.transitionTo(AnimationState.IDLE);
+      }
+    }
+
     // Check if emotion/loading animation is finished
     if (
       this.currentState !== AnimationState.IDLE &&

package/src/components/Avatar/AvatarView/AvatarComponent/components/{PositionController.ts → controllers/AvatarPositionController.ts}

@@ -1,5 +1,5 @@
 import { Vector3, MathUtils } from 'three';
-import { AVATAR_POSITION, AVATAR_POSITION_ZOOMED } from '../constants';
+import { AVATAR_POSITION, AVATAR_POSITION_ZOOMED } from '../../constants';
 
 export class AvatarPositionController {
   private currentScale: Vector3;

package/src/components/Avatar/AvatarView/AvatarComponent/components/{MorphTargetController.ts → controllers/MorphTargetController.ts}

@@ -1,6 +1,6 @@
 import { SkinnedMesh } from 'three';
 import { MathUtils } from 'three';
-import { EMOTION_SMOOTHING, VISEME_SMOOTHING, BLINK_CONFIG } from '../constants';
+import { EMOTION_SMOOTHING, VISEME_SMOOTHING, BLINK_CONFIG } from '../../constants';
 
 /**
  * Controller class for handling morph target animations including emotions, visemes and blinking
@@ -62,7 +62,6 @@ export class MorphTargetController {
             targetEmotionValue * 3, // Amplify emotion by 3x
             EMOTION_SMOOTHING
           );
-          console.log(`[MorphTargetController] Emotion ${key}: current=${currentEmotionValue}, target=${targetEmotionValue}, new=${newEmotionValue}`);
           this.currentEmotionValues[key] = newEmotionValue;
           targetValue += newEmotionValue;
         }

package/src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx

@@ -3,8 +3,8 @@ import { Object3D, SkinnedMesh } from 'three';
 import { useGLTF } from '@react-three/drei';
 import { useGraph, useFrame, useThree } from '@react-three/fiber';
 import { correctMaterials, isSkinnedMesh } from '../../../../../helpers/utils';
-import { MorphTargetController } from './MorphTargetController';
-import { AvatarPositionController } from './PositionController';
+import { MorphTargetController } from './controllers/MorphTargetController';
+import { AvatarPositionController } from './controllers/AvatarPositionController';
 import {
   AVATAR_POSITION,
   SCALE_LERP_FACTOR,

package/src/index.stories.tsx

@@ -166,6 +166,22 @@ GiovannaGLBProva.args = {
   layout: 'ZOOMED_FULL_BODY',
 };
 
+export const MoodChefAssistant = Template.bind({});
+MoodChefAssistant.args = {
+  memoriName: 'Mood Chef Assistant',
+  ownerUserName: 'andrea.patini3',
+  memoriID: 'fb4f9251-e7ec-4002-b0e5-ffa6e75b2fd8',
+  ownerUserID: '58770358-a5db-4b49-b3a4-734fc468e745',
+  tenantID: 'aisuru-staging.aclambda.online',
+  engineURL: 'https://engine-staging-tmp.memori.ai',
+  apiURL: 'https://backend-staging.memori.ai',
+  baseURL: 'https://aisuru-staging.aclambda.online',
+  uiLang: 'EN',
+  spokenLang: 'IT',
+  layout: 'ZOOMED_FULL_BODY',
+  integrationID: '6e289cc1-df99-4879-8a3a-fe10baea7eac',
+};
+
 export const GiovannaProvaWithPreviousSession = Template.bind({});
 GiovannaProvaWithPreviousSession.args = {
   memoriName: 'Giovanna Test',

package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MorhTargetController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.ts"],"names":[],"mappings":"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"}

package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.d.ts

@@ -1,17 +0,0 @@
-import { Vector3, Euler } from 'three';
-import { AnimationConfig } from './types';
-export declare const AVATAR_POSITION: Vector3;
-export declare const AVATAR_ROTATION: Euler;
-export declare const AVATAR_POSITION_ZOOMED: Vector3;
-export declare const ANIMATION_URLS: {
-    MALE: string;
-    FEMALE: string;
-};
-export declare const BLINK_CONFIG: {
-    minInterval: number;
-    maxInterval: number;
-    blinkDuration: number;
-};
-export declare const DEFAULT_CONFIG: AnimationConfig;
-export declare const EMOTION_SMOOTHING = 0.3;
-export declare const VISEME_SMOOTHING = 0.5;

package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.VISEME_SMOOTHING = exports.EMOTION_SMOOTHING = exports.DEFAULT_CONFIG = exports.BLINK_CONFIG = exports.ANIMATION_URLS = exports.AVATAR_POSITION_ZOOMED = exports.AVATAR_ROTATION = exports.AVATAR_POSITION = void 0;
-const three_1 = require("three");
-exports.AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
-exports.AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
-exports.AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.45, 0);
-exports.ANIMATION_URLS = {
-    MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
-    FEMALE: 'https://assets.memori.ai/api/v2/asset/2adc934b-24b2-45bd-94ad-ffec58d3cb32.glb',
-};
-exports.BLINK_CONFIG = {
-    minInterval: 1000,
-    maxInterval: 5000,
-    blinkDuration: 150,
-};
-exports.DEFAULT_CONFIG = {
-    fadeInDuration: 0.8,
-    fadeOutDuration: 0.8,
-    idleCount: 5,
-    timeScale: 1.0,
-};
-exports.EMOTION_SMOOTHING = 0.3;
-exports.VISEME_SMOOTHING = 0.5;
-//# sourceMappingURL=constants.js.map

package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.ts"],"names":[],"mappings":";;;AAAA,iCAAuC;AAG1B,QAAA,eAAe,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACxC,QAAA,eAAe,GAAG,IAAI,aAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACzC,QAAA,sBAAsB,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAElD,QAAA,cAAc,GAAG;IAC5B,IAAI,EAAE,gFAAgF;IACtF,MAAM,EACJ,gFAAgF;CACnF,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,GAAG;CACnB,CAAC;AAEW,QAAA,cAAc,GAAoB;IAC7C,cAAc,EAAE,GAAG;IACnB,eAAe,EAAE,GAAG;IACpB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC;AAEW,QAAA,iBAAiB,GAAG,GAAG,CAAC;AACxB,QAAA,gBAAgB,GAAG,GAAG,CAAC"}

package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts

@@ -1,26 +0,0 @@
-interface FullbodyAvatarProps {
-    url: string;
-    sex: 'MALE' | 'FEMALE';
-    onLoaded?: () => void;
-    currentBaseAction: {
-        action: string;
-        weight: number;
-    };
-    timeScale: number;
-    isZoomed?: boolean;
-    eyeBlink?: boolean;
-    stopProcessing: () => void;
-    resetVisemeQueue: () => void;
-    updateCurrentViseme: (currentTime: number) => {
-        name: string;
-        weight: number;
-    } | null;
-    smoothMorphTarget?: boolean;
-    morphTargetSmoothing?: number;
-    morphTargetInfluences: Record<string, number>;
-    setMorphTargetDictionary: (morphTargetDictionary: Record<string, number>) => void;
-    setMorphTargetInfluences: (morphTargetInfluences: Record<string, number>) => void;
-    emotionMorphTargets: Record<string, number>;
-}
-export default function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, isZoomed, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }: FullbodyAvatarProps): JSX.Element;
-export {};

package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js

@@ -1,166 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
-const three_1 = require("three");
-const drei_1 = require("@react-three/drei");
-const fiber_1 = require("@react-three/fiber");
-const AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
-const AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
-const AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.45, 0);
-const ANIMATION_URLS = {
-    MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
-    FEMALE: 'https://assets.memori.ai/api/v2/asset/8d1a5853-f05a-4a34-9f99-6eff64986081.glb',
-};
-const BLINK_CONFIG = {
-    minInterval: 1000,
-    maxInterval: 5000,
-    blinkDuration: 150,
-};
-const EMOTION_SMOOTHING = 0.3;
-const VISME_SMOOTHING = 0.5;
-function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, isZoomed, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }) {
-    const { scene } = (0, drei_1.useGLTF)(url);
-    const { animations } = (0, drei_1.useGLTF)(ANIMATION_URLS[sex]);
-    const { actions } = (0, drei_1.useAnimations)(animations, scene);
-    const mixerRef = (0, react_1.useRef)();
-    const headMeshRef = (0, react_1.useRef)();
-    const currentActionRef = (0, react_1.useRef)(null);
-    const isTransitioningToIdleRef = (0, react_1.useRef)(false);
-    const lastBlinkTimeRef = (0, react_1.useRef)(0);
-    const nextBlinkTimeRef = (0, react_1.useRef)(0);
-    const isBlinkingRef = (0, react_1.useRef)(false);
-    const blinkStartTimeRef = (0, react_1.useRef)(0);
-    const currentEmotionRef = (0, react_1.useRef)({});
-    const previousEmotionKeysRef = (0, react_1.useRef)(new Set());
-    const headMesh = (0, react_1.useMemo)(() => {
-        let foundMesh;
-        scene.traverse((object) => {
-            if (object instanceof three_1.SkinnedMesh &&
-                (object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
-                foundMesh = object;
-            }
-        });
-        return foundMesh;
-    }, [scene]);
-    (0, react_1.useEffect)(() => {
-        if (headMesh) {
-            headMeshRef.current = headMesh;
-            if (headMesh.morphTargetDictionary && headMesh.morphTargetInfluences) {
-                setMorphTargetDictionary(headMesh.morphTargetDictionary);
-                const initialInfluences = Object.keys(headMesh.morphTargetDictionary).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
-                setMorphTargetInfluences(initialInfluences);
-            }
-        }
-        mixerRef.current = new three_1.AnimationMixer(scene);
-    }, [headMesh, scene, setMorphTargetDictionary, setMorphTargetInfluences]);
-    const handleAnimationChange = (0, react_1.useCallback)(() => {
-        if (!actions || !currentBaseAction.action)
-            return;
-        const newAction = actions[currentBaseAction.action];
-        if (!newAction) {
-            console.warn(`Animation "${currentBaseAction.action}" not found in actions.`);
-            return;
-        }
-        const fadeOutDuration = 0.8;
-        const fadeInDuration = 0.8;
-        if (currentActionRef.current) {
-            currentActionRef.current.fadeOut(fadeOutDuration);
-        }
-        newAction.reset().fadeIn(fadeInDuration).play();
-        currentActionRef.current = newAction;
-        newAction.timeScale = timeScale;
-        if (currentBaseAction.action.startsWith('Gioia') ||
-            currentBaseAction.action.startsWith('Rabbia') ||
-            currentBaseAction.action.startsWith('Sorpresa') ||
-            currentBaseAction.action.startsWith('Timore') ||
-            currentBaseAction.action.startsWith('Tristezza')) {
-            newAction.setLoop(three_1.LoopOnce, 1);
-            newAction.clampWhenFinished = true;
-            isTransitioningToIdleRef.current = true;
-        }
-    }, [actions, currentBaseAction, timeScale]);
-    (0, react_1.useEffect)(() => {
-        handleAnimationChange();
-    }, [handleAnimationChange]);
-    const updateFrame = (0, react_1.useCallback)((currentTime) => {
-        var _a;
-        if (!headMeshRef.current ||
-            !headMeshRef.current.morphTargetDictionary ||
-            !headMeshRef.current.morphTargetInfluences)
-            return;
-        let blinkValue = 0;
-        if (eyeBlink) {
-            if (currentTime >= nextBlinkTimeRef.current && !isBlinkingRef.current) {
-                isBlinkingRef.current = true;
-                blinkStartTimeRef.current = currentTime;
-                lastBlinkTimeRef.current = currentTime;
-                nextBlinkTimeRef.current =
-                    currentTime +
-                        Math.random() *
-                            (BLINK_CONFIG.maxInterval - BLINK_CONFIG.minInterval) +
-                        BLINK_CONFIG.minInterval;
-            }
-            if (isBlinkingRef.current) {
-                const blinkProgress = (currentTime - blinkStartTimeRef.current) /
-                    BLINK_CONFIG.blinkDuration;
-                if (blinkProgress <= 0.5) {
-                    blinkValue = blinkProgress * 2;
-                }
-                else if (blinkProgress <= 1) {
-                    blinkValue = 2 - blinkProgress * 2;
-                }
-                else {
-                    isBlinkingRef.current = false;
-                    blinkValue = 0;
-                }
-            }
-        }
-        const currentViseme = updateCurrentViseme(currentTime / 1000);
-        const currentEmotionKeys = new Set(Object.keys(emotionMorphTargets));
-        Object.entries(headMeshRef.current.morphTargetDictionary).forEach(([key, index]) => {
-            if (typeof index === 'number') {
-                let targetValue = 0;
-                if (currentEmotionKeys.has(key)) {
-                    const targetEmotionValue = emotionMorphTargets[key];
-                    const currentEmotionValue = currentEmotionRef.current[key] || 0;
-                    const newEmotionValue = three_1.MathUtils.lerp(currentEmotionValue, targetEmotionValue * 2.5, EMOTION_SMOOTHING);
-                    currentEmotionRef.current[key] = newEmotionValue;
-                    targetValue += newEmotionValue;
-                }
-                if (currentViseme && key === currentViseme.name) {
-                    targetValue += currentViseme.weight;
-                }
-                if (key === 'eyesClosed' && eyeBlink) {
-                    targetValue += blinkValue;
-                }
-                targetValue = three_1.MathUtils.clamp(targetValue, 0, 1);
-                if (headMeshRef.current &&
-                    headMeshRef.current.morphTargetInfluences) {
-                    headMeshRef.current.morphTargetInfluences[index] = three_1.MathUtils.lerp(headMeshRef.current.morphTargetInfluences[index], targetValue, VISME_SMOOTHING);
-                }
-            }
-        });
-        previousEmotionKeysRef.current = currentEmotionKeys;
-        if (isTransitioningToIdleRef.current && currentActionRef.current) {
-            if (currentActionRef.current.time >=
-                currentActionRef.current.getClip().duration) {
-                const idleNumber = Math.floor(Math.random() * 5) + 1;
-                const idleAction = actions[`Idle${idleNumber === 3 ? 4 : idleNumber}`];
-                if (idleAction) {
-                    currentActionRef.current.fadeOut(0.5);
-                    idleAction.reset().fadeIn(0.5).play();
-                    currentActionRef.current = idleAction;
-                    isTransitioningToIdleRef.current = false;
-                }
-            }
-        }
-        (_a = mixerRef.current) === null || _a === void 0 ? void 0 : _a.update(0.01);
-    }, [actions, emotionMorphTargets, eyeBlink, updateCurrentViseme]);
-    (0, fiber_1.useFrame)(state => {
-        updateFrame(state.clock.elapsedTime * 1000);
-    });
-    return ((0, jsx_runtime_1.jsx)("group", { position: isZoomed ? AVATAR_POSITION_ZOOMED : AVATAR_POSITION, rotation: AVATAR_ROTATION, children: (0, jsx_runtime_1.jsx)("primitive", { object: scene }) }));
-}
-exports.default = FullbodyAvatar;
-//# sourceMappingURL=fullbodyAvatar.js.map