@memori.ai/memori-react 7.5.0 → 7.6.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 +52 -0
- package/README.md +10 -2
- package/dist/components/Avatar/Avatar.d.ts +2 -0
- package/dist/components/Avatar/Avatar.js +11 -6
- package/dist/components/Avatar/Avatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.d.ts +20 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +107 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controls.d.ts +26 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controls.js +59 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controls.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +30 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +148 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.d.ts +15 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +77 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/loader.d.ts +5 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/loader.js +12 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/loader.js.map +1 -0
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.d.ts +2 -1
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.js +3 -2
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/index.d.ts +6 -1
- package/dist/components/Avatar/AvatarView/index.js +15 -83
- package/dist/components/Avatar/AvatarView/index.js.map +1 -1
- package/dist/components/Avatar/AvatarView/utils/useEyeBlink.d.ts +16 -2
- package/dist/components/Avatar/AvatarView/utils/useEyeBlink.js +62 -38
- package/dist/components/Avatar/AvatarView/utils/useEyeBlink.js.map +1 -1
- package/dist/components/Avatar/AvatarView/utils/useMouthAnimation.d.ts +16 -0
- package/dist/components/Avatar/AvatarView/utils/useMouthAnimation.js +59 -0
- package/dist/components/Avatar/AvatarView/utils/useMouthAnimation.js.map +1 -0
- package/dist/components/Avatar/AvatarView/utils/useSmile.js +1 -1
- package/dist/components/Avatar/AvatarView/utils/useSmile.js.map +1 -1
- package/dist/components/ChatBubble/ChatBubble.js +2 -3
- package/dist/components/ChatBubble/ChatBubble.js.map +1 -1
- package/dist/components/CompletionProviderStatus/CompletionProviderStatus.d.ts +1 -1
- package/dist/components/CompletionProviderStatus/CompletionProviderStatus.js +24 -3
- package/dist/components/CompletionProviderStatus/CompletionProviderStatus.js.map +1 -1
- package/dist/components/MemoriWidget/MemoriWidget.d.ts +1 -1
- package/dist/components/MemoriWidget/MemoriWidget.js +25 -3
- package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/dist/components/StartPanel/StartPanel.js +1 -1
- package/dist/components/StartPanel/StartPanel.js.map +1 -1
- package/dist/components/layouts/HiddenChat.d.ts +4 -0
- package/dist/components/layouts/HiddenChat.js +51 -0
- package/dist/components/layouts/HiddenChat.js.map +1 -0
- package/dist/components/layouts/ZoomedFullBody.d.ts +4 -0
- package/dist/components/layouts/ZoomedFullBody.js +8 -0
- package/dist/components/layouts/ZoomedFullBody.js.map +1 -0
- package/dist/components/layouts/hidden-chat.css +184 -0
- package/dist/context/visemeContext.d.ts +27 -0
- package/dist/context/visemeContext.js +221 -0
- package/dist/context/visemeContext.js.map +1 -0
- package/dist/helpers/utils.d.ts +7 -0
- package/dist/helpers/utils.js +51 -1
- package/dist/helpers/utils.js.map +1 -1
- package/dist/index.js +20 -16
- package/dist/index.js.map +1 -1
- package/dist/styles.css +1 -0
- package/esm/components/Avatar/Avatar.d.ts +2 -0
- package/esm/components/Avatar/Avatar.js +11 -6
- package/esm/components/Avatar/Avatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.d.ts +20 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +102 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controls.d.ts +26 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controls.js +56 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controls.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +30 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +145 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.d.ts +15 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +73 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/loader.d.ts +5 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/loader.js +9 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/loader.js.map +1 -0
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.d.ts +2 -1
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.js +3 -2
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/index.d.ts +6 -1
- package/esm/components/Avatar/AvatarView/index.js +16 -84
- package/esm/components/Avatar/AvatarView/index.js.map +1 -1
- package/esm/components/Avatar/AvatarView/utils/useEyeBlink.d.ts +16 -2
- package/esm/components/Avatar/AvatarView/utils/useEyeBlink.js +61 -38
- package/esm/components/Avatar/AvatarView/utils/useEyeBlink.js.map +1 -1
- package/esm/components/Avatar/AvatarView/utils/useMouthAnimation.d.ts +16 -0
- package/esm/components/Avatar/AvatarView/utils/useMouthAnimation.js +55 -0
- package/esm/components/Avatar/AvatarView/utils/useMouthAnimation.js.map +1 -0
- package/esm/components/Avatar/AvatarView/utils/useSmile.js +1 -1
- package/esm/components/Avatar/AvatarView/utils/useSmile.js.map +1 -1
- package/esm/components/ChatBubble/ChatBubble.js +2 -3
- package/esm/components/ChatBubble/ChatBubble.js.map +1 -1
- package/esm/components/CompletionProviderStatus/CompletionProviderStatus.d.ts +1 -1
- package/esm/components/CompletionProviderStatus/CompletionProviderStatus.js +24 -3
- package/esm/components/CompletionProviderStatus/CompletionProviderStatus.js.map +1 -1
- package/esm/components/MemoriWidget/MemoriWidget.d.ts +1 -1
- package/esm/components/MemoriWidget/MemoriWidget.js +26 -4
- package/esm/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/esm/components/StartPanel/StartPanel.js +1 -1
- package/esm/components/StartPanel/StartPanel.js.map +1 -1
- package/esm/components/layouts/HiddenChat.d.ts +4 -0
- package/esm/components/layouts/HiddenChat.js +48 -0
- package/esm/components/layouts/HiddenChat.js.map +1 -0
- package/esm/components/layouts/ZoomedFullBody.d.ts +4 -0
- package/esm/components/layouts/ZoomedFullBody.js +5 -0
- package/esm/components/layouts/ZoomedFullBody.js.map +1 -0
- package/esm/components/layouts/hidden-chat.css +184 -0
- package/esm/context/visemeContext.d.ts +27 -0
- package/esm/context/visemeContext.js +216 -0
- package/esm/context/visemeContext.js.map +1 -0
- package/esm/helpers/utils.d.ts +7 -0
- package/esm/helpers/utils.js +45 -0
- package/esm/helpers/utils.js.map +1 -1
- package/esm/index.js +20 -16
- package/esm/index.js.map +1 -1
- package/esm/styles.css +1 -0
- package/package.json +2 -2
- package/src/components/Avatar/Avatar.test.tsx +28 -20
- package/src/components/Avatar/Avatar.tsx +19 -5
- package/src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx +222 -0
- package/src/components/Avatar/AvatarView/{components → AvatarComponent/components}/controls.tsx +16 -10
- package/src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx +234 -0
- package/src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx +123 -0
- package/src/components/Avatar/AvatarView/{components → AvatarComponent/components}/loader.tsx +1 -1
- package/src/components/Avatar/AvatarView/AvatarView.stories.tsx +47 -8
- package/src/components/Avatar/AvatarView/index.tsx +47 -174
- package/src/components/Avatar/AvatarView/utils/useEyeBlink.ts +89 -48
- package/src/components/Avatar/AvatarView/utils/useMouthAnimation.ts +93 -0
- package/src/components/Avatar/AvatarView/utils/useSmile.ts +1 -1
- package/src/components/ChatBubble/ChatBubble.tsx +3 -4
- package/src/components/CompletionProviderStatus/CompletionProviderStatus.tsx +33 -3
- package/src/components/CompletionProviderStatus/__snapshots__/CompletionProviderStatus.test.tsx.snap +18 -0
- package/src/components/MemoriWidget/MemoriWidget.tsx +60 -5
- package/src/components/StartPanel/StartPanel.tsx +1 -1
- package/src/components/layouts/Chat.test.tsx +7 -5
- package/src/components/layouts/FullPage.test.tsx +11 -8
- package/src/components/layouts/HiddenChat.test.tsx +37 -0
- package/src/components/layouts/HiddenChat.tsx +108 -0
- package/src/components/layouts/Totem.test.tsx +6 -4
- package/src/components/layouts/WebsiteAssistant.test.tsx +7 -5
- package/src/components/layouts/ZoomedFullBody.test.tsx +37 -0
- package/src/components/layouts/ZoomedFullBody.tsx +55 -0
- package/src/components/layouts/__snapshots__/HiddenChat.test.tsx.snap +210 -0
- package/src/components/layouts/__snapshots__/ZoomedFullBody.test.tsx.snap +444 -0
- package/src/components/layouts/hidden-chat.css +184 -0
- package/src/components/layouts/layouts.stories.tsx +135 -19
- package/src/context/visemeContext.tsx +328 -0
- package/src/helpers/utils.test.ts +18 -0
- package/src/helpers/utils.ts +73 -0
- package/src/index.stories.tsx +40 -17
- package/src/index.tsx +82 -78
- package/src/styles.css +1 -0
- package/src/components/Avatar/AvatarView/components/fullbodyAvatar.tsx +0 -120
- package/src/components/Avatar/AvatarView/components/halfbodyAvatar.tsx +0 -69
- package/src/components/Avatar/AvatarView/utils/useMouthSpeaking.ts +0 -87
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,57 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [7.6.0](https://github.com/memori-ai/memori-react/compare/v7.5.1...v7.6.0) (2024-10-11)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* added context for handling visemes and lips animation ([82d68e4](https://github.com/memori-ai/memori-react/commit/82d68e49c7354310b74dc34b8956e440cf7e7278))
|
|
9
|
+
* added emotion to XML audio tag ([c188673](https://github.com/memori-ai/memori-react/commit/c188673485078a6f001bc09f99c46a9349e5c184))
|
|
10
|
+
* added face mesh when animation is triggered and eye blink ([76c9374](https://github.com/memori-ai/memori-react/commit/76c937437ea7c111978823f57a6bcf24ff1eaa38))
|
|
11
|
+
* added loading animations ([2c53776](https://github.com/memori-ai/memori-react/commit/2c53776529c303b2128ff28ac6adc15634d1ab54))
|
|
12
|
+
* added mistral and anthropic to completion provider status ([70f05ec](https://github.com/memori-ai/memori-react/commit/70f05ec763579ba75ff30b6fe984ee40ba48dfc5))
|
|
13
|
+
* added mouth movement using visemes based on the text provided ([af55d34](https://github.com/memori-ai/memori-react/commit/af55d342ab4150ea579c0d56ad7c8405674ecbf3))
|
|
14
|
+
* added new animations for Male and Female avatar ([0d63458](https://github.com/memori-ai/memori-react/commit/0d634586d311380d91b7825ce1628ddc7844d5d9))
|
|
15
|
+
* added new hidden chat layout ([a83800d](https://github.com/memori-ai/memori-react/commit/a83800d87a8bdf71817ced43eb1592ea9008d2c2))
|
|
16
|
+
* added new zoomed avatar layout ([b031488](https://github.com/memori-ai/memori-react/commit/b03148818014ca193565131cfb313651c73c09b8))
|
|
17
|
+
* made avatar mesh transitions smoother and added emotion animation based on chat tag ([82a1fae](https://github.com/memori-ai/memori-react/commit/82a1faea17280174875a6ad80d477b66c9816063))
|
|
18
|
+
* removed unused hooks and linked context function for lips animation ([dea3740](https://github.com/memori-ai/memori-react/commit/dea374098259671f4117ec6b77747f989088d7e1))
|
|
19
|
+
* **temp:** modified default prop show animations controls to true ([a3b2adc](https://github.com/memori-ai/memori-react/commit/a3b2adcb6cda2db5506e4724158bf9510f4049ad))
|
|
20
|
+
* updated skinned mesh name for the latest glb released ([278ccb8](https://github.com/memori-ai/memori-react/commit/278ccb86ca13b70714e50ad44675f690c961a877))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
### Bug Fixes
|
|
24
|
+
|
|
25
|
+
* **a11y:** add aria label on hidden chat controls ([c858262](https://github.com/memori-ai/memori-react/commit/c858262eae34c969775cd3caedb5ced4c7aaa44d))
|
|
26
|
+
* added padding to HIDDEN_CHAT layout ([5856be7](https://github.com/memori-ai/memori-react/commit/5856be7e9d3fb6db731d765364ff2a26777ea6b4))
|
|
27
|
+
* auto translate ui if not multilingual ([754f6a8](https://github.com/memori-ai/memori-react/commit/754f6a8ba00f7229ee5543d87d743cbdb6e97e11))
|
|
28
|
+
* fixed name of new layout ZOOMED_FULL_BODY ([353bf32](https://github.com/memori-ai/memori-react/commit/353bf32b7ecb69f782912da38978345eb39502bc))
|
|
29
|
+
* hidden chat layout doesn't overlapse with the content ([055cbe5](https://github.com/memori-ai/memori-react/commit/055cbe55ddb19c5165d9effdcfb9c29bf8d6aa48))
|
|
30
|
+
* import style ([543157d](https://github.com/memori-ai/memori-react/commit/543157da01d02981f931e25485e738f4d69c3176))
|
|
31
|
+
* reinserted inside half body the blink and speak animation ([80e4889](https://github.com/memori-ai/memori-react/commit/80e488936e236ce8a7fea482cc0c10745ccec56c))
|
|
32
|
+
* removed chat visibility on mobile ([3aa1fa8](https://github.com/memori-ai/memori-react/commit/3aa1fa8677fa0bdc68930abf8dd45b4beac71b69))
|
|
33
|
+
* removed tag <output> from speech text and adjusted viseme smoothing value ([fe5b4dd](https://github.com/memori-ai/memori-react/commit/fe5b4ddc698517de1eff3b9447361fdf758c808e))
|
|
34
|
+
* **style:** fixed hidden chat layout style ([b95eb60](https://github.com/memori-ai/memori-react/commit/b95eb60e2a099f5f252e32f79e0e463945c59e7d))
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
### Maintenance
|
|
38
|
+
|
|
39
|
+
* get visemes data from azure and processed the visemes data when speak ([14c76a8](https://github.com/memori-ai/memori-react/commit/14c76a837d0cc045e48e53019d3100af921052a2))
|
|
40
|
+
* update api client ([034eb38](https://github.com/memori-ai/memori-react/commit/034eb38181287d4a5af68f00d5c0074ed6959e70))
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
### Changes
|
|
44
|
+
|
|
45
|
+
* strip html in msg parsing for TTS, fix plaintext to copy ([4d95f39](https://github.com/memori-ai/memori-react/commit/4d95f392e6f86bf7d512dc7ce1be0ce44b5402a1))
|
|
46
|
+
|
|
47
|
+
## [7.5.1](https://github.com/memori-ai/memori-react/compare/v7.5.0...v7.5.1) (2024-09-24)
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
### Bug Fixes
|
|
51
|
+
|
|
52
|
+
* avatar view add suspense ([b3d21ca](https://github.com/memori-ai/memori-react/commit/b3d21ca5cba02d8120297930935a35c1c7873e4e))
|
|
53
|
+
* output tag parsing for tts ([a641461](https://github.com/memori-ai/memori-react/commit/a6414612bbf744d9e4b0f5fce28bc45887132902))
|
|
54
|
+
|
|
3
55
|
## [7.5.0](https://github.com/memori-ai/memori-react/compare/v7.4.6...v7.5.0) (2024-09-23)
|
|
4
56
|
|
|
5
57
|
|
package/README.md
CHANGED
|
@@ -89,7 +89,7 @@ const App = () => (
|
|
|
89
89
|
| `defaultSpeakerActive` | | `boolean` | `true` | Default value for the speaker activation |
|
|
90
90
|
| `disableTextEnteredEvents` | | `boolean` | `false` | Disable MemoriTextEntered events listeners for `typeMessage` functions, useful to avoid issues with multiple widgets in page. |
|
|
91
91
|
| `AZURE_COGNITIVE_SERVICES_TTS_KEY` | | `string` | | Azure Cognitive Services TTS key, used to generate the audio of the Memori and for STT recognition |
|
|
92
|
-
| `layout` | | `string` | | Layout of the Memori, can be "FULLPAGE" (default), "CHAT", "WEBSITE_ASSISTANT"
|
|
92
|
+
| `layout` | | `string` | | Layout of the Memori, can be "FULLPAGE" (default), "CHAT", "WEBSITE_ASSISTANT", "TOTEM", "HIDDEN_CHAT" or "ZOOMED_FULL_BODY". see [below](#layouts) |
|
|
93
93
|
| `customLayout` | | `React.FC<LayoutProps>` | | Custom layout component, see [below](#custom-layout) |
|
|
94
94
|
| `customMediaRenderer` | | `(mimeType: string) => JSX.Element \| null` | | Custom media renderer, see [below](#custom-media-renderer) |
|
|
95
95
|
| `additionalSettings` | | `JSX.Element` | | Custom JSX or component to render within the settings drawer |
|
|
@@ -99,7 +99,7 @@ const App = () => (
|
|
|
99
99
|
|
|
100
100
|
### Layouts
|
|
101
101
|
|
|
102
|
-
The Memori can be displayed in
|
|
102
|
+
The Memori can be displayed in five different layouts: `FULLPAGE`, `CHAT`, `WEBSITE_ASSISTANT`,`TOTEM`, `HIDDEN_CHAT` and `ZOOMED_FULL_BODY`.
|
|
103
103
|
If you don't specify a layout, the default one is `FULLPAGE`.
|
|
104
104
|
|
|
105
105
|
#### FULLPAGE
|
|
@@ -118,6 +118,14 @@ If you don't specify a layout, the default one is `FULLPAGE`.
|
|
|
118
118
|
|
|
119
119
|
<img alt="Website assistant layout" src="./docs/website-assistant.png" width="300" />
|
|
120
120
|
|
|
121
|
+
#### HIDDEN_CHAT
|
|
122
|
+
|
|
123
|
+
<img alt="Hidden Chat" src="./docs/hidden-chat.png" width="300">
|
|
124
|
+
|
|
125
|
+
#### ZOOMED_FULL_BODY
|
|
126
|
+
|
|
127
|
+
<img alt="Zoomed Full Body" src="./docs/zoomed-avatar.png" width="300">
|
|
128
|
+
|
|
121
129
|
#### Custom layout
|
|
122
130
|
|
|
123
131
|
You can override the default layout by passing a custom layout component to the `customLayout` prop.
|
|
@@ -15,9 +15,11 @@ const EyeInvisible_1 = tslib_1.__importDefault(require("../icons/EyeInvisible"))
|
|
|
15
15
|
const Edit_1 = tslib_1.__importDefault(require("../icons/Edit"));
|
|
16
16
|
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
17
17
|
const AvatarView_1 = tslib_1.__importDefault(require("./AvatarView"));
|
|
18
|
-
const
|
|
18
|
+
const visemeContext_1 = require("../../context/visemeContext");
|
|
19
|
+
const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = false, avatar3dVisible = false, setAvatar3dVisible, hasUserActivatedSpeak = false, isPlayingAudio = false, loading = false, baseUrl, apiUrl, animation, isZoomed = false, chatProps, }) => {
|
|
19
20
|
const { t } = (0, react_i18next_1.useTranslation)();
|
|
20
21
|
const [isClient, setIsClient] = (0, react_1.useState)(false);
|
|
22
|
+
const { setMeshRef, clearVisemes, setEmotion } = (0, visemeContext_1.useViseme)();
|
|
21
23
|
(0, react_1.useEffect)(() => {
|
|
22
24
|
setIsClient(true);
|
|
23
25
|
}, []);
|
|
@@ -38,7 +40,8 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
|
|
|
38
40
|
const renderAvatar = () => {
|
|
39
41
|
if (((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme' ||
|
|
40
42
|
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme-full' ||
|
|
41
|
-
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customglb'
|
|
43
|
+
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customglb' ||
|
|
44
|
+
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customrpm') &&
|
|
42
45
|
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatarURL)) {
|
|
43
46
|
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)('memori--avatar-wrapper', `memori--avatar-${(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) || 'default'}`, {
|
|
44
47
|
hidden: !avatar3dVisible,
|
|
@@ -47,11 +50,13 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
|
|
|
47
50
|
return ((0, jsx_runtime_1.jsx)("div", { className: "memori--blob-container", children: isClient && (0, jsx_runtime_1.jsx)(Blob_1.default, { speaking: isPlayingAudio, avatar: getAvatarUrl() }) }));
|
|
48
51
|
};
|
|
49
52
|
const renderAvatarContent = () => {
|
|
53
|
+
var _a;
|
|
50
54
|
if (!isClient)
|
|
51
55
|
return null;
|
|
52
56
|
if ((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme' ||
|
|
53
|
-
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme-full'
|
|
54
|
-
|
|
57
|
+
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'readyplayerme-full' ||
|
|
58
|
+
(integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customrpm') {
|
|
59
|
+
return ((0, jsx_runtime_1.jsx)(ErrorBoundary_1.default, { fallback: (0, jsx_runtime_1.jsx)("div", { className: "memori--blob-container", children: isClient && ((0, jsx_runtime_1.jsx)(Blob_1.default, { speaking: isPlayingAudio, avatar: getAvatarUrl() })) }), children: (0, jsx_runtime_1.jsx)(AvatarView_1.default, { url: integrationConfig.avatarURL, sex: memori.voiceType === 'FEMALE' ? 'FEMALE' : 'MALE', fallbackImg: getAvatarUrl(), headMovement: true, eyeBlink: true, animation: animation, halfBody: integrationConfig.avatar === 'readyplayerme', speaking: isPlayingAudio, loading: loading, style: getAvatarStyle(), clearVisemes: clearVisemes, setMeshRef: setMeshRef, isZoomed: isZoomed, chatEmission: (_a = chatProps === null || chatProps === void 0 ? void 0 : chatProps.dialogState) === null || _a === void 0 ? void 0 : _a.emission, setEmotion: setEmotion }) }));
|
|
55
60
|
}
|
|
56
61
|
if ((integrationConfig === null || integrationConfig === void 0 ? void 0 : integrationConfig.avatar) === 'customglb') {
|
|
57
62
|
return ((0, jsx_runtime_1.jsx)(ModelViewer_1.default, { poster: getAvatarUrl() || '', src: integrationConfig.avatarURL, alt: "" }));
|
|
@@ -70,8 +75,8 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
|
|
|
70
75
|
};
|
|
71
76
|
}
|
|
72
77
|
return {
|
|
73
|
-
width: '
|
|
74
|
-
height: '
|
|
78
|
+
width: '100%',
|
|
79
|
+
height: '100%',
|
|
75
80
|
backgroundColor: 'none',
|
|
76
81
|
};
|
|
77
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAyD;AAMzD,2FAA2D;AAC3D,oEAAoC;AACpC,+CAAqD;AACrD,gEAAgC;AAChC,8FAA8D;AAC9D,kEAAkC;AAClC,iDAA+C;AAC/C,+DAA+B;AAC/B,iFAAiD;AACjD,iEAAiC;AACjC,oEAA4B;AAC5B,sEAA+C;
|
|
1
|
+
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
interface Props {
|
|
3
|
+
showControls: boolean;
|
|
4
|
+
animation?: string;
|
|
5
|
+
loading: boolean;
|
|
6
|
+
url: string;
|
|
7
|
+
sex: 'MALE' | 'FEMALE';
|
|
8
|
+
eyeBlink: boolean;
|
|
9
|
+
headMovement: boolean;
|
|
10
|
+
speaking: boolean;
|
|
11
|
+
isZoomed: boolean;
|
|
12
|
+
chatEmission: any;
|
|
13
|
+
setMeshRef: any;
|
|
14
|
+
clearVisemes: () => void;
|
|
15
|
+
setEmotion: (emotion: string) => void;
|
|
16
|
+
}
|
|
17
|
+
export declare const AvatarView: React.FC<Props & {
|
|
18
|
+
halfBody: boolean;
|
|
19
|
+
}>;
|
|
20
|
+
export {};
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AvatarView = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
6
|
+
const react_1 = require("react");
|
|
7
|
+
const controls_1 = tslib_1.__importDefault(require("./components/controls"));
|
|
8
|
+
const fullbodyAvatar_1 = tslib_1.__importDefault(require("./components/fullbodyAvatar"));
|
|
9
|
+
const halfbodyAvatar_1 = tslib_1.__importDefault(require("./components/halfbodyAvatar"));
|
|
10
|
+
const baseActions = {
|
|
11
|
+
Gioia1: { weight: 0 },
|
|
12
|
+
Gioia2: { weight: 0 },
|
|
13
|
+
Gioia3: { weight: 0 },
|
|
14
|
+
Idle1: { weight: 1 },
|
|
15
|
+
Idle2: { weight: 0 },
|
|
16
|
+
Idle3: { weight: 0 },
|
|
17
|
+
Idle4: { weight: 0 },
|
|
18
|
+
Idle5: { weight: 0 },
|
|
19
|
+
Rabbia1: { weight: 0 },
|
|
20
|
+
Rabbia2: { weight: 0 },
|
|
21
|
+
Rabbia3: { weight: 0 },
|
|
22
|
+
Sorpresa1: { weight: 0 },
|
|
23
|
+
Sorpresa2: { weight: 0 },
|
|
24
|
+
Sorpresa3: { weight: 0 },
|
|
25
|
+
Timore1: { weight: 0 },
|
|
26
|
+
Timore2: { weight: 0 },
|
|
27
|
+
Timore3: { weight: 0 },
|
|
28
|
+
Tristezza1: { weight: 0 },
|
|
29
|
+
Tristezza2: { weight: 0 },
|
|
30
|
+
Tristezza3: { weight: 0 },
|
|
31
|
+
Loading1: { weight: 0 },
|
|
32
|
+
Loading2: { weight: 0 },
|
|
33
|
+
Loading3: { weight: 0 },
|
|
34
|
+
};
|
|
35
|
+
const AvatarView = ({ setMeshRef, clearVisemes, chatEmission, showControls, animation, url, sex, eyeBlink, headMovement, speaking, halfBody, loading, isZoomed, setEmotion, }) => {
|
|
36
|
+
const [currentBaseAction, setCurrentBaseAction] = (0, react_1.useState)({
|
|
37
|
+
action: animation || 'Idle1',
|
|
38
|
+
weight: 1,
|
|
39
|
+
});
|
|
40
|
+
const [morphTargetInfluences, setMorphTargetInfluences] = (0, react_1.useState)({});
|
|
41
|
+
const [morphTargetDictionary, setMorphTargetDictionary] = (0, react_1.useState)({});
|
|
42
|
+
const [timeScale, setTimeScale] = (0, react_1.useState)(0.8);
|
|
43
|
+
const setEmotionMorphTargetInfluences = (0, react_1.useCallback)((action) => {
|
|
44
|
+
const emotionMap = {
|
|
45
|
+
Gioia: { Gioria: 1 },
|
|
46
|
+
Rabbia: { Rabbia: 1 },
|
|
47
|
+
Sorpresa: { Sorpresa: 1 },
|
|
48
|
+
Tristezza: { Tristezza: 1 },
|
|
49
|
+
Timore: { Timore: 1 },
|
|
50
|
+
Loading: { Loading1: 1, Loading2: 1, Loading3: 1 },
|
|
51
|
+
};
|
|
52
|
+
const newEmotion = action.slice(0, -1);
|
|
53
|
+
setEmotion(newEmotion);
|
|
54
|
+
const defaultEmotions = Object.keys(emotionMap).reduce((acc, key) => {
|
|
55
|
+
acc[key] = 0;
|
|
56
|
+
return acc;
|
|
57
|
+
}, {});
|
|
58
|
+
const emotion = Object.keys(emotionMap).find(key => action.startsWith(key)) || 'default';
|
|
59
|
+
const emotionValues = emotion === 'default' ? defaultEmotions : emotionMap[emotion];
|
|
60
|
+
setMorphTargetInfluences(prevInfluences => ({
|
|
61
|
+
...prevInfluences,
|
|
62
|
+
...defaultEmotions,
|
|
63
|
+
...emotionValues,
|
|
64
|
+
}));
|
|
65
|
+
}, []);
|
|
66
|
+
const onBaseActionChange = (0, react_1.useCallback)((action) => {
|
|
67
|
+
setEmotionMorphTargetInfluences(action);
|
|
68
|
+
setCurrentBaseAction({
|
|
69
|
+
action,
|
|
70
|
+
weight: 1,
|
|
71
|
+
});
|
|
72
|
+
}, []);
|
|
73
|
+
const onMorphTargetInfluencesChange = (0, react_1.useCallback)((influences) => {
|
|
74
|
+
setMorphTargetInfluences(prevInfluences => ({
|
|
75
|
+
...prevInfluences,
|
|
76
|
+
...influences,
|
|
77
|
+
}));
|
|
78
|
+
}, []);
|
|
79
|
+
const onMorphTargetDictionaryChange = (0, react_1.useCallback)((dictionary) => {
|
|
80
|
+
setMorphTargetDictionary(dictionary);
|
|
81
|
+
}, []);
|
|
82
|
+
const modifyTimeScale = (0, react_1.useCallback)((value) => {
|
|
83
|
+
setTimeScale(value);
|
|
84
|
+
}, []);
|
|
85
|
+
(0, react_1.useEffect)(() => {
|
|
86
|
+
var _a, _b;
|
|
87
|
+
const hasOutputTag = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.includes('<output class="memori-emotion">');
|
|
88
|
+
const outputContent = hasOutputTag
|
|
89
|
+
? (_b = (_a = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.split('<output class="memori-emotion">')[1]) === null || _a === void 0 ? void 0 : _a.split('</output>')[0]) === null || _b === void 0 ? void 0 : _b.trim()
|
|
90
|
+
: null;
|
|
91
|
+
if (outputContent) {
|
|
92
|
+
const randomNumber = Math.floor(Math.random() * 3) + 1;
|
|
93
|
+
const emotion = `${outputContent}${randomNumber}`;
|
|
94
|
+
onBaseActionChange(emotion);
|
|
95
|
+
}
|
|
96
|
+
}, [chatEmission]);
|
|
97
|
+
(0, react_1.useEffect)(() => {
|
|
98
|
+
if (loading) {
|
|
99
|
+
const randomNumber = Math.floor(Math.random() * 3) + 1;
|
|
100
|
+
const animation = `Loading${randomNumber}`;
|
|
101
|
+
onBaseActionChange(animation);
|
|
102
|
+
}
|
|
103
|
+
}, [loading]);
|
|
104
|
+
return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [showControls && ((0, jsx_runtime_1.jsx)(controls_1.default, { timeScale: timeScale, morphTargetDictionary: morphTargetDictionary, onBaseActionChange: onBaseActionChange, onMorphTargetInfluencesChange: onMorphTargetInfluencesChange, onMorphTargetDictionaryChange: onMorphTargetDictionaryChange, baseActions: baseActions, currentBaseAction: currentBaseAction, modifyTimeScale: modifyTimeScale })), halfBody ? ((0, jsx_runtime_1.jsx)(halfbodyAvatar_1.default, { url: url, setMeshRef: setMeshRef, setMorphTargetInfluences: setMorphTargetInfluences, headMovement: headMovement, speaking: speaking, eyeBlink: eyeBlink, morphTargetInfluences: morphTargetInfluences, clearVisemes: clearVisemes, setMorphTargetDictionary: setMorphTargetDictionary })) : ((0, jsx_runtime_1.jsx)(fullbodyAvatar_1.default, { url: url, sex: sex, eyeBlink: eyeBlink, speaking: speaking, currentBaseAction: currentBaseAction, timeScale: timeScale, setMorphTargetInfluences: setMorphTargetInfluences, setMorphTargetDictionary: setMorphTargetDictionary, morphTargetInfluences: morphTargetInfluences, morphTargetDictionary: morphTargetDictionary, isZoomed: isZoomed, setMeshRef: setMeshRef, clearVisemes: clearVisemes }))] }));
|
|
105
|
+
};
|
|
106
|
+
exports.AvatarView = AvatarView;
|
|
107
|
+
//# sourceMappingURL=avatarComponent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
interface BaseAction {
|
|
3
|
+
weight: number;
|
|
4
|
+
action?: string;
|
|
5
|
+
}
|
|
6
|
+
export interface AnimationControlPanelProps {
|
|
7
|
+
baseActions: Record<string, BaseAction>;
|
|
8
|
+
onBaseActionChange: (action: string) => void;
|
|
9
|
+
currentBaseAction: {
|
|
10
|
+
action: string;
|
|
11
|
+
weight: number;
|
|
12
|
+
};
|
|
13
|
+
onMorphTargetInfluencesChange: (influences: {
|
|
14
|
+
[key: string]: number;
|
|
15
|
+
}) => void;
|
|
16
|
+
onMorphTargetDictionaryChange: (dictionary: {
|
|
17
|
+
[key: string]: number;
|
|
18
|
+
}) => void;
|
|
19
|
+
morphTargetDictionary: {
|
|
20
|
+
[key: string]: number;
|
|
21
|
+
};
|
|
22
|
+
modifyTimeScale: (value: number) => void;
|
|
23
|
+
timeScale: number;
|
|
24
|
+
}
|
|
25
|
+
declare const AnimationControlPanel: React.FC<AnimationControlPanelProps>;
|
|
26
|
+
export default AnimationControlPanel;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const react_1 = require("react");
|
|
5
|
+
const lil_gui_1 = tslib_1.__importDefault(require("lil-gui"));
|
|
6
|
+
const AnimationControlPanel = ({ onBaseActionChange, baseActions, modifyTimeScale, onMorphTargetInfluencesChange, onMorphTargetDictionaryChange, morphTargetDictionary, timeScale, }) => {
|
|
7
|
+
const guiRef = (0, react_1.useRef)(null);
|
|
8
|
+
const panelSettingsRef = (0, react_1.useRef)({
|
|
9
|
+
'modify time scale': timeScale,
|
|
10
|
+
});
|
|
11
|
+
const crossFadeControlsRef = (0, react_1.useRef)([]);
|
|
12
|
+
(0, react_1.useEffect)(() => {
|
|
13
|
+
const gui = new lil_gui_1.default({ width: 310 });
|
|
14
|
+
guiRef.current = gui;
|
|
15
|
+
const folder1 = gui.addFolder('Base Actions');
|
|
16
|
+
const folder2 = gui.addFolder('Additive Action Weights');
|
|
17
|
+
const folder3 = gui.addFolder('General Speed');
|
|
18
|
+
const baseNames = ['None', ...Object.keys(baseActions)];
|
|
19
|
+
baseNames.forEach(name => {
|
|
20
|
+
const settings = baseActions[name];
|
|
21
|
+
panelSettingsRef.current[name] = () => {
|
|
22
|
+
onBaseActionChange(name);
|
|
23
|
+
};
|
|
24
|
+
const control = folder1.add(panelSettingsRef.current, name);
|
|
25
|
+
crossFadeControlsRef.current.push(control);
|
|
26
|
+
});
|
|
27
|
+
Object.entries(morphTargetDictionary).forEach(([name, settings]) => {
|
|
28
|
+
panelSettingsRef.current[name] = settings / 100;
|
|
29
|
+
folder2
|
|
30
|
+
.add(panelSettingsRef.current, name, -1.0, 1.0, 0.01)
|
|
31
|
+
.listen()
|
|
32
|
+
.onChange((weight) => {
|
|
33
|
+
onMorphTargetInfluencesChange({ [name]: weight });
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
folder3
|
|
37
|
+
.add(panelSettingsRef.current, 'modify time scale', 0.0, 1.5, 0.01)
|
|
38
|
+
.onChange((value) => {
|
|
39
|
+
modifyTimeScale(value);
|
|
40
|
+
});
|
|
41
|
+
folder1.open();
|
|
42
|
+
folder2.open();
|
|
43
|
+
folder3.open();
|
|
44
|
+
return () => {
|
|
45
|
+
gui.destroy();
|
|
46
|
+
};
|
|
47
|
+
}, [
|
|
48
|
+
onBaseActionChange,
|
|
49
|
+
onMorphTargetInfluencesChange,
|
|
50
|
+
onMorphTargetDictionaryChange,
|
|
51
|
+
modifyTimeScale,
|
|
52
|
+
baseActions,
|
|
53
|
+
morphTargetDictionary,
|
|
54
|
+
timeScale
|
|
55
|
+
]);
|
|
56
|
+
return null;
|
|
57
|
+
};
|
|
58
|
+
exports.default = AnimationControlPanel;
|
|
59
|
+
//# sourceMappingURL=controls.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"controls.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/controls.tsx"],"names":[],"mappings":";;;AAAA,iCAA2D;AAC3D,8DAA0B;AA0B1B,MAAM,qBAAqB,GAAyC,CAAC,EACnE,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,6BAA6B,EAC7B,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,cAAM,EAAa,IAAI,CAAC,CAAC;IACxC,MAAM,gBAAgB,GAAG,IAAA,cAAM,EAAsB;QACnD,mBAAmB,EAAE,SAAS;KAC/B,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,IAAA,cAAM,EAAQ,EAAE,CAAC,CAAC;IAE/C,IAAA,iBAAS,EAAC,GAAG,EAAE;QAEb,MAAM,GAAG,GAAG,IAAI,iBAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC;QAErB,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAE/C,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAExD,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACnC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,EAAE;gBACpC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC,CAAC;YAEF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC5D,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE;YACjE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,GAAC,GAAG,CAAC;YAC9C,OAAO;iBACJ,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC;iBACpD,MAAM,EAAE;iBACR,QAAQ,CAAC,CAAC,MAAc,EAAE,EAAE;gBAC3B,6BAA6B,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,OAAO;aACJ,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC;aAClE,QAAQ,CAAC,CAAC,KAAa,EAAE,EAAE;YAC1B,eAAe,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEL,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,EAAE,CAAC;QAEf,OAAO,GAAG,EAAE;YACV,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC,EAAE;QACD,kBAAkB;QAClB,6BAA6B;QAC7B,6BAA6B;QAC7B,eAAe;QACf,WAAW;QACX,qBAAqB;QACrB,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
interface FullbodyAvatarProps {
|
|
2
|
+
url: string;
|
|
3
|
+
sex: 'MALE' | 'FEMALE';
|
|
4
|
+
onLoaded?: () => void;
|
|
5
|
+
currentBaseAction: {
|
|
6
|
+
action: string;
|
|
7
|
+
weight: number;
|
|
8
|
+
};
|
|
9
|
+
timeScale: number;
|
|
10
|
+
loading?: boolean;
|
|
11
|
+
speaking?: boolean;
|
|
12
|
+
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
|
+
eyeBlink?: boolean;
|
|
27
|
+
clearVisemes: () => void;
|
|
28
|
+
}
|
|
29
|
+
export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef, clearVisemes, }: FullbodyAvatarProps): JSX.Element;
|
|
30
|
+
export {};
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
4
|
+
const react_1 = require("react");
|
|
5
|
+
const three_1 = require("three");
|
|
6
|
+
const drei_1 = require("@react-three/drei");
|
|
7
|
+
const fiber_1 = require("@react-three/fiber");
|
|
8
|
+
const utils_1 = require("../../../../../helpers/utils");
|
|
9
|
+
const useEyeBlink_1 = require("../../utils/useEyeBlink");
|
|
10
|
+
const lerp = (start, end, alpha) => {
|
|
11
|
+
return start * (1 - alpha) + end * alpha;
|
|
12
|
+
};
|
|
13
|
+
const AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
|
|
14
|
+
const AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
|
|
15
|
+
const AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.45, 0);
|
|
16
|
+
const ANIMATION_URLS = {
|
|
17
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/1c350a21-97d8-4add-82cc-9dc10767a26b.glb',
|
|
18
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/c2b07166-de10-4c66-918b-7b7cd380cca7.glb',
|
|
19
|
+
};
|
|
20
|
+
const ANIMATION_DURATION = 3000;
|
|
21
|
+
function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef, clearVisemes, }) {
|
|
22
|
+
const { scene } = (0, drei_1.useGLTF)(url);
|
|
23
|
+
const { animations } = (0, drei_1.useGLTF)(ANIMATION_URLS[sex]);
|
|
24
|
+
const { nodes, materials } = (0, fiber_1.useGraph)(scene);
|
|
25
|
+
const { actions } = (0, drei_1.useAnimations)(animations, scene);
|
|
26
|
+
const [mixer] = (0, react_1.useState)(() => new three_1.AnimationMixer(scene));
|
|
27
|
+
const avatarMeshRef = (0, react_1.useRef)();
|
|
28
|
+
const currentActionRef = (0, react_1.useRef)(null);
|
|
29
|
+
const isTransitioningRef = (0, react_1.useRef)(false);
|
|
30
|
+
(0, useEyeBlink_1.useAvatarBlink)({
|
|
31
|
+
enabled: eyeBlink || false,
|
|
32
|
+
setMorphTargetInfluences,
|
|
33
|
+
config: {
|
|
34
|
+
minInterval: 1500,
|
|
35
|
+
maxInterval: 4000,
|
|
36
|
+
blinkDuration: 120,
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
const transitionToIdle = (0, react_1.useCallback)(() => {
|
|
40
|
+
if (!actions || isTransitioningRef.current)
|
|
41
|
+
return;
|
|
42
|
+
isTransitioningRef.current = true;
|
|
43
|
+
const finishCurrentAnimation = () => {
|
|
44
|
+
if (currentActionRef.current && !currentActionRef.current.paused) {
|
|
45
|
+
const remainingTime = (currentActionRef.current.getClip().duration - currentActionRef.current.time) * 1000;
|
|
46
|
+
setTimeout(() => {
|
|
47
|
+
startIdleAnimation();
|
|
48
|
+
}, remainingTime);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
startIdleAnimation();
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
const startIdleAnimation = () => {
|
|
55
|
+
const idleAnimations = Object.keys(actions).filter(key => key.startsWith('Idle'));
|
|
56
|
+
const randomIdle = idleAnimations[Math.floor(Math.random() * idleAnimations.length)];
|
|
57
|
+
const idleAction = actions[randomIdle];
|
|
58
|
+
const fadeOutDuration = 0.5;
|
|
59
|
+
const fadeInDuration = 0.5;
|
|
60
|
+
if (currentActionRef.current) {
|
|
61
|
+
currentActionRef.current.fadeOut(fadeOutDuration);
|
|
62
|
+
}
|
|
63
|
+
idleAction === null || idleAction === void 0 ? void 0 : idleAction.reset().fadeIn(fadeInDuration).play();
|
|
64
|
+
currentActionRef.current = idleAction;
|
|
65
|
+
setTimeout(() => {
|
|
66
|
+
isTransitioningRef.current = false;
|
|
67
|
+
}, (fadeOutDuration + fadeInDuration) * 1000);
|
|
68
|
+
};
|
|
69
|
+
if (currentActionRef.current && !currentActionRef.current.getClip().name.startsWith('Idle')) {
|
|
70
|
+
finishCurrentAnimation();
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
startIdleAnimation();
|
|
74
|
+
}
|
|
75
|
+
}, [actions]);
|
|
76
|
+
(0, react_1.useEffect)(() => {
|
|
77
|
+
if (!actions || !currentBaseAction.action || isTransitioningRef.current)
|
|
78
|
+
return;
|
|
79
|
+
const newAction = actions[currentBaseAction.action];
|
|
80
|
+
if (!newAction) {
|
|
81
|
+
console.warn(`Animation "${currentBaseAction.action}" not found in actions.`);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const fadeOutDuration = 0.8;
|
|
85
|
+
const fadeInDuration = 0.8;
|
|
86
|
+
if (!currentBaseAction.action.startsWith('Idle')) {
|
|
87
|
+
setTimeout(() => {
|
|
88
|
+
transitionToIdle();
|
|
89
|
+
}, ANIMATION_DURATION);
|
|
90
|
+
}
|
|
91
|
+
if (currentActionRef.current) {
|
|
92
|
+
currentActionRef.current.fadeOut(fadeOutDuration);
|
|
93
|
+
}
|
|
94
|
+
newAction.timeScale = timeScale;
|
|
95
|
+
newAction.reset().fadeIn(fadeInDuration).play();
|
|
96
|
+
currentActionRef.current = newAction;
|
|
97
|
+
}, [currentBaseAction, timeScale, actions, transitionToIdle]);
|
|
98
|
+
(0, react_1.useEffect)(() => {
|
|
99
|
+
(0, utils_1.correctMaterials)(materials);
|
|
100
|
+
scene.traverse((object) => {
|
|
101
|
+
if (object instanceof three_1.SkinnedMesh &&
|
|
102
|
+
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
|
|
103
|
+
avatarMeshRef.current = object;
|
|
104
|
+
setMeshRef(object);
|
|
105
|
+
if (object.morphTargetDictionary && object.morphTargetInfluences) {
|
|
106
|
+
setMorphTargetDictionary(object.morphTargetDictionary);
|
|
107
|
+
const initialInfluences = Object.keys(object.morphTargetDictionary).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
|
|
108
|
+
setMorphTargetInfluences(initialInfluences);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
onLoaded === null || onLoaded === void 0 ? void 0 : onLoaded();
|
|
113
|
+
return () => {
|
|
114
|
+
Object.values(materials).forEach(fiber_1.dispose);
|
|
115
|
+
Object.values(nodes).filter(utils_1.isSkinnedMesh).forEach(fiber_1.dispose);
|
|
116
|
+
clearVisemes();
|
|
117
|
+
};
|
|
118
|
+
}, [
|
|
119
|
+
materials,
|
|
120
|
+
nodes,
|
|
121
|
+
url,
|
|
122
|
+
onLoaded,
|
|
123
|
+
setMorphTargetDictionary,
|
|
124
|
+
setMorphTargetInfluences,
|
|
125
|
+
setMeshRef,
|
|
126
|
+
clearVisemes,
|
|
127
|
+
]);
|
|
128
|
+
(0, fiber_1.useFrame)((_, delta) => {
|
|
129
|
+
if (avatarMeshRef.current && avatarMeshRef.current.morphTargetDictionary) {
|
|
130
|
+
updateMorphTargetInfluences();
|
|
131
|
+
}
|
|
132
|
+
mixer.update(delta * 0.001);
|
|
133
|
+
function updateMorphTargetInfluences() {
|
|
134
|
+
Object.entries(morphTargetInfluences).forEach(([key, value]) => {
|
|
135
|
+
const index = avatarMeshRef.current.morphTargetDictionary[key];
|
|
136
|
+
if (typeof index === 'number' &&
|
|
137
|
+
avatarMeshRef.current.morphTargetInfluences) {
|
|
138
|
+
const currentValue = avatarMeshRef.current.morphTargetInfluences[index];
|
|
139
|
+
const smoothValue = lerp(currentValue, value, 0.1);
|
|
140
|
+
avatarMeshRef.current.morphTargetInfluences[index] = smoothValue;
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
});
|
|
145
|
+
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 }) }));
|
|
146
|
+
}
|
|
147
|
+
exports.default = FullbodyAvatar;
|
|
148
|
+
//# sourceMappingURL=fullbodyAvatar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Object3D } from 'three';
|
|
2
|
+
interface HalfBodyAvatarProps {
|
|
3
|
+
url: string;
|
|
4
|
+
setMorphTargetInfluences: (morphTargetInfluences: any) => void;
|
|
5
|
+
headMovement?: boolean;
|
|
6
|
+
speaking?: boolean;
|
|
7
|
+
onLoaded?: () => void;
|
|
8
|
+
setMeshRef: (mesh: Object3D) => void;
|
|
9
|
+
clearVisemes: () => void;
|
|
10
|
+
setMorphTargetDictionary: (morphTargetDictionary: any) => void;
|
|
11
|
+
eyeBlink?: boolean;
|
|
12
|
+
morphTargetInfluences: any;
|
|
13
|
+
}
|
|
14
|
+
export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorphTargetDictionary, headMovement, eyeBlink, setMeshRef, onLoaded, clearVisemes, morphTargetInfluences, }: HalfBodyAvatarProps): JSX.Element;
|
|
15
|
+
export {};
|