@memori.ai/memori-react 7.6.0 → 7.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +25 -0
- package/dist/components/Avatar/Avatar.js +2 -2
- package/dist/components/Avatar/Avatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.d.ts +4 -3
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +10 -6
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +11 -17
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +128 -104
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.d.ts +1 -4
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +2 -4
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/index.d.ts +5 -3
- package/dist/components/Avatar/AvatarView/index.js +2 -2
- package/dist/components/Avatar/AvatarView/index.js.map +1 -1
- package/dist/components/MemoriWidget/MemoriWidget.js +117 -118
- package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/dist/components/layouts/HiddenChat.js +3 -4
- package/dist/components/layouts/HiddenChat.js.map +1 -1
- package/dist/components/layouts/ZoomedFullBody.d.ts +2 -2
- package/dist/components/layouts/ZoomedFullBody.js +11 -2
- package/dist/components/layouts/ZoomedFullBody.js.map +1 -1
- package/dist/components/layouts/hidden-chat.css +23 -23
- package/dist/components/layouts/zoomed-full-body.css +16 -0
- package/dist/context/visemeContext.d.ts +8 -15
- package/dist/context/visemeContext.js +64 -166
- package/dist/context/visemeContext.js.map +1 -1
- package/dist/helpers/translations.js +10 -2
- package/dist/helpers/translations.js.map +1 -1
- package/dist/helpers/utils.js +5 -6
- package/dist/helpers/utils.js.map +1 -1
- package/dist/styles.css +1 -0
- package/esm/components/Avatar/Avatar.js +2 -2
- package/esm/components/Avatar/Avatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.d.ts +4 -3
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +10 -6
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +11 -17
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +131 -107
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.d.ts +1 -4
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +2 -4
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/index.d.ts +5 -3
- package/esm/components/Avatar/AvatarView/index.js +2 -2
- package/esm/components/Avatar/AvatarView/index.js.map +1 -1
- package/esm/components/MemoriWidget/MemoriWidget.js +117 -118
- package/esm/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/esm/components/layouts/HiddenChat.js +3 -4
- package/esm/components/layouts/HiddenChat.js.map +1 -1
- package/esm/components/layouts/ZoomedFullBody.d.ts +2 -2
- package/esm/components/layouts/ZoomedFullBody.js +11 -2
- package/esm/components/layouts/ZoomedFullBody.js.map +1 -1
- package/esm/components/layouts/hidden-chat.css +23 -23
- package/esm/components/layouts/zoomed-full-body.css +16 -0
- package/esm/context/visemeContext.d.ts +8 -15
- package/esm/context/visemeContext.js +65 -167
- package/esm/context/visemeContext.js.map +1 -1
- package/esm/helpers/translations.js +10 -2
- package/esm/helpers/translations.js.map +1 -1
- package/esm/helpers/utils.js +5 -6
- package/esm/helpers/utils.js.map +1 -1
- package/esm/styles.css +1 -0
- package/package.json +1 -1
- package/src/components/Avatar/Avatar.stories.tsx +7 -5
- package/src/components/Avatar/Avatar.tsx +3 -5
- package/src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx +20 -19
- package/src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx +206 -140
- package/src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx +1 -7
- package/src/components/Avatar/AvatarView/AvatarView.stories.tsx +36 -24
- package/src/components/Avatar/AvatarView/index.tsx +3 -8
- package/src/components/MemoriWidget/MemoriWidget.tsx +140 -160
- package/src/components/layouts/HiddenChat.tsx +13 -14
- package/src/components/layouts/ZoomedFullBody.tsx +38 -29
- package/src/components/layouts/__snapshots__/HiddenChat.test.tsx.snap +12 -12
- package/src/components/layouts/__snapshots__/ZoomedFullBody.test.tsx.snap +25 -21
- package/src/components/layouts/hidden-chat.css +23 -23
- package/src/components/layouts/zoomed-full-body.css +16 -0
- package/src/context/visemeContext.tsx +90 -260
- package/src/helpers/translations.ts +11 -8
- package/src/helpers/utils.ts +9 -8
- package/src/styles.css +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAMzD,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,OAAO,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,WAAW,MAAM,qCAAqC,CAAC;AAC9D,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,IAAI,MAAM,eAAe,CAAC;AACjC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,mBAAmB,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAoBxD,MAAM,MAAM,GAAoB,CAAC,EAC/B,MAAM,EACN,WAAW,EACX,iBAAiB,EACjB,MAAM,EACN,QAAQ,GAAG,KAAK,EAChB,eAAe,GAAG,KAAK,EACvB,kBAAkB,EAClB,qBAAqB,GAAG,KAAK,EAC7B,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,KAAK,EACf,OAAO,EACP,MAAM,EACN,SAAS,EACT,QAAQ,GAAG,KAAK,EAChB,SAAS,GACV,EAAE,EAAE;IAEH,MAAM,EAAE,CAAC,EAAE,GAAG,cAAc,EAAE,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhD,MAAM,
|
|
1
|
+
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,10 @@ interface Props {
|
|
|
10
10
|
speaking: boolean;
|
|
11
11
|
isZoomed: boolean;
|
|
12
12
|
chatEmission: any;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
updateCurrentViseme: (currentTime: number) => {
|
|
14
|
+
name: string;
|
|
15
|
+
weight: number;
|
|
16
|
+
} | null;
|
|
16
17
|
}
|
|
17
18
|
export declare const AvatarView: React.FC<Props & {
|
|
18
19
|
halfBody: boolean;
|
|
@@ -28,13 +28,14 @@ const baseActions = {
|
|
|
28
28
|
Loading2: { weight: 0 },
|
|
29
29
|
Loading3: { weight: 0 },
|
|
30
30
|
};
|
|
31
|
-
export const AvatarView = ({
|
|
31
|
+
export const AvatarView = ({ chatEmission, showControls, animation, url, sex, eyeBlink, headMovement, speaking, halfBody, loading, isZoomed, updateCurrentViseme, }) => {
|
|
32
32
|
const [currentBaseAction, setCurrentBaseAction] = useState({
|
|
33
33
|
action: animation || 'Idle1',
|
|
34
34
|
weight: 1,
|
|
35
35
|
});
|
|
36
36
|
const [morphTargetInfluences, setMorphTargetInfluences] = useState({});
|
|
37
37
|
const [morphTargetDictionary, setMorphTargetDictionary] = useState({});
|
|
38
|
+
const [emotionMorphTargets, setEmotionMorphTargets] = useState({});
|
|
38
39
|
const [timeScale, setTimeScale] = useState(0.8);
|
|
39
40
|
const setEmotionMorphTargetInfluences = useCallback((action) => {
|
|
40
41
|
const emotionMap = {
|
|
@@ -46,16 +47,14 @@ export const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControl
|
|
|
46
47
|
Loading: { Loading1: 1, Loading2: 1, Loading3: 1 },
|
|
47
48
|
};
|
|
48
49
|
const newEmotion = action.slice(0, -1);
|
|
49
|
-
setEmotion(newEmotion);
|
|
50
50
|
const defaultEmotions = Object.keys(emotionMap).reduce((acc, key) => {
|
|
51
51
|
acc[key] = 0;
|
|
52
52
|
return acc;
|
|
53
53
|
}, {});
|
|
54
54
|
const emotion = Object.keys(emotionMap).find(key => action.startsWith(key)) || 'default';
|
|
55
55
|
const emotionValues = emotion === 'default' ? defaultEmotions : emotionMap[emotion];
|
|
56
|
-
|
|
57
|
-
...
|
|
58
|
-
...defaultEmotions,
|
|
56
|
+
setEmotionMorphTargets(prevEmotions => ({
|
|
57
|
+
...prevEmotions,
|
|
59
58
|
...emotionValues,
|
|
60
59
|
}));
|
|
61
60
|
}, []);
|
|
@@ -89,6 +88,11 @@ export const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControl
|
|
|
89
88
|
const emotion = `${outputContent}${randomNumber}`;
|
|
90
89
|
onBaseActionChange(emotion);
|
|
91
90
|
}
|
|
91
|
+
else {
|
|
92
|
+
const randomNumber = Math.floor(Math.random() * 5) + 1;
|
|
93
|
+
const animation = `Idle${randomNumber === 3 ? 4 : randomNumber}`;
|
|
94
|
+
onBaseActionChange(animation);
|
|
95
|
+
}
|
|
92
96
|
}, [chatEmission]);
|
|
93
97
|
useEffect(() => {
|
|
94
98
|
if (loading) {
|
|
@@ -97,6 +101,6 @@ export const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControl
|
|
|
97
101
|
onBaseActionChange(animation);
|
|
98
102
|
}
|
|
99
103
|
}, [loading]);
|
|
100
|
-
return (_jsxs(_Fragment, { children: [showControls && (_jsx(AnimationControlPanel, { timeScale: timeScale, morphTargetDictionary: morphTargetDictionary, onBaseActionChange: onBaseActionChange, onMorphTargetInfluencesChange: onMorphTargetInfluencesChange, onMorphTargetDictionaryChange: onMorphTargetDictionaryChange, baseActions: baseActions, currentBaseAction: currentBaseAction, modifyTimeScale: modifyTimeScale })), halfBody ? (_jsx(HalfBodyAvatar, { url: url,
|
|
104
|
+
return (_jsxs(_Fragment, { children: [showControls && (_jsx(AnimationControlPanel, { timeScale: timeScale, morphTargetDictionary: morphTargetDictionary, onBaseActionChange: onBaseActionChange, onMorphTargetInfluencesChange: onMorphTargetInfluencesChange, onMorphTargetDictionaryChange: onMorphTargetDictionaryChange, baseActions: baseActions, currentBaseAction: currentBaseAction, modifyTimeScale: modifyTimeScale })), halfBody ? (_jsx(HalfBodyAvatar, { url: url, headMovement: headMovement, speaking: speaking, eyeBlink: eyeBlink, morphTargetInfluences: morphTargetInfluences, setMorphTargetInfluences: setMorphTargetInfluences, setMorphTargetDictionary: setMorphTargetDictionary })) : (_jsx(FullbodyAvatar, { url: url, sex: sex, eyeBlink: eyeBlink, currentBaseAction: currentBaseAction, timeScale: timeScale, morphTargetInfluences: morphTargetInfluences, isZoomed: isZoomed, updateCurrentViseme: updateCurrentViseme, setMorphTargetDictionary: setMorphTargetDictionary, setMorphTargetInfluences: setMorphTargetInfluences, emotionMorphTargets: emotionMorphTargets }))] }));
|
|
101
105
|
};
|
|
102
106
|
//# sourceMappingURL=avatarComponent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,qBAAqB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,cAAc,MAAM,6BAA6B,CAAC;AACzD,OAAO,cAAc,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,24 +7,18 @@ interface FullbodyAvatarProps {
|
|
|
7
7
|
weight: number;
|
|
8
8
|
};
|
|
9
9
|
timeScale: number;
|
|
10
|
-
loading?: boolean;
|
|
11
|
-
speaking?: boolean;
|
|
12
10
|
isZoomed?: boolean;
|
|
13
|
-
setMorphTargetInfluences: (influences: {
|
|
14
|
-
[key: string]: number;
|
|
15
|
-
}) => void;
|
|
16
|
-
setMorphTargetDictionary: (dictionary: {
|
|
17
|
-
[key: string]: number;
|
|
18
|
-
}) => void;
|
|
19
|
-
morphTargetInfluences: {
|
|
20
|
-
[key: string]: number;
|
|
21
|
-
};
|
|
22
|
-
morphTargetDictionary: {
|
|
23
|
-
[key: string]: number;
|
|
24
|
-
};
|
|
25
|
-
setMeshRef: any;
|
|
26
11
|
eyeBlink?: boolean;
|
|
27
|
-
|
|
12
|
+
updateCurrentViseme: (currentTime: number) => {
|
|
13
|
+
name: string;
|
|
14
|
+
weight: number;
|
|
15
|
+
} | null;
|
|
16
|
+
smoothMorphTarget?: boolean;
|
|
17
|
+
morphTargetSmoothing?: number;
|
|
18
|
+
morphTargetInfluences: Record<string, number>;
|
|
19
|
+
setMorphTargetDictionary: (morphTargetDictionary: Record<string, number>) => void;
|
|
20
|
+
setMorphTargetInfluences: (morphTargetInfluences: Record<string, number>) => void;
|
|
21
|
+
emotionMorphTargets: Record<string, number>;
|
|
28
22
|
}
|
|
29
|
-
export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed,
|
|
23
|
+
export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, eyeBlink, morphTargetSmoothing, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }: FullbodyAvatarProps): JSX.Element;
|
|
30
24
|
export {};
|
|
@@ -1,78 +1,61 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { useEffect, useRef, useState
|
|
3
|
-
import { Vector3, Euler, AnimationMixer, SkinnedMesh, } from 'three';
|
|
2
|
+
import { useEffect, useRef, useState } from 'react';
|
|
3
|
+
import { Vector3, Euler, AnimationMixer, SkinnedMesh, MathUtils, LoopOnce, } from 'three';
|
|
4
4
|
import { useAnimations, useGLTF } from '@react-three/drei';
|
|
5
|
-
import { useGraph,
|
|
5
|
+
import { useGraph, useFrame } from '@react-three/fiber';
|
|
6
6
|
import { correctMaterials, isSkinnedMesh } from '../../../../../helpers/utils';
|
|
7
|
-
import { useAvatarBlink } from '../../utils/useEyeBlink';
|
|
8
|
-
const lerp = (start, end, alpha) => {
|
|
9
|
-
return start * (1 - alpha) + end * alpha;
|
|
10
|
-
};
|
|
11
7
|
const AVATAR_POSITION = new Vector3(0, -1, 0);
|
|
12
8
|
const AVATAR_ROTATION = new Euler(0.175, 0, 0);
|
|
13
9
|
const AVATAR_POSITION_ZOOMED = new Vector3(0, -1.45, 0);
|
|
14
10
|
const ANIMATION_URLS = {
|
|
15
|
-
MALE: 'https://assets.memori.ai/api/v2/asset/
|
|
16
|
-
FEMALE: 'https://assets.memori.ai/api/v2/asset/
|
|
11
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
|
|
12
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/0e49aa5d-f757-4292-a170-d843c2839a41.glb',
|
|
13
|
+
};
|
|
14
|
+
const BLINK_CONFIG = {
|
|
15
|
+
minInterval: 1000,
|
|
16
|
+
maxInterval: 5000,
|
|
17
|
+
blinkDuration: 150,
|
|
17
18
|
};
|
|
18
|
-
const
|
|
19
|
-
export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed,
|
|
19
|
+
const EMOTION_TRANSITION_SPEED = 0.1;
|
|
20
|
+
export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, eyeBlink, morphTargetSmoothing = 0.5, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }) {
|
|
20
21
|
const { scene } = useGLTF(url);
|
|
21
22
|
const { animations } = useGLTF(ANIMATION_URLS[sex]);
|
|
22
23
|
const { nodes, materials } = useGraph(scene);
|
|
23
24
|
const { actions } = useAnimations(animations, scene);
|
|
24
|
-
const
|
|
25
|
-
const
|
|
25
|
+
const mixer = useRef(new AnimationMixer(scene));
|
|
26
|
+
const headMeshRef = useRef();
|
|
26
27
|
const currentActionRef = useRef(null);
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}, remainingTime);
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
startIdleAnimation();
|
|
50
|
-
}
|
|
51
|
-
};
|
|
52
|
-
const startIdleAnimation = () => {
|
|
53
|
-
const idleAnimations = Object.keys(actions).filter(key => key.startsWith('Idle'));
|
|
54
|
-
const randomIdle = idleAnimations[Math.floor(Math.random() * idleAnimations.length)];
|
|
55
|
-
const idleAction = actions[randomIdle];
|
|
56
|
-
const fadeOutDuration = 0.5;
|
|
57
|
-
const fadeInDuration = 0.5;
|
|
58
|
-
if (currentActionRef.current) {
|
|
59
|
-
currentActionRef.current.fadeOut(fadeOutDuration);
|
|
28
|
+
const [isTransitioningToIdle, setIsTransitioningToIdle] = useState(false);
|
|
29
|
+
const lastBlinkTime = useRef(0);
|
|
30
|
+
const nextBlinkTime = useRef(0);
|
|
31
|
+
const isBlinking = useRef(false);
|
|
32
|
+
const blinkStartTime = useRef(0);
|
|
33
|
+
const currentEmotionRef = useRef({});
|
|
34
|
+
const previousEmotionKeysRef = useRef(new Set());
|
|
35
|
+
useEffect(() => {
|
|
36
|
+
correctMaterials(materials);
|
|
37
|
+
scene.traverse((object) => {
|
|
38
|
+
if (object instanceof SkinnedMesh) {
|
|
39
|
+
if (object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar') {
|
|
40
|
+
headMeshRef.current = object;
|
|
41
|
+
if (object.morphTargetDictionary && object.morphTargetInfluences) {
|
|
42
|
+
setMorphTargetDictionary(object.morphTargetDictionary);
|
|
43
|
+
const initialInfluences = Object.keys(object.morphTargetDictionary).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
|
|
44
|
+
setMorphTargetInfluences(initialInfluences);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
60
47
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
48
|
+
});
|
|
49
|
+
onLoaded === null || onLoaded === void 0 ? void 0 : onLoaded();
|
|
50
|
+
return () => {
|
|
51
|
+
Object.values(materials).forEach(material => material.dispose());
|
|
52
|
+
Object.values(nodes)
|
|
53
|
+
.filter(isSkinnedMesh)
|
|
54
|
+
.forEach(mesh => mesh.geometry.dispose());
|
|
66
55
|
};
|
|
67
|
-
|
|
68
|
-
finishCurrentAnimation();
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
startIdleAnimation();
|
|
72
|
-
}
|
|
73
|
-
}, [actions]);
|
|
56
|
+
}, [materials, nodes, url, onLoaded, scene]);
|
|
74
57
|
useEffect(() => {
|
|
75
|
-
if (!actions || !currentBaseAction.action
|
|
58
|
+
if (!actions || !currentBaseAction.action)
|
|
76
59
|
return;
|
|
77
60
|
const newAction = actions[currentBaseAction.action];
|
|
78
61
|
if (!newAction) {
|
|
@@ -81,63 +64,104 @@ export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction,
|
|
|
81
64
|
}
|
|
82
65
|
const fadeOutDuration = 0.8;
|
|
83
66
|
const fadeInDuration = 0.8;
|
|
84
|
-
if (!currentBaseAction.action.startsWith('Idle')) {
|
|
85
|
-
setTimeout(() => {
|
|
86
|
-
transitionToIdle();
|
|
87
|
-
}, ANIMATION_DURATION);
|
|
88
|
-
}
|
|
89
67
|
if (currentActionRef.current) {
|
|
90
68
|
currentActionRef.current.fadeOut(fadeOutDuration);
|
|
91
69
|
}
|
|
92
|
-
newAction
|
|
70
|
+
console.log(newAction);
|
|
93
71
|
newAction.reset().fadeIn(fadeInDuration).play();
|
|
94
72
|
currentActionRef.current = newAction;
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
73
|
+
newAction.timeScale = timeScale;
|
|
74
|
+
if (currentBaseAction.action.startsWith('Gioia') ||
|
|
75
|
+
currentBaseAction.action.startsWith('Rabbia') ||
|
|
76
|
+
currentBaseAction.action.startsWith('Sorpresa') ||
|
|
77
|
+
currentBaseAction.action.startsWith('Timore') ||
|
|
78
|
+
currentBaseAction.action.startsWith('Tristezza')) {
|
|
79
|
+
newAction.setLoop(LoopOnce, 1);
|
|
80
|
+
newAction.clampWhenFinished = true;
|
|
81
|
+
setIsTransitioningToIdle(true);
|
|
82
|
+
}
|
|
83
|
+
}, [actions, currentBaseAction, timeScale]);
|
|
84
|
+
useFrame(state => {
|
|
85
|
+
if (headMeshRef.current &&
|
|
86
|
+
headMeshRef.current.morphTargetDictionary &&
|
|
87
|
+
headMeshRef.current.morphTargetInfluences) {
|
|
88
|
+
const currentTime = state.clock.getElapsedTime() * 1000;
|
|
89
|
+
let blinkValue = 0;
|
|
90
|
+
if (eyeBlink) {
|
|
91
|
+
if (currentTime >= nextBlinkTime.current && !isBlinking.current) {
|
|
92
|
+
isBlinking.current = true;
|
|
93
|
+
blinkStartTime.current = currentTime;
|
|
94
|
+
lastBlinkTime.current = currentTime;
|
|
95
|
+
nextBlinkTime.current =
|
|
96
|
+
currentTime +
|
|
97
|
+
Math.random() *
|
|
98
|
+
(BLINK_CONFIG.maxInterval - BLINK_CONFIG.minInterval) +
|
|
99
|
+
BLINK_CONFIG.minInterval;
|
|
100
|
+
}
|
|
101
|
+
if (isBlinking.current) {
|
|
102
|
+
const blinkProgress = (currentTime - blinkStartTime.current) / BLINK_CONFIG.blinkDuration;
|
|
103
|
+
if (blinkProgress <= 0.5) {
|
|
104
|
+
blinkValue = blinkProgress * 2;
|
|
105
|
+
}
|
|
106
|
+
else if (blinkProgress <= 1) {
|
|
107
|
+
blinkValue = 2 - blinkProgress * 2;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
isBlinking.current = false;
|
|
111
|
+
blinkValue = 0;
|
|
112
|
+
}
|
|
107
113
|
}
|
|
108
114
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
onLoaded,
|
|
121
|
-
setMorphTargetDictionary,
|
|
122
|
-
setMorphTargetInfluences,
|
|
123
|
-
setMeshRef,
|
|
124
|
-
clearVisemes,
|
|
125
|
-
]);
|
|
126
|
-
useFrame((_, delta) => {
|
|
127
|
-
if (avatarMeshRef.current && avatarMeshRef.current.morphTargetDictionary) {
|
|
128
|
-
updateMorphTargetInfluences();
|
|
129
|
-
}
|
|
130
|
-
mixer.update(delta * 0.001);
|
|
131
|
-
function updateMorphTargetInfluences() {
|
|
132
|
-
Object.entries(morphTargetInfluences).forEach(([key, value]) => {
|
|
133
|
-
const index = avatarMeshRef.current.morphTargetDictionary[key];
|
|
134
|
-
if (typeof index === 'number' &&
|
|
135
|
-
avatarMeshRef.current.morphTargetInfluences) {
|
|
136
|
-
const currentValue = avatarMeshRef.current.morphTargetInfluences[index];
|
|
137
|
-
const smoothValue = lerp(currentValue, value, 0.1);
|
|
138
|
-
avatarMeshRef.current.morphTargetInfluences[index] = smoothValue;
|
|
115
|
+
const currentViseme = updateCurrentViseme(currentTime / 1000);
|
|
116
|
+
const currentEmotionKeys = new Set(Object.keys(emotionMorphTargets));
|
|
117
|
+
previousEmotionKeysRef.current.forEach(key => {
|
|
118
|
+
if (!currentEmotionKeys.has(key)) {
|
|
119
|
+
const index = headMeshRef.current.morphTargetDictionary[key];
|
|
120
|
+
if (typeof index === 'number') {
|
|
121
|
+
currentEmotionRef.current[key] = 0;
|
|
122
|
+
if (headMeshRef.current && headMeshRef.current.morphTargetInfluences) {
|
|
123
|
+
headMeshRef.current.morphTargetInfluences[index] = 0;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
139
126
|
}
|
|
140
127
|
});
|
|
128
|
+
Object.entries(headMeshRef.current.morphTargetDictionary).forEach(([key, index]) => {
|
|
129
|
+
if (typeof index === 'number') {
|
|
130
|
+
let targetValue = 0;
|
|
131
|
+
if (Object.prototype.hasOwnProperty.call(emotionMorphTargets, key)) {
|
|
132
|
+
const targetEmotionValue = emotionMorphTargets[key];
|
|
133
|
+
const currentEmotionValue = currentEmotionRef.current[key] || 0;
|
|
134
|
+
const newEmotionValue = MathUtils.lerp(currentEmotionValue, targetEmotionValue * 2, EMOTION_TRANSITION_SPEED);
|
|
135
|
+
currentEmotionRef.current[key] = newEmotionValue;
|
|
136
|
+
targetValue += newEmotionValue;
|
|
137
|
+
}
|
|
138
|
+
if (currentViseme && key === currentViseme.name) {
|
|
139
|
+
targetValue += currentViseme.weight * 1.2;
|
|
140
|
+
}
|
|
141
|
+
if (key === 'eyesClosed' && eyeBlink) {
|
|
142
|
+
targetValue += blinkValue;
|
|
143
|
+
}
|
|
144
|
+
targetValue = MathUtils.clamp(targetValue, 0, 1);
|
|
145
|
+
if (headMeshRef.current && headMeshRef.current.morphTargetInfluences) {
|
|
146
|
+
headMeshRef.current.morphTargetInfluences[index] = MathUtils.lerp(headMeshRef.current.morphTargetInfluences[index], targetValue, morphTargetSmoothing);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
});
|
|
150
|
+
previousEmotionKeysRef.current = currentEmotionKeys;
|
|
151
|
+
if (isTransitioningToIdle && currentActionRef.current) {
|
|
152
|
+
if (currentActionRef.current.time >=
|
|
153
|
+
currentActionRef.current.getClip().duration) {
|
|
154
|
+
const idleNumber = Math.floor(Math.random() * 5) + 1;
|
|
155
|
+
const idleAction = actions[`Idle${idleNumber == 3 ? 4 : idleNumber}`];
|
|
156
|
+
if (idleAction) {
|
|
157
|
+
currentActionRef.current.fadeOut(0.5);
|
|
158
|
+
idleAction.reset().fadeIn(0.5).play();
|
|
159
|
+
currentActionRef.current = idleAction;
|
|
160
|
+
setIsTransitioningToIdle(false);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
mixer.current.update(0.01);
|
|
141
165
|
}
|
|
142
166
|
});
|
|
143
167
|
return (_jsx("group", { position: isZoomed ? AVATAR_POSITION_ZOOMED : AVATAR_POSITION, rotation: AVATAR_ROTATION, children: _jsx("primitive", { object: scene }) }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
import { Object3D } from 'three';
|
|
2
1
|
interface HalfBodyAvatarProps {
|
|
3
2
|
url: string;
|
|
4
3
|
setMorphTargetInfluences: (morphTargetInfluences: any) => void;
|
|
5
4
|
headMovement?: boolean;
|
|
6
5
|
speaking?: boolean;
|
|
7
6
|
onLoaded?: () => void;
|
|
8
|
-
setMeshRef: (mesh: Object3D) => void;
|
|
9
|
-
clearVisemes: () => void;
|
|
10
7
|
setMorphTargetDictionary: (morphTargetDictionary: any) => void;
|
|
11
8
|
eyeBlink?: boolean;
|
|
12
9
|
morphTargetInfluences: any;
|
|
13
10
|
}
|
|
14
|
-
export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorphTargetDictionary, headMovement, eyeBlink,
|
|
11
|
+
export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorphTargetDictionary, headMovement, eyeBlink, onLoaded, morphTargetInfluences, }: HalfBodyAvatarProps): JSX.Element;
|
|
15
12
|
export {};
|
|
@@ -11,7 +11,7 @@ const AVATAR_POSITION = new Vector3(0, -0.6, 0);
|
|
|
11
11
|
const lerp = (start, end, alpha) => {
|
|
12
12
|
return start * (1 - alpha) + end * alpha;
|
|
13
13
|
};
|
|
14
|
-
export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorphTargetDictionary, headMovement, eyeBlink,
|
|
14
|
+
export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorphTargetDictionary, headMovement, eyeBlink, onLoaded, morphTargetInfluences, }) {
|
|
15
15
|
const { scene } = useGLTF(url);
|
|
16
16
|
const { nodes, materials } = useGraph(scene);
|
|
17
17
|
const avatarMeshRef = useRef(null);
|
|
@@ -31,7 +31,6 @@ export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorph
|
|
|
31
31
|
correctMaterials(materials);
|
|
32
32
|
const firstSkinnedMesh = Object.values(nodes).find(isSkinnedMesh);
|
|
33
33
|
if (firstSkinnedMesh) {
|
|
34
|
-
setMeshRef(firstSkinnedMesh);
|
|
35
34
|
avatarMeshRef.current = firstSkinnedMesh;
|
|
36
35
|
if (firstSkinnedMesh.morphTargetDictionary && firstSkinnedMesh.morphTargetInfluences) {
|
|
37
36
|
setMorphTargetDictionary(firstSkinnedMesh.morphTargetDictionary);
|
|
@@ -46,11 +45,10 @@ export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorph
|
|
|
46
45
|
const disposeObjects = () => {
|
|
47
46
|
Object.values(materials).forEach(dispose);
|
|
48
47
|
Object.values(nodes).filter(isSkinnedMesh).forEach(dispose);
|
|
49
|
-
clearVisemes();
|
|
50
48
|
};
|
|
51
49
|
disposeObjects();
|
|
52
50
|
};
|
|
53
|
-
}, [materials, nodes, url, onLoaded
|
|
51
|
+
}, [materials, nodes, url, onLoaded]);
|
|
54
52
|
const skinnedMeshes = useMemo(() => Object.values(nodes).filter(isSkinnedMesh), [nodes]);
|
|
55
53
|
useFrame((_) => {
|
|
56
54
|
if (avatarMeshRef.current && avatarMeshRef.current.morphTargetDictionary) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halfbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAyB,OAAO,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"halfbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,9 @@ export interface Props {
|
|
|
17
17
|
isZoomed?: boolean;
|
|
18
18
|
chatEmission?: any;
|
|
19
19
|
setMeshRef?: any;
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
updateCurrentViseme: (currentTime: number) => {
|
|
21
|
+
name: string;
|
|
22
|
+
weight: number;
|
|
23
|
+
} | null;
|
|
22
24
|
}
|
|
23
|
-
export default function ContainerAvatarView({ url, sex, style, rotateAvatar, eyeBlink, headMovement, speaking, fallback, fallbackImg, halfBody, loading, animation, showControls, isZoomed, chatEmission,
|
|
25
|
+
export default function ContainerAvatarView({ url, sex, style, rotateAvatar, eyeBlink, headMovement, speaking, fallback, fallbackImg, halfBody, loading, animation, showControls, isZoomed, chatEmission, updateCurrentViseme, }: Props): JSX.Element;
|
|
@@ -31,7 +31,7 @@ const getCameraSettings = (halfBody, isZoomed) => halfBody
|
|
|
31
31
|
}
|
|
32
32
|
: { fov: 40, position: [0, 0.0000175, 3] };
|
|
33
33
|
const getLightingComponent = () => isAndroid() || isiOS() ? (_jsx(SpotLight, { distance: 100, position: [-0.3, 0.2, 1.25], angle: Math.PI / 2, attenuation: 5, anglePower: 5 })) : (_jsx(Environment, { files: "https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/venice_sunset_1k.hdr" }));
|
|
34
|
-
export default function ContainerAvatarView({ url, sex, style, rotateAvatar, eyeBlink, headMovement, speaking, fallback, fallbackImg, halfBody = true, loading, animation, showControls = false, isZoomed, chatEmission,
|
|
35
|
-
return (_jsx(Canvas, { style: style || (halfBody ? defaultStyles.halfBody : defaultStyles.fullBody), camera: getCameraSettings(halfBody, isZoomed), children: _jsxs(Suspense, { fallback: fallback || _jsx(Loader, { fallbackImg: fallbackImg }), children: [getLightingComponent(), rotateAvatar && _jsx(OrbitControls, { enablePan: false, enableZoom: false }), _jsx(AvatarView, { url: url, sex: sex, showControls: showControls, loading: loading || false, animation: animation, isZoomed: isZoomed || false, eyeBlink: eyeBlink || false, headMovement: headMovement || false, speaking: speaking || false, halfBody: halfBody || false, chatEmission: chatEmission,
|
|
34
|
+
export default function ContainerAvatarView({ url, sex, style, rotateAvatar, eyeBlink, headMovement, speaking, fallback, fallbackImg, halfBody = true, loading, animation, showControls = false, isZoomed, chatEmission, updateCurrentViseme, }) {
|
|
35
|
+
return (_jsx(Canvas, { style: style || (halfBody ? defaultStyles.halfBody : defaultStyles.fullBody), camera: getCameraSettings(halfBody, isZoomed), children: _jsxs(Suspense, { fallback: fallback || _jsx(Loader, { fallbackImg: fallbackImg }), children: [getLightingComponent(), rotateAvatar && _jsx(OrbitControls, { enablePan: false, enableZoom: false }), _jsx(AvatarView, { url: url, sex: sex, showControls: showControls, loading: loading || false, animation: animation, isZoomed: isZoomed || false, eyeBlink: eyeBlink || false, headMovement: headMovement || false, speaking: speaking || false, halfBody: halfBody || false, chatEmission: chatEmission, updateCurrentViseme: updateCurrentViseme })] }) }));
|
|
36
36
|
}
|
|
37
37
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/Avatar/AvatarView/index.tsx"],"names":[],"mappings":";AACA,OAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAC7D,OAAO,MAAM,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/Avatar/AvatarView/index.tsx"],"names":[],"mappings":"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"}
|